From: imeevma@tarantool.org
To: v.shpilevoy@tarantool.org
Cc: tarantool-patches@freelists.org
Subject: [tarantool-patches] [PATCH v9 3/7] sql: remove box.sql.debug()
Date: Fri, 22 Mar 2019 13:50:36 +0300 [thread overview]
Message-ID: <a6de40c9dca6cba1dd9205e5f20051e3a126dae9.1553251042.git.imeevma@gmail.com> (raw)
In-Reply-To: <cover.1553251041.git.imeevma@gmail.com>
Due to removing of box.sql.execute() it makes sense to remove
box.sql.debug() and move SQL info to box.info.
Part or #3505
---
src/box/lua/info.c | 11 +++++++
src/box/lua/sql.c | 10 ------
test/box/info.result | 1 +
test/sql-tap/analyze3.test.lua | 9 ------
test/sql-tap/between.test.lua | 4 +--
.../gh-3307-xfer-optimization-issue.test.lua | 4 +--
test/sql-tap/lua/sqltester.lua | 4 +--
test/sql-tap/minmax2.test.lua | 36 +++++++++++-----------
test/sql-tap/minmax3.test.lua | 4 +--
test/sql-tap/where2.test.lua | 14 ++++-----
test/sql-tap/whereA.test.lua | 4 +--
test/sql-tap/whereD.test.lua | 4 +--
test/sql-tap/with2.test.lua | 4 +--
13 files changed, 51 insertions(+), 58 deletions(-)
diff --git a/src/box/lua/info.c b/src/box/lua/info.c
index 76b5646..707cd28 100644
--- a/src/box/lua/info.c
+++ b/src/box/lua/info.c
@@ -45,6 +45,7 @@
#include "box/gc.h"
#include "box/engine.h"
#include "box/vinyl.h"
+#include "box/sql.h"
#include "main.h"
#include "version.h"
#include "box/box.h"
@@ -201,6 +202,15 @@ lbox_info_replication(struct lua_State *L)
}
static int
+lbox_info_sql_call(struct lua_State *L)
+{
+ struct info_handler info;
+ luaT_info_handler_create(&info, L);
+ sql_debug_info(&info);
+ return 1;
+}
+
+static int
lbox_info_id(struct lua_State *L)
{
/*
@@ -497,6 +507,7 @@ static const struct luaL_Reg lbox_info_dynamic_meta[] = {
{"memory", lbox_info_memory},
{"gc", lbox_info_gc},
{"vinyl", lbox_info_vinyl},
+ {"sql", lbox_info_sql_call},
{NULL, NULL}
};
diff --git a/src/box/lua/sql.c b/src/box/lua/sql.c
index ee20faa..cd6e75c 100644
--- a/src/box/lua/sql.c
+++ b/src/box/lua/sql.c
@@ -110,21 +110,11 @@ sqlerror:
return lua_error(L);
}
-static int
-lua_sql_debug(struct lua_State *L)
-{
- struct info_handler info;
- luaT_info_handler_create(&info, L);
- sql_debug_info(&info);
- return 1;
-}
-
void
box_lua_sql_init(struct lua_State *L)
{
static const struct luaL_Reg module_funcs [] = {
{"execute", lua_sql_execute},
- {"debug", lua_sql_debug},
{NULL, NULL}
};
diff --git a/test/box/info.result b/test/box/info.result
index 3384631..26377b1 100644
--- a/test/box/info.result
+++ b/test/box/info.result
@@ -83,6 +83,7 @@ t
- replication
- ro
- signature
+ - sql
- status
- uptime
- uuid
diff --git a/test/sql-tap/analyze3.test.lua b/test/sql-tap/analyze3.test.lua
index 1396287..dcbea1d 100755
--- a/test/sql-tap/analyze3.test.lua
+++ b/test/sql-tap/analyze3.test.lua
@@ -48,15 +48,6 @@ testprefix = "analyze3"
-- have been fixed.
--
-local function eqp(sql)
- return test:execsql("EXPLAIN QUERY PLAN"..sql)
-end
-
-local function sf_execsql(sql, db)
- r = test:execsql(sql)
- return {box.sql.debug().sql_search_count, r}
-end
-
---------------------------------------------------------------------------
--
-- analyze3-1.1.1:
diff --git a/test/sql-tap/between.test.lua b/test/sql-tap/between.test.lua
index d56de4e..79583af 100755
--- a/test/sql-tap/between.test.lua
+++ b/test/sql-tap/between.test.lua
@@ -51,10 +51,10 @@ test:do_test(
-- is done. Then it appends the names of the table and index used.
--
local function queryplan(sql)
- local sql_sort_count = box.sql.debug().sql_sort_count
+ local sqlite_sort_count = box.info.sql.sql_sort_count
local data = test:execsql(sql)
local x = "nosort"
- if box.sql.debug().sql_sort_count - sql_sort_count then
+ if box.info.sql.sql_sort_count - sqlite_sort_count then
x = "sort"
end
table.insert(data,x)
diff --git a/test/sql-tap/gh-3307-xfer-optimization-issue.test.lua b/test/sql-tap/gh-3307-xfer-optimization-issue.test.lua
index 80a2a2d..57fbca6 100755
--- a/test/sql-tap/gh-3307-xfer-optimization-issue.test.lua
+++ b/test/sql-tap/gh-3307-xfer-optimization-issue.test.lua
@@ -5,9 +5,9 @@ test:plan(39)
local function do_xfer_test(test, test_func, test_name, func, exp, opts)
local opts = opts or {}
local exp_xfer_count = opts.exp_xfer_count
- local before = box.sql.debug().sql_xfer_count
+ local before = box.info.sql.sql_xfer_count
test_func(test, test_name, func, exp)
- local after = box.sql.debug().sql_xfer_count
+ local after = box.info.sql.sql_xfer_count
test:is(after - before, exp_xfer_count,
test_name .. '-xfer-count')
end
diff --git a/test/sql-tap/lua/sqltester.lua b/test/sql-tap/lua/sqltester.lua
index 8aac64c..63c5d9b 100644
--- a/test/sql-tap/lua/sqltester.lua
+++ b/test/sql-tap/lua/sqltester.lua
@@ -326,9 +326,9 @@ function test.do_select_tests(self, label, tests)
end
function test.sf_execsql(self, sql)
- local old = box.sql.debug().sql_search_count
+ local old = box.info.sql.sql_search_count
local r = test:execsql(sql)
- local new = box.sql.debug().sql_search_count - old
+ local new = box.info.sql.sql_search_count - old
return {new, r}
end
diff --git a/test/sql-tap/minmax2.test.lua b/test/sql-tap/minmax2.test.lua
index a6f840d..e75709a 100755
--- a/test/sql-tap/minmax2.test.lua
+++ b/test/sql-tap/minmax2.test.lua
@@ -59,7 +59,7 @@ test:do_execsql_test(
test:do_test(
"minmax2-1.1",
function()
- sql_search_count = box.sql.debug().sql_search_count
+ sql_search_count = box.info.sql.sql_search_count
return test:execsql "SELECT min(x) FROM t1"
end, {
-- <minmax2-1.1>
@@ -70,13 +70,13 @@ test:do_test(
test:do_test(
"minmax2-1.2",
function()
- return box.sql.debug().sql_search_count - sql_search_count
+ return box.info.sql.sql_search_count - sql_search_count
end, 19)
test:do_test(
"minmax2-1.3",
function()
- sql_search_count = box.sql.debug().sql_search_count
+ sql_search_count = box.info.sql.sql_search_count
return test:execsql "SELECT max(x) FROM t1"
end, {
-- <minmax2-1.3>
@@ -87,14 +87,14 @@ test:do_test(
test:do_test(
"minmax2-1.4",
function()
- return box.sql.debug().sql_search_count - sql_search_count
+ return box.info.sql.sql_search_count - sql_search_count
end, 19)
test:do_test(
"minmax2-1.5",
function()
test:execsql "CREATE INDEX t1i1 ON t1(x DESC)"
- sql_search_count = box.sql.debug().sql_search_count
+ sql_search_count = box.info.sql.sql_search_count
return test:execsql "SELECT min(x) FROM t1"
end, {
-- <minmax2-1.5>
@@ -105,13 +105,13 @@ test:do_test(
test:do_test(
"minmax2-1.6",
function()
- return box.sql.debug().sql_search_count - sql_search_count
+ return box.info.sql.sql_search_count - sql_search_count
end, 1)
test:do_test(
"minmax2-1.7",
function()
- sql_search_count = box.sql.debug().sql_search_count
+ sql_search_count = box.info.sql.sql_search_count
return test:execsql "SELECT max(x) FROM t1"
end, {
-- <minmax2-1.7>
@@ -122,13 +122,13 @@ test:do_test(
test:do_test(
"minmax2-1.8",
function()
- return box.sql.debug().sql_search_count - sql_search_count
+ return box.info.sql.sql_search_count - sql_search_count
end, 0)
test:do_test(
"minmax2-1.9",
function()
- sql_search_count = box.sql.debug().sql_search_count
+ sql_search_count = box.info.sql.sql_search_count
return test:execsql "SELECT max(y) FROM t1"
end, {
-- <minmax2-1.9>
@@ -139,7 +139,7 @@ test:do_test(
test:do_test(
"minmax2-1.10",
function()
- return box.sql.debug().sql_search_count - sql_search_count
+ return box.info.sql.sql_search_count - sql_search_count
end, 19)
test:do_test(
@@ -149,7 +149,7 @@ test:do_test(
CREATE TABLE t2(a INTEGER PRIMARY KEY, b INT );
INSERT INTO t2 SELECT x, y FROM t1;
]]
- sql_search_count = box.sql.debug().sql_search_count
+ sql_search_count = box.info.sql.sql_search_count
return test:execsql "SELECT min(a) FROM t2"
end, {
-- <minmax2-2.0>
@@ -160,13 +160,13 @@ test:do_test(
test:do_test(
"minmax2-2.1",
function()
- return box.sql.debug().sql_search_count - sql_search_count
+ return box.info.sql.sql_search_count - sql_search_count
end, 0)
test:do_test(
"minmax2-2.2",
function()
- sql_search_count = box.sql.debug().sql_search_count
+ sql_search_count = box.info.sql.sql_search_count
return test:execsql "SELECT max(a) FROM t2"
end, {
-- <minmax2-2.2>
@@ -177,7 +177,7 @@ test:do_test(
test:do_test(
"minmax2-2.3",
function()
- return box.sql.debug().sql_search_count - sql_search_count
+ return box.info.sql.sql_search_count - sql_search_count
end, 0)
test:do_test(
@@ -186,7 +186,7 @@ test:do_test(
test:execsql "INSERT INTO t2 VALUES((SELECT max(a) FROM t2)+1,999)"
- sql_search_count = box.sql.debug().sql_search_count
+ sql_search_count = box.info.sql.sql_search_count
return test:execsql "SELECT max(a) FROM t2"
end, {
-- <minmax2-3.0>
@@ -197,7 +197,7 @@ test:do_test(
test:do_test(
"minmax2-3.1",
function()
- return box.sql.debug().sql_search_count - sql_search_count
+ return box.info.sql.sql_search_count - sql_search_count
end, 0)
test:do_test(
@@ -206,7 +206,7 @@ test:do_test(
test:execsql "INSERT INTO t2 VALUES((SELECT max(a) FROM t2)+1,999)"
- sql_search_count = box.sql.debug().sql_search_count
+ sql_search_count = box.info.sql.sql_search_count
return test:execsql " SELECT b FROM t2 WHERE a=(SELECT max(a) FROM t2) "
@@ -220,7 +220,7 @@ test:do_test(
test:do_test(
"minmax2-3.3",
function()
- return box.sql.debug().sql_search_count - sql_search_count
+ return box.info.sql.sql_search_count - sql_search_count
end, 1)
test:do_execsql_test(
diff --git a/test/sql-tap/minmax3.test.lua b/test/sql-tap/minmax3.test.lua
index 3707575..8cefd63 100755
--- a/test/sql-tap/minmax3.test.lua
+++ b/test/sql-tap/minmax3.test.lua
@@ -24,9 +24,9 @@ test:plan(47)
--
local function count(sql)
- local sql_search_count = box.sql.debug().sql_search_count
+ local sql_search_count = box.info.sql.sql_search_count
local r = test:execsql(sql)
- table.insert(r, box.sql.debug().sql_search_count - sql_search_count)
+ table.insert(r, box.info.sql.sql_search_count - sql_search_count)
return r
end
diff --git a/test/sql-tap/where2.test.lua b/test/sql-tap/where2.test.lua
index 8eaf405..831221c 100755
--- a/test/sql-tap/where2.test.lua
+++ b/test/sql-tap/where2.test.lua
@@ -62,10 +62,10 @@ test:do_test(
-- Do an SQL statement. Append the search count to the end of the result.
--
local function count(sql)
- local sql_sort_count = box.sql.debug().sql_sort_count
+ local sql_sort_count = box.info.sql.sql_sort_count
local r = test:execsql(sql)
- print("lol "..(box.sql.debug().sql_sort_count - sql_sort_count))
- table.insert(r, box.sql.debug().sql_sort_count - sql_sort_count)
+ print("lol "..(box.info.sql.sql_sort_count - sql_sort_count))
+ table.insert(r, box.info.sql.sql_sort_count - sql_sort_count)
return r
end
@@ -78,9 +78,9 @@ end
--
local function cksort(sql)
local sort = "nosort"
- local sql_sort_count = box.sql.debug().sql_sort_count
+ local sql_sort_count = box.info.sql.sql_sort_count
local data = test:execsql(sql)
- if sql_sort_count < box.sql.debug().sql_sort_count then
+ if sql_sort_count < box.info.sql.sql_sort_count then
sort = 'sort'
end
table.insert(data, sort)
@@ -97,9 +97,9 @@ end
--
local function queryplan(sql)
local sort = "nosort"
- local sql_sort_count = box.sql.debug().sql_sort_count
+ local sql_sort_count = box.info.sql.sql_sort_count
local data = test:execsql(sql)
- if sql_sort_count < box.sql.debug().sql_sort_count then
+ if sql_sort_count < box.info.sql.sql_sort_count then
sort = 'sort'
end
table.insert(data, sort)
diff --git a/test/sql-tap/whereA.test.lua b/test/sql-tap/whereA.test.lua
index b4a0f0a..34d70ef 100755
--- a/test/sql-tap/whereA.test.lua
+++ b/test/sql-tap/whereA.test.lua
@@ -193,9 +193,9 @@ test:do_test(
-- Do an SQL statement. Append the search count to the end of the result.
--
local function count(sql)
- local sql_sort_count = box.sql.debug().sql_sort_count
+ local sql_sort_count = box.info.sql.sql_sort_count
local r = test:execsql(sql)
- table.insert(r, box.sql.debug().sql_sort_count - sql_sort_count)
+ table.insert(r, box.info.sql.sql_sort_count - sql_sort_count)
return r
end
diff --git a/test/sql-tap/whereD.test.lua b/test/sql-tap/whereD.test.lua
index b103f3c..0973208 100755
--- a/test/sql-tap/whereD.test.lua
+++ b/test/sql-tap/whereD.test.lua
@@ -234,10 +234,10 @@ local function do_searchcount_test(tn, sql, res)
test:do_test(
tn,
function()
- local sql_search_count = box.sql.debug().sql_search_count
+ local sql_search_count = box.info.sql.sql_search_count
local r = test:execsql(sql)
table.insert(r, "search")
- table.insert(r, box.sql.debug().sql_search_count - sql_search_count)
+ table.insert(r, box.info.sql.sql_search_count - sql_search_count)
return r
end,
res)
diff --git a/test/sql-tap/with2.test.lua b/test/sql-tap/with2.test.lua
index ca3f00e..df6b0ec 100755
--- a/test/sql-tap/with2.test.lua
+++ b/test/sql-tap/with2.test.lua
@@ -389,9 +389,9 @@ genstmt(255), {
local function do_xfer_test(test, test_func, test_name, func, exp, opts)
local opts = opts or {}
local exp_xfer_count = opts.exp_xfer_count
- local before = box.sql.debug().sql_xfer_count
+ local before = box.info.sql.sql_xfer_count
test_func(test, test_name, func, exp)
- local after = box.sql.debug().sql_xfer_count
+ local after = box.info.sql.sql_xfer_count
test:is(after - before, exp_xfer_count,
test_name .. '-xfer-count')
end
--
2.7.4
next prev parent reply other threads:[~2019-03-22 10:50 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-22 10:50 [tarantool-patches] [PATCH v9 0/7] sql: remove box.sql.execute imeevma
2019-03-22 10:50 ` [tarantool-patches] [PATCH v9 1/7] sql: add column name to SQL change counter imeevma
2019-03-22 15:42 ` [tarantool-patches] " Konstantin Osipov
2019-03-25 19:34 ` Mergen Imeev
2019-03-29 12:00 ` Kirill Yukhin
2019-03-22 10:50 ` [tarantool-patches] [PATCH v9 2/7] sql: fix error code for SQL errors in execute.c imeevma
2019-03-22 15:45 ` [tarantool-patches] " Konstantin Osipov
2019-03-26 21:48 ` Vladislav Shpilevoy
2019-03-27 11:43 ` Konstantin Osipov
2019-03-28 17:46 ` Mergen Imeev
2019-03-29 12:01 ` Kirill Yukhin
2019-03-22 10:50 ` imeevma [this message]
2019-03-22 15:46 ` [tarantool-patches] Re: [PATCH v9 3/7] sql: remove box.sql.debug() Konstantin Osipov
2019-03-25 19:39 ` Mergen Imeev
2019-03-26 21:48 ` Vladislav Shpilevoy
2019-03-28 17:48 ` Mergen Imeev
2019-03-28 18:01 ` Vladislav Shpilevoy
2019-03-29 12:02 ` Kirill Yukhin
2019-03-22 10:50 ` [tarantool-patches] [PATCH v9 4/7] lua: remove exceptions from function luaL_tofield() imeevma
2019-03-22 15:53 ` [tarantool-patches] " Konstantin Osipov
2019-03-29 19:26 ` Vladislav Shpilevoy
2019-03-26 21:48 ` Vladislav Shpilevoy
2019-03-28 17:54 ` Mergen Imeev
2019-03-28 18:40 ` Vladislav Shpilevoy
2019-03-28 19:56 ` Mergen Imeev
2019-03-28 21:41 ` Mergen Imeev
2019-03-29 21:06 ` Vladislav Shpilevoy
2019-03-22 10:50 ` [tarantool-patches] [PATCH v9 5/7] iproto: create port_sql imeevma
2019-03-22 15:55 ` [tarantool-patches] " Konstantin Osipov
2019-03-22 10:50 ` [tarantool-patches] [PATCH v9 6/7] sql: create box.execute() imeevma
2019-03-22 15:57 ` [tarantool-patches] " Konstantin Osipov
2019-03-22 10:50 ` [tarantool-patches] [PATCH v9 7/7] sql: remove box.sql.execute() imeevma
2019-03-26 21:48 ` [tarantool-patches] " Vladislav Shpilevoy
2019-03-28 20:13 ` Mergen Imeev
2019-03-29 21:06 ` Vladislav Shpilevoy
2019-03-29 21:07 ` [tarantool-patches] Re: [PATCH v9 0/7] sql: remove box.sql.execute Vladislav Shpilevoy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a6de40c9dca6cba1dd9205e5f20051e3a126dae9.1553251042.git.imeevma@gmail.com \
--to=imeevma@tarantool.org \
--cc=tarantool-patches@freelists.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [tarantool-patches] [PATCH v9 3/7] sql: remove box.sql.debug()' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox