Changeset: b03e8b1a9d50 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b03e8b1a9d50
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/15_querylog.sql
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
Branch: Apr2019
Log Message:
Fix definition of sys.querylog_enable with threshold.
(grafted from 29dcbdf5acc68e443f2ce6b0f4ef357bb43719b9)
diffs (truncated from 363 to 300 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -1525,7 +1525,7 @@ sql_drop_functions_dependencies_Xs_on_Ys
static str
sql_update_apr2019(Client c, mvc *sql)
{
- size_t bufsize = 2000, pos = 0;
+ size_t bufsize = 3000, pos = 0;
char *buf, *err;
char *schema;
sql_schema *s;
@@ -1539,8 +1539,13 @@ sql_update_apr2019(Client c, mvc *sql)
pos += snprintf(buf + pos, bufsize - pos, "set schema sys;\n");
+ /* 15_querylog.sql */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "drop procedure sys.querylog_enable(smallint);\n"
+ "create procedure sys.querylog_enable(threshold
integer) external name sql.querylog_enable;\n"
+ "update sys.functions set system = true where name =
'querylog_enable' and schema_id = (select id from sys.schemas where name =
'sys');\n");
+
/* 17_temporal.sql */
-
pos += snprintf(buf + pos, bufsize - pos,
"create function sys.date_trunc(txt string, t
timestamp)\n"
"returns timestamp\n"
diff --git a/sql/scripts/15_querylog.sql b/sql/scripts/15_querylog.sql
--- a/sql/scripts/15_querylog.sql
+++ b/sql/scripts/15_querylog.sql
@@ -65,7 +65,7 @@ external name sql.querylog_empty;
-- manipulate the query logger
create procedure sys.querylog_enable()
external name sql.querylog_enable;
-create procedure sys.querylog_enable(threshold smallint)
-external name sql.querylog_enable_threshold;
+create procedure sys.querylog_enable(threshold integer)
+external name sql.querylog_enable;
create procedure sys.querylog_disable()
external name sql.querylog_disable;
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -5854,6 +5854,9 @@ set schema "sys";
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
---
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
+++
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
@@ -5854,6 +5854,9 @@ set schema "sys";
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -5064,6 +5064,9 @@ set schema "sys";
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -5064,6 +5064,9 @@ set schema "sys";
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5905,6 +5905,9 @@ commit;
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
@@ -5064,6 +5064,9 @@ set schema "sys";
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -5905,6 +5905,9 @@ commit;
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -5854,6 +5854,9 @@ set schema "sys";
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -5064,6 +5064,9 @@ set schema "sys";
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
@@ -5064,6 +5064,9 @@ set schema "sys";
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -5905,6 +5905,9 @@ commit;
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -1081,7 +1081,7 @@ create function sys.querylog_catalog() r
create procedure sys.querylog_disable() external name sql.querylog_disable;
create procedure sys.querylog_empty() external name sql.querylog_empty;
create procedure sys.querylog_enable() external name sql.querylog_enable;
-create procedure sys.querylog_enable(threshold smallint) external name
sql.querylog_enable_threshold;
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
create function sys.queue() returns table(qtag bigint, "user" string, started
timestamp, estimate timestamp, progress int, status string, tag oid, query
string) external name sql.sysmon_queue;
create function radians(d double) returns double return d*pi()/180;
create function sys.rejects() returns table(rowid bigint, fldid int, "message"
string, "input" string) external name sql.copy_rejects;
@@ -2660,7 +2660,7 @@ drop function pcre_replace(string, strin
[ "sys", "querylog_disable", "SYSTEM", "create procedure
sys.querylog_disable() external name sql.querylog_disable;", "sql", "MAL",
"Procedure", true, false, false, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys", "querylog_empty", "SYSTEM", "create procedure
sys.querylog_empty() external name sql.querylog_empty;", "sql", "MAL",
"Procedure", true, false, false, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys", "querylog_enable", "SYSTEM", "create procedure
sys.querylog_enable() external name sql.querylog_enable;", "sql", "MAL",
"Procedure", true, false, false, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
-[ "sys", "querylog_enable", "SYSTEM", "create procedure
sys.querylog_enable(threshold smallint) external name
sql.querylog_enable_threshold;", "sql", "MAL", "Procedure", true,
false, false, "threshold", "smallint", 16, 0, "in", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL ]
+[ "sys", "querylog_enable", "SYSTEM", "create procedure
sys.querylog_enable(threshold integer) external name sql.querylog_enable;",
"sql", "MAL", "Procedure", true, false, false, "threshold", "int",
32, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "queue", "SYSTEM", "create function sys.queue()
returns table(qtag bigint, \"user\" string, started timestamp, estimate
timestamp, progress int, status string, tag oid, query string) external name
sql.sysmon_queue;", "sql", "MAL", "Function returning a table", true,
false, false, "qtag", "bigint", 64, 0, "out", "user", "clob",
0, 0, "out", "started", "timestamp", 7, 0, "out",
"estimate", "timestamp", 7, 0, "out", "progress", "int",
32, 0, "out", "status", "clob", 0, 0, "out", "tag",
"oid", 63, 0, "out", "query", "clob", 0, 0, "out",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "radians", "SYSTEM", "create function radians(d
double) returns double return d*pi()/180;", "user", "SQL", "Scalar function",
false, false, false, "result", "double", 53, 0,
"out", "d", "double", 53, 0, "in", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "rand", "SYSTEM", "rand", "mmath", "Internal C",
"Scalar function", true, false, false, "res_0", "int", 32,
0, "out", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit
b/sql/test/emptydb/Tests/check.stable.out.32bit
--- a/sql/test/emptydb/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb/Tests/check.stable.out.32bit
@@ -1081,7 +1081,7 @@ create function sys.querylog_catalog() r
create procedure sys.querylog_disable() external name sql.querylog_disable;
create procedure sys.querylog_empty() external name sql.querylog_empty;
create procedure sys.querylog_enable() external name sql.querylog_enable;
-create procedure sys.querylog_enable(threshold smallint) external name
sql.querylog_enable_threshold;
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
create function sys.queue() returns table(qtag bigint, "user" string, started
timestamp, estimate timestamp, progress int, status string, tag oid, query
string) external name sql.sysmon_queue;
create function radians(d double) returns double return d*pi()/180;
create function sys.rejects() returns table(rowid bigint, fldid int, "message"
string, "input" string) external name sql.copy_rejects;
@@ -2660,7 +2660,7 @@ drop function pcre_replace(string, strin
[ "sys", "querylog_disable", "SYSTEM", "create procedure
sys.querylog_disable() external name sql.querylog_disable;", "sql", "MAL",
"Procedure", true, false, false, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys", "querylog_empty", "SYSTEM", "create procedure
sys.querylog_empty() external name sql.querylog_empty;", "sql", "MAL",
"Procedure", true, false, false, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys", "querylog_enable", "SYSTEM", "create procedure
sys.querylog_enable() external name sql.querylog_enable;", "sql", "MAL",
"Procedure", true, false, false, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
-[ "sys", "querylog_enable", "SYSTEM", "create procedure
sys.querylog_enable(threshold smallint) external name
sql.querylog_enable_threshold;", "sql", "MAL", "Procedure", true,
false, false, "threshold", "smallint", 16, 0, "in", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL ]
+[ "sys", "querylog_enable", "SYSTEM", "create procedure
sys.querylog_enable(threshold integer) external name sql.querylog_enable;",
"sql", "MAL", "Procedure", true, false, false, "threshold", "int",
32, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "queue", "SYSTEM", "create function sys.queue()
returns table(qtag bigint, \"user\" string, started timestamp, estimate
timestamp, progress int, status string, tag oid, query string) external name
sql.sysmon_queue;", "sql", "MAL", "Function returning a table", true,
false, false, "qtag", "bigint", 64, 0, "out", "user", "clob",
0, 0, "out", "started", "timestamp", 7, 0, "out",
"estimate", "timestamp", 7, 0, "out", "progress", "int",
32, 0, "out", "status", "clob", 0, 0, "out", "tag",
"oid", 31, 0, "out", "query", "clob", 0, 0, "out",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "radians", "SYSTEM", "create function radians(d
double) returns double return d*pi()/180;", "user", "SQL", "Scalar function",
false, false, false, "result", "double", 53, 0,
"out", "d", "double", 53, 0, "in", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "rand", "SYSTEM", "rand", "mmath", "Internal C",
"Scalar function", true, false, false, "res_0", "int", 32,
0, "out", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -1087,7 +1087,7 @@ create function sys.querylog_catalog() r
create procedure sys.querylog_disable() external name sql.querylog_disable;
create procedure sys.querylog_empty() external name sql.querylog_empty;
create procedure sys.querylog_enable() external name sql.querylog_enable;
-create procedure sys.querylog_enable(threshold smallint) external name
sql.querylog_enable_threshold;
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
create function sys.queue() returns table(qtag bigint, "user" string, started
timestamp, estimate timestamp, progress int, status string, tag oid, query
string) external name sql.sysmon_queue;
create function radians(d double) returns double return d*pi()/180;
create function sys.rejects() returns table(rowid bigint, fldid int, "message"
string, "input" string) external name sql.copy_rejects;
@@ -2703,7 +2703,7 @@ drop function pcre_replace(string, strin
[ "sys", "querylog_disable", "SYSTEM", "create procedure
sys.querylog_disable() external name sql.querylog_disable;", "sql", "MAL",
"Procedure", true, false, false, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys", "querylog_empty", "SYSTEM", "create procedure
sys.querylog_empty() external name sql.querylog_empty;", "sql", "MAL",
"Procedure", true, false, false, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys", "querylog_enable", "SYSTEM", "create procedure
sys.querylog_enable() external name sql.querylog_enable;", "sql", "MAL",
"Procedure", true, false, false, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
-[ "sys", "querylog_enable", "SYSTEM", "create procedure
sys.querylog_enable(threshold smallint) external name
sql.querylog_enable_threshold;", "sql", "MAL", "Procedure", true,
false, false, "threshold", "smallint", 16, 0, "in", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL ]
+[ "sys", "querylog_enable", "SYSTEM", "create procedure
sys.querylog_enable(threshold integer) external name sql.querylog_enable;",
"sql", "MAL", "Procedure", true, false, false, "threshold", "int",
32, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "queue", "SYSTEM", "create function sys.queue()
returns table(qtag bigint, \"user\" string, started timestamp, estimate
timestamp, progress int, status string, tag oid, query string) external name
sql.sysmon_queue;", "sql", "MAL", "Function returning a table", true,
false, false, "qtag", "bigint", 64, 0, "out", "user", "clob",
0, 0, "out", "started", "timestamp", 7, 0, "out",
"estimate", "timestamp", 7, 0, "out", "progress", "int",
32, 0, "out", "status", "clob", 0, 0, "out", "tag",
"oid", 63, 0, "out", "query", "clob", 0, 0, "out",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "radians", "SYSTEM", "create function radians(d
double) returns double return d*pi()/180;", "user", "SQL", "Scalar function",
false, false, false, "result", "double", 53, 0,
"out", "d", "double", 53, 0, "in", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "rand", "SYSTEM", "rand", "mmath", "Internal C",
"Scalar function", true, false, false, "res_0", "int", 32,
0, "out", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -5854,6 +5854,9 @@ set schema "sys";
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -5063,6 +5063,9 @@ set schema "sys";
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -5063,6 +5063,9 @@ set schema "sys";
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5904,6 +5904,9 @@ commit;
Running database upgrade commands:
set schema sys;
+drop procedure sys.querylog_enable(smallint);
+create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
+update sys.functions set system = true where name = 'querylog_enable' and
schema_id = (select id from sys.schemas where name = 'sys');
create function sys.date_trunc(txt string, t timestamp)
returns timestamp
external name sql.date_trunc;
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
