Changeset: 29dcbdf5acc6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29dcbdf5acc6
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: default
Log Message:
Fix definition of sys.querylog_enable with threshold.
diffs (truncated from 352 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
@@ -1539,6 +1539,12 @@ 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");
+
/* 26_sysmon.sql */
pos += snprintf(buf + pos, bufsize - pos,
"grant execute on function sys.queue to public;\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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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
@@ -1078,7 +1078,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;
@@ -2656,7 +2656,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
@@ -1078,7 +1078,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;
@@ -2656,7 +2656,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
@@ -1084,7 +1084,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;
@@ -2699,7 +2699,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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
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
+++ b/sql/test/testdb-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');
grant execute on function sys.queue to public;
grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
