Changeset: 886832a05b60 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=886832a05b60 Modified Files: sql/backends/monet5/sql_upgrades.c sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: Jun2016 Log Message:
Fixed up upgrade code. diffs (truncated from 1409 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 @@ -1217,16 +1217,69 @@ sql_update_jun2016(Client c) pos += snprintf(buf + pos, bufsize - pos, "grant execute on function rejects to public;\n"); pos += snprintf(buf + pos, bufsize - pos, "grant execute on function md5 to public;\n"); -#if 0 - pos += snprintf(buf + pos, bufsize - pos, "drop procedure profiler_openstream(host string, port int);"); - pos += snprintf(buf + pos, bufsize - pos, "drop procedure profiler_stethoscope(ticks int);"); - pos += snprintf(buf + pos, bufsize - pos, "create schema profiler;" - "create procedure profiler.start() external name profiler.\"start\";" - "create procedure profiler.stop() external name profiler.stop;" - "create procedure profiler.setheartbeat(beat int) external name profiler.setheartbeat;" - "create procedure profiler.setpoolsize(poolsize int) external name profiler.setpoolsize;" - "create procedure profiler.setstream(host string, port int) external name profiler.setstream;"); -#endif + /* 16_tracelog.sql */ + pos += snprintf(buf + pos, bufsize - pos, "drop procedure sys.profiler_openstream(string, int);\n"); + pos += snprintf(buf + pos, bufsize - pos, "drop procedure sys.profiler_stethoscope(int);\n"); + + /* 25_debug.sql */ + pos += snprintf(buf + pos, bufsize - pos, "drop function sys.bbp();\n"); + pos += snprintf(buf + pos, bufsize - pos, + "create function sys.bbp()\n" + "returns table (id int, name string,\n" + "ttype string, count bigint, refcnt int, lrefcnt int,\n" + "location string, kind string)\n" + "external name bbp.get;\n"); + pos += snprintf(buf + pos, bufsize - pos, + "create function sys.malfunctions()\n" + "returns table(\"signature\" string, \"address\" string, \"comment\" string)\n" + "external name \"manual\".\"functions\";\n"); + pos += snprintf(buf + pos, bufsize - pos, + "create procedure sys.flush_log ()\n" + "external name sql.\"flush_log\";\n"); + pos += snprintf(buf + pos, bufsize - pos, + "create function sys.debug(debug int) returns integer\n" + "external name mdb.\"setDebug\";\n"); + pos += snprintf(buf + pos, bufsize - pos, + "insert into sys.systemfunctions (select id from sys.functions where name in ('bbp', 'malfunctions', 'flush_log', 'debug') and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions));\n"); + + /* 46_profiler.sql */ + pos += snprintf(buf + pos, bufsize - pos, + "create schema profiler;\n" + "create procedure profiler.start() external name profiler.\"start\";\n" + "create procedure profiler.stop() external name profiler.stop;\n" + "create procedure profiler.setheartbeat(beat int) external name profiler.setheartbeat;\n" + "create procedure profiler.setpoolsize(poolsize int) external name profiler.setpoolsize;\n" + "create procedure profiler.setstream(host string, port int) external name profiler.setstream;\n"); + pos += snprintf(buf + pos, bufsize - pos, + "update sys.schemas set system = true where name = 'profiler';\n" + "insert into sys.systemfunctions (select id from sys.functions where name in ('start', 'stop', 'setheartbeat', 'setpoolsize', 'setstream') and schema_id = (select id from sys.schemas where name = 'profiler') and id not in (select function_id from sys.systemfunctions));\n"); + + /* 51_sys_schema_extensions.sql */ + pos += snprintf(buf + pos, bufsize - pos, + "delete from sys.keywords;\n" + "insert into sys.keywords values\n" + "('ADD'), ('ADMIN'), ('AFTER'), ('AGGREGATE'), ('ALL'), ('ALTER'), ('ALWAYS'), ('AND'), ('ANY'), ('ASC'), ('ASYMMETRIC'), ('ATOMIC'), ('AUTO_INCREMENT'),\n" + "('BEFORE'), ('BEGIN'), ('BEST'), ('BETWEEN'), ('BIGINT'), ('BIGSERIAL'), ('BINARY'), ('BLOB'), ('BY'),\n" + "('CALL'), ('CASCADE'), ('CASE'), ('CAST'), ('CHAIN'), ('CHAR'), ('CHARACTER'), ('CHECK'), ('CLOB'), ('COALESCE'), ('COMMIT'), ('COMMITTED'), ('CONSTRAINT'), ('CONVERT'), ('COPY'), ('CORRESPONDING'), ('CREATE'), ('CROSS'), ('CURRENT'), ('CURRENT_DATE'), ('CURRENT_ROLE'), ('CURRENT_TIME'), ('CURRENT_TIMESTAMP'), ('CURRENT_USER'),\n" + "('DAY'), ('DEC'), ('DECIMAL'), ('DECLARE'), ('DEFAULT'), ('DELETE'), ('DELIMITERS'), ('DESC'), ('DO'), ('DOUBLE'), ('DROP'),\n" + "('EACH'), ('EFFORT'), ('ELSE'), ('ELSEIF'), ('ENCRYPTED'), ('END'), ('ESCAPE'), ('EVERY'), ('EXCEPT'), ('EXCLUDE'), ('EXISTS'), ('EXTERNAL'), ('EXTRACT'),\n" + "('FALSE'), ('FLOAT'), ('FOLLOWING'), ('FOR'), ('FOREIGN'), ('FROM'), ('FULL'), ('FUNCTION'),\n" + "('GENERATED'), ('GLOBAL'), ('GRANT'), ('GROUP'),\n" + "('HAVING'), ('HOUR'), ('HUGEINT'),\n" + "('IDENTITY'), ('IF'), ('ILIKE'), ('IN'), ('INDEX'), ('INNER'), ('INSERT'), ('INT'), ('INTEGER'), ('INTERSECT'), ('INTO'), ('IS'), ('ISOLATION'),\n" + "('JOIN'),\n" + "('LEFT'), ('LIKE'), ('LIMIT'), ('LOCAL'), ('LOCALTIME'), ('LOCALTIMESTAMP'), ('LOCKED'),\n" + "('MEDIUMINT'), ('MERGE'), ('MINUTE'), ('MONTH'),\n" + "('NATURAL'), ('NEW'), ('NEXT'), ('NOCYCLE'), ('NOMAXVALUE'), ('NOMINVALUE'), ('NOT'), ('NOW'), ('NULL'), ('NULLIF'), ('NUMERIC'),\n" + "('OF'), ('OFFSET'), ('OLD'), ('ON'), ('ONLY'), ('OPTION'), ('OR'), ('ORDER'), ('OTHERS'), ('OUTER'), ('OVER'),\n" + "('PARTIAL'), ('PARTITION'), ('POSITION'), ('PRECEDING'), ('PRESERVE'), ('PRIMARY'), ('PRIVILEGES'), ('PROCEDURE'), ('PUBLIC'),\n" + "('RANGE'), ('READ'), ('REAL'), ('RECORDS'), ('REFERENCES'), ('REFERENCING'), ('REMOTE'), ('RENAME'), ('REPEATABLE'), ('REPLICA'), ('RESTART'), ('RESTRICT'), ('RETURN'), ('RETURNS'), ('REVOKE'), ('RIGHT'), ('ROLLBACK'), ('ROWS'),\n" + "('SAMPLE'), ('SAVEPOINT'), ('SECOND'), ('SELECT'), ('SEQUENCE'), ('SERIAL'), ('SERIALIZABLE'), ('SESSION_USER'), ('SET'), ('SIMPLE'), ('SMALLINT'), ('SOME'), ('SPLIT_PART'), ('STDIN'), ('STDOUT'), ('STORAGE'), ('STREAM'), ('STRING'), ('SUBSTRING'), ('SYMMETRIC'),\n" + "('THEN'), ('TIES'), ('TINYINT'), ('TO'), ('TRANSACTION'), ('TRIGGER'), ('TRUE'),\n" + "('UNBOUNDED'), ('UNCOMMITTED'), ('UNENCRYPTED'), ('UNION'), ('UNIQUE'), ('UPDATE'), ('USER'), ('USING'),\n" + "('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),\n" + "('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),\n" + "('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), ('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), ('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');\n"); // Add the new storage inspection functions. pos += snprintf(buf + pos, bufsize - pos, @@ -1290,11 +1343,15 @@ sql_update_jun2016(Client c) pos += snprintf(buf + pos, bufsize - pos, "insert into sys.systemfunctions (select id from sys.functions where name = 'storage' and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions));\n"); - /* change to 99_system.sql: correct invalid FK schema ids, set them to schema id 2000 (the "sys" schema) */ + /* change to 99_system.sql: correct invalid FK schema ids, set + * them to schema id 2000 (the "sys" schema) */ pos += snprintf(buf + pos, bufsize - pos, - "UPDATE sys.types SET schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys') WHERE schema_id = 0 AND schema_id NOT IN (SELECT id from sys.schemas);\n" + "UPDATE sys.types SET schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys') WHERE schema_id = 0 AND schema_id NOT IN (SELECT id from sys.schemas);\n" "UPDATE sys.functions SET schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys') WHERE schema_id = 0 AND schema_id NOT IN (SELECT id from sys.schemas);\n"); + pos += snprintf(buf + pos, bufsize - pos, + "delete from sys.systemfunctions where function_id not in (select id from sys.functions);\n"); + if (schema) { pos += snprintf(buf + pos, bufsize - pos, "set schema \"%s\";\n", schema); free(schema); diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 @@ -857,12 +857,6 @@ create function sys.hashsize(b boolean, create function sys.heapsize(tpe string, i bigint, w int) returns bigint begin if tpe <> 'varchar' and tpe <> 'clob' then return 0; end if; return 10240 + i * w; end; create function "host" (p inet) returns clob external name inet."host"; create function "hostmask" (p inet) returns inet external name inet."hostmask"; -ilike -ilike -ilike -ilike -ilike -ilike create filter function "ilike"(val string, pat string, esc string) external name algebra."ilike"; create filter function "ilike"(val string, pat string) external name algebra."ilike"; create function sys.imprintsize(i bigint, nme string) returns bigint begin if nme = 'boolean' or nme = 'tinyint' or nme = 'smallint' or nme = 'int' or nme = 'bigint' or nme = 'hugeint' or nme = 'decimal' or nme = 'date' or nme = 'timestamp' or nme = 'real' or nme = 'double' then return cast(i * 0.12 as bigint); end if ; return 0; end; @@ -870,28 +864,8 @@ create function internaltransform(geom g create function isaurl(theurl url) returns bool external name url."isaURL"; create function sys.isauuid(u uuid) returns uuid external name uuid."isaUUID"; create function sys.isauuid(u string) returns uuid external name uuid."isaUUID"; -mbrLeft -mbrLeft -<< -<< -<< -<< -<< -<< -<< -<< -<< -<< -<< -<< create function "left_shift"(i1 inet, i2 inet) returns boolean external name inet."<<"; create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external name inet."<<="; -like -like -like -like -like -like create filter function "like"(val string, pat string, esc string) external name algebra."like"; create filter function "like"(val string, pat string) external name algebra."like"; create function sys.malfunctions() returns table("signature" string, "address" string, "comment" string) external name "manual"."functions"; @@ -950,20 +924,6 @@ create procedure sys.resume(tag int) ext create procedure sys.resume(tag bigint) external name sql.sysmon_resume; create procedure reuse(sys string, tab string) external name sql.reuse; create function reverse(src string) returns string external name udf.reverse; -mbrRight -mbrRight ->> ->> ->> ->> ->> ->> ->> ->> ->> ->> ->> ->> create function "right_shift"(i1 inet, i2 inet) returns boolean external name inet.">>"; create function "right_shift_assign"(i1 inet, i2 inet) returns boolean external name inet.">>="; create function sys.sessions() returns table("user" string, "login" timestamp, "sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint, "active" bool) external name sql.sessions; 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 @@ -53,6 +53,54 @@ grant execute on function zorder_decode_ grant execute on function zorder_decode_y to public; grant execute on function rejects to public; grant execute on function md5 to public; +drop procedure sys.profiler_openstream(string, int); +drop procedure sys.profiler_stethoscope(int); +drop function sys.bbp(); +create function sys.bbp() +returns table (id int, name string, +ttype string, count bigint, refcnt int, lrefcnt int, +location string, kind string) +external name bbp.get; +create function sys.malfunctions() +returns table("signature" string, "address" string, "comment" string) +external name "manual"."functions"; +create procedure sys.flush_log () +external name sql."flush_log"; +create function sys.debug(debug int) returns integer +external name mdb."setDebug"; +insert into sys.systemfunctions (select id from sys.functions where name in ('bbp', 'malfunctions', 'flush_log', 'debug') and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions)); +create schema profiler; +create procedure profiler.start() external name profiler."start"; +create procedure profiler.stop() external name profiler.stop; +create procedure profiler.setheartbeat(beat int) external name profiler.setheartbeat; +create procedure profiler.setpoolsize(poolsize int) external name profiler.setpoolsize; +create procedure profiler.setstream(host string, port int) external name profiler.setstream; +update sys.schemas set system = true where name = 'profiler'; +insert into sys.systemfunctions (select id from sys.functions where name in ('start', 'stop', 'setheartbeat', 'setpoolsize', 'setstream') and schema_id = (select id from sys.schemas where name = 'profiler') and id not in (select function_id from sys.systemfunctions)); +delete from sys.keywords; +insert into sys.keywords values +('ADD'), ('ADMIN'), ('AFTER'), ('AGGREGATE'), ('ALL'), ('ALTER'), ('ALWAYS'), ('AND'), ('ANY'), ('ASC'), ('ASYMMETRIC'), ('ATOMIC'), ('AUTO_INCREMENT'), +('BEFORE'), ('BEGIN'), ('BEST'), ('BETWEEN'), ('BIGINT'), ('BIGSERIAL'), ('BINARY'), ('BLOB'), ('BY'), +('CALL'), ('CASCADE'), ('CASE'), ('CAST'), ('CHAIN'), ('CHAR'), ('CHARACTER'), ('CHECK'), ('CLOB'), ('COALESCE'), ('COMMIT'), ('COMMITTED'), ('CONSTRAINT'), ('CONVERT'), ('COPY'), ('CORRESPONDING'), ('CREATE'), ('CROSS'), ('CURRENT'), ('CURRENT_DATE'), ('CURRENT_ROLE'), ('CURRENT_TIME'), ('CURRENT_TIMESTAMP'), ('CURRENT_USER'), +('DAY'), ('DEC'), ('DECIMAL'), ('DECLARE'), ('DEFAULT'), ('DELETE'), ('DELIMITERS'), ('DESC'), ('DO'), ('DOUBLE'), ('DROP'), +('EACH'), ('EFFORT'), ('ELSE'), ('ELSEIF'), ('ENCRYPTED'), ('END'), ('ESCAPE'), ('EVERY'), ('EXCEPT'), ('EXCLUDE'), ('EXISTS'), ('EXTERNAL'), ('EXTRACT'), +('FALSE'), ('FLOAT'), ('FOLLOWING'), ('FOR'), ('FOREIGN'), ('FROM'), ('FULL'), ('FUNCTION'), +('GENERATED'), ('GLOBAL'), ('GRANT'), ('GROUP'), +('HAVING'), ('HOUR'), ('HUGEINT'), +('IDENTITY'), ('IF'), ('ILIKE'), ('IN'), ('INDEX'), ('INNER'), ('INSERT'), ('INT'), ('INTEGER'), ('INTERSECT'), ('INTO'), ('IS'), ('ISOLATION'), +('JOIN'), +('LEFT'), ('LIKE'), ('LIMIT'), ('LOCAL'), ('LOCALTIME'), ('LOCALTIMESTAMP'), ('LOCKED'), +('MEDIUMINT'), ('MERGE'), ('MINUTE'), ('MONTH'), +('NATURAL'), ('NEW'), ('NEXT'), ('NOCYCLE'), ('NOMAXVALUE'), ('NOMINVALUE'), ('NOT'), ('NOW'), ('NULL'), ('NULLIF'), ('NUMERIC'), +('OF'), ('OFFSET'), ('OLD'), ('ON'), ('ONLY'), ('OPTION'), ('OR'), ('ORDER'), ('OTHERS'), ('OUTER'), ('OVER'), +('PARTIAL'), ('PARTITION'), ('POSITION'), ('PRECEDING'), ('PRESERVE'), ('PRIMARY'), ('PRIVILEGES'), ('PROCEDURE'), ('PUBLIC'), +('RANGE'), ('READ'), ('REAL'), ('RECORDS'), ('REFERENCES'), ('REFERENCING'), ('REMOTE'), ('RENAME'), ('REPEATABLE'), ('REPLICA'), ('RESTART'), ('RESTRICT'), ('RETURN'), ('RETURNS'), ('REVOKE'), ('RIGHT'), ('ROLLBACK'), ('ROWS'), +('SAMPLE'), ('SAVEPOINT'), ('SECOND'), ('SELECT'), ('SEQUENCE'), ('SERIAL'), ('SERIALIZABLE'), ('SESSION_USER'), ('SET'), ('SIMPLE'), ('SMALLINT'), ('SOME'), ('SPLIT_PART'), ('STDIN'), ('STDOUT'), ('STORAGE'), ('STREAM'), ('STRING'), ('SUBSTRING'), ('SYMMETRIC'), +('THEN'), ('TIES'), ('TINYINT'), ('TO'), ('TRANSACTION'), ('TRIGGER'), ('TRUE'), +('UNBOUNDED'), ('UNCOMMITTED'), ('UNENCRYPTED'), ('UNION'), ('UNIQUE'), ('UPDATE'), ('USER'), ('USING'), +('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'), +('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'), +('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'), ('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'), ('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE'); create function sys."storage"( sname string) returns table ( "schema" string, @@ -112,6 +160,7 @@ external name sql."storage"; insert into sys.systemfunctions (select id from sys.functions where name = 'storage' and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions)); UPDATE sys.types SET schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys') WHERE schema_id = 0 AND schema_id NOT IN (SELECT id from sys.schemas); UPDATE sys.functions SET schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys') WHERE schema_id = 0 AND schema_id NOT IN (SELECT id from sys.schemas); +delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "sys"; Running database upgrade commands: diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out --- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out +++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out @@ -853,12 +853,6 @@ create function sys.hashsize(b boolean, create function sys.heapsize(tpe string, i bigint, w int) returns bigint begin if tpe <> 'varchar' and tpe <> 'clob' then return 0; end if; return 10240 + i * w; end; create function "host" (p inet) returns clob external name inet."host"; create function "hostmask" (p inet) returns inet external name inet."hostmask"; -ilike -ilike -ilike -ilike -ilike -ilike create filter function "ilike"(val string, pat string, esc string) external name algebra."ilike"; create filter function "ilike"(val string, pat string) external name algebra."ilike"; create function sys.imprintsize(i bigint, nme string) returns bigint begin if nme = 'boolean' or nme = 'tinyint' or nme = 'smallint' or nme = 'int' or nme = 'bigint' or nme = 'hugeint' or nme = 'decimal' or nme = 'date' or nme = 'timestamp' or nme = 'real' or nme = 'double' then return cast(i * 0.12 as bigint); end if ; return 0; end; @@ -866,26 +860,8 @@ create function internaltransform(geom g create function isaurl(theurl url) returns bool external name url."isaURL"; create function sys.isauuid(u uuid) returns uuid external name uuid."isaUUID"; create function sys.isauuid(u string) returns uuid external name uuid."isaUUID"; -mbrLeft -mbrLeft -<< -<< -<< -<< -<< -<< -<< -<< -<< -<< create function "left_shift"(i1 inet, i2 inet) returns boolean external name inet."<<"; create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external name inet."<<="; -like -like -like -like -like -like create filter function "like"(val string, pat string, esc string) external name algebra."like"; create filter function "like"(val string, pat string) external name algebra."like"; create function sys.malfunctions() returns table("signature" string, "address" string, "comment" string) external name "manual"."functions"; @@ -942,18 +918,6 @@ create procedure sys.resume(tag int) ext create procedure sys.resume(tag bigint) external name sql.sysmon_resume; create procedure reuse(sys string, tab string) external name sql.reuse; create function reverse(src string) returns string external name udf.reverse; -mbrRight -mbrRight ->> ->> ->> ->> ->> ->> ->> ->> ->> ->> create function "right_shift"(i1 inet, i2 inet) returns boolean external name inet.">>"; create function "right_shift_assign"(i1 inet, i2 inet) returns boolean external name inet.">>="; create function sys.sessions() returns table("user" string, "login" timestamp, "sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint, "active" bool) external name sql.sessions; diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 @@ -857,12 +857,6 @@ create function sys.hashsize(b boolean, create function sys.heapsize(tpe string, i bigint, w int) returns bigint begin if tpe <> 'varchar' and tpe <> 'clob' then return 0; end if; return 10240 + i * w; end; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list