Changeset: 14656d5a512b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14656d5a512b
Modified Files:
        sql/test/sys-schema/Tests/systemfunctions.stable.out
        sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: default
Log Message:

Approve.


diffs (212 lines):

diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out 
b/sql/test/sys-schema/Tests/systemfunctions.stable.out
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out
@@ -28,7 +28,7 @@ stdout of test 'systemfunctions` in dire
 % sys.,        sys.,   sys.,   sys.,   . # table_name
 % schema,      function,       argno,  argtype,        definition # name
 % varchar,     varchar,        int,    varchar,        varchar # type
-% 8,   24,     2,      14,     681 # length
+% 8,   24,     2,      14,     679 # length
 [ "json",      "filter",       0,      "json", "create function json.filter(js 
json, pathexpr string)\nreturns json external name json.filter;"        ]
 [ "json",      "filter",       1,      "json", ""      ]
 [ "json",      "filter",       2,      "clob", ""      ]
@@ -419,7 +419,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "code", 1,      "int",  ""      ]
 [ "sys",       "code", 0,      "clob", "unicode"       ]
 [ "sys",       "code", 1,      "int",  ""      ]
-[ "sys",       "columnsize",   0,      "bigint",       "create function 
sys.columnsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\n if tpe 
in ('tinyint', 'boolean')\nthen return count;\nend if;\nif tpe = 
'smallint'\nthen return 2 * count;\nend if;\nif tpe in ('int', 'real', 'date', 
'time', 'timetz', 'sec_interval', 'month_interval')\nthen return 4 * 
count;\nend if;\nif tpe in ('bigint', 'double', 'timestamp', 'timestamptz', 
'inet', 'oid')\nthen return 8 * count;\nend if;\nif tpe in ('hugeint', 
'decimal', 'uuid', 'mbr')\nthen return 16 * count;\nend if;\n if tpe in 
('varchar', 'char', 'clob', 'json', 'url')\nthen return 4 * count;\nend if;\nif 
tpe in ('blob', 'geometry', 'geometrya')\nthen return 8 * count;\nend 
if;\nreturn 8 * count;\nend;"    ]
+[ "sys",       "columnsize",   0,      "bigint",       "create function 
sys.columnsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\nif tpe 
in ('tinyint', 'boolean')\nthen return count;\nend if;\nif tpe = 
'smallint'\nthen return 2 * count;\nend if;\nif tpe in ('int', 'real', 'date', 
'time', 'timetz', 'sec_interval', 'month_interval')\nthen return 4 * 
count;\nend if;\nif tpe in ('bigint', 'double', 'timestamp', 'timestamptz', 
'inet', 'oid')\nthen return 8 * count;\nend if;\nif tpe in ('hugeint', 
'decimal', 'uuid', 'mbr')\nthen return 16 * count;\nend if;\nif tpe in 
('varchar', 'char', 'clob', 'json', 'url')\nthen return 4 * count;\nend if;\nif 
tpe in ('blob', 'geometry', 'geometrya')\nthen return 8 * count;\nend 
if;\nreturn 8 * count;\nend;"      ]
 [ "sys",       "columnsize",   1,      "varchar",      ""      ]
 [ "sys",       "columnsize",   2,      "bigint",       ""      ]
 [ "sys",       "concat",       0,      "char", "+"     ]
@@ -870,10 +870,10 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "has_z",        1,      "int",  ""      ]
 [ "sys",       "hash", 0,      "bigint",       "hash"  ]
 [ "sys",       "hash", 1,      "any",  ""      ]
-[ "sys",       "hashsize",     0,      "bigint",       "create function 
sys.hashsize(b boolean, count bigint)\nreturns bigint\nbegin\n if b = 
true\nthen return 8 * count;\nend if;\nreturn 0;\nend;"  ]
+[ "sys",       "hashsize",     0,      "bigint",       "create function 
sys.hashsize(b boolean, count bigint)\nreturns bigint\nbegin\nif b = true\nthen 
return 8 * count;\nend if;\nreturn 0;\nend;"   ]
 [ "sys",       "hashsize",     1,      "boolean",      ""      ]
 [ "sys",       "hashsize",     2,      "bigint",       ""      ]
-[ "sys",       "heapsize",     0,      "bigint",       "create function 
sys.heapsize(tpe varchar(1024), count bigint, distincts bigint, avgwidth 
int)\nreturns bigint\nbegin\n if tpe in ('varchar', 'char', 'clob', 'json', 
'url')\nthen return 8192 + ((avgwidth + 8) * distincts);\nend if;\nif tpe in 
('blob', 'geometry', 'geometrya')\nthen return 32 + (avgwidth * count);\nend 
if;\nreturn 0;\nend;"   ]
+[ "sys",       "heapsize",     0,      "bigint",       "create function 
sys.heapsize(tpe varchar(1024), count bigint, distincts bigint, avgwidth 
int)\nreturns bigint\nbegin\nif tpe in ('varchar', 'char', 'clob', 'json', 
'url')\nthen return 8192 + ((avgwidth + 8) * distincts);\nend if;\nif tpe in 
('blob', 'geometry', 'geometrya')\nthen return 32 + (avgwidth * count);\nend 
if;\nreturn 0;\nend;"    ]
 [ "sys",       "heapsize",     1,      "varchar",      ""      ]
 [ "sys",       "heapsize",     2,      "bigint",       ""      ]
 [ "sys",       "heapsize",     3,      "bigint",       ""      ]
@@ -906,7 +906,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "ilike",        2,      "clob", ""      ]
 [ "sys",       "ilike",        0,      "clob", "create filter function 
\"ilike\"(val string, pat string) external name algebra.\"ilike\";"     ]
 [ "sys",       "ilike",        1,      "clob", ""      ]
-[ "sys",       "imprintsize",  0,      "bigint",       "create function 
sys.imprintsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\n if 
tpe in ('tinyint', 'boolean')\nthen return cast(0.2 * count as bigint);\nend 
if;\nif tpe = 'smallint'\nthen return cast(0.4 * count as bigint);\nend if;\nif 
tpe in ('int', 'real', 'date', 'time', 'timetz', 'sec_interval', 
'month_interval')\nthen return cast(0.8 * count as bigint);\nend if;\nif tpe in 
('bigint', 'double', 'timestamp', 'timestamptz', 'inet', 'oid')\nthen return 
cast(1.6 * count as bigint);\nend if;\n if tpe in ('hugeint', 'decimal', 
'uuid', 'mbr')\nthen return cast(3.2 * count as bigint);\nend if;\n return 
0;\nend;"  ]
+[ "sys",       "imprintsize",  0,      "bigint",       "create function 
sys.imprintsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\nif tpe 
in ('tinyint', 'boolean')\nthen return cast(0.2 * count as bigint);\nend 
if;\nif tpe = 'smallint'\nthen return cast(0.4 * count as bigint);\nend if;\nif 
tpe in ('int', 'real', 'date', 'time', 'timetz', 'sec_interval', 
'month_interval')\nthen return cast(0.8 * count as bigint);\nend if;\nif tpe in 
('bigint', 'double', 'timestamp', 'timestamptz', 'inet', 'oid')\nthen return 
cast(1.6 * count as bigint);\nend if;\nif tpe in ('hugeint', 'decimal', 'uuid', 
'mbr')\nthen return cast(3.2 * count as bigint);\nend if;\nreturn 0;\nend;"     
]
 [ "sys",       "imprintsize",  1,      "varchar",      ""      ]
 [ "sys",       "imprintsize",  2,      "bigint",       ""      ]
 [ "sys",       "index",        0,      "tinyint",      "index" ]
@@ -1717,7 +1717,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "querycache",   0,      "clob", "create function 
sys.querycache()\nreturns table (query string, count int)\nexternal name 
sql.dump_cache;"      ]
 [ "sys",       "querycache",   1,      "int",  ""      ]
 [ "sys",       "querylog",     0,      "clob", "create procedure 
sys.querylog(filename string)\nexternal name sql.logfile;"    ]
-[ "sys",       "querylog_calls",       0,      "oid",  "create function 
sys.querylog_calls()\nreturns table(\nid oid, \"start\" timestamp, \"stop\" 
timestamp, arguments string, tuples bigint, run bigint, ship bigint, cpu int, 
io int )\nexternal name sql.querylog_calls;" ]
+[ "sys",       "querylog_calls",       0,      "oid",  "create function 
sys.querylog_calls()\nreturns table(\nid oid,\n\"start\" timestamp,\n\"stop\" 
timestamp,\narguments string,\ntuples bigint,\nrun bigint,\nship bigint,\ncpu 
int,\nio int\n)\nexternal name sql.querylog_calls;"        ]
 [ "sys",       "querylog_calls",       1,      "timestamp",    ""      ]
 [ "sys",       "querylog_calls",       2,      "timestamp",    ""      ]
 [ "sys",       "querylog_calls",       3,      "clob", ""      ]
@@ -1726,7 +1726,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "querylog_calls",       6,      "bigint",       ""      ]
 [ "sys",       "querylog_calls",       7,      "int",  ""      ]
 [ "sys",       "querylog_calls",       8,      "int",  ""      ]
-[ "sys",       "querylog_catalog",     0,      "oid",  "create function 
sys.querylog_catalog()\nreturns table(\nid oid,\nowner string,\ndefined 
timestamp,\nquery string,\npipe string,\n\"plan\" string, mal int, optimize 
bigint )\nexternal name sql.querylog_catalog;"     ]
+[ "sys",       "querylog_catalog",     0,      "oid",  "create function 
sys.querylog_catalog()\nreturns table(\nid oid,\nowner string,\ndefined 
timestamp,\nquery string,\npipe string,\n\"plan\" string,\nmal int,\noptimize 
bigint\n)\nexternal name sql.querylog_catalog;"  ]
 [ "sys",       "querylog_catalog",     1,      "clob", ""      ]
 [ "sys",       "querylog_catalog",     2,      "timestamp",    ""      ]
 [ "sys",       "querylog_catalog",     3,      "clob", ""      ]
@@ -1735,7 +1735,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "querylog_catalog",     6,      "int",  ""      ]
 [ "sys",       "querylog_catalog",     7,      "bigint",       ""      ]
 [ "sys",       "querylog_enable",      0,      "int",  "create procedure 
sys.querylog_enable(threshold integer)\nexternal name sql.querylog_enable;"   ]
-[ "sys",       "queue",        0,      "bigint",       "create function 
sys.queue()\nreturns table(\n\"tag\" bigint,\n\"sessionid\" int,\n\"username\" 
string,\n\"started\" timestamp,\n\"status\" string, \"query\" 
string,\n\"finished\" timestamp, \"workers\" int,\n\"memory\" int\n)\nexternal 
name sysmon.queue;"        ]
+[ "sys",       "queue",        0,      "bigint",       "create function 
sys.queue()\nreturns table(\n\"tag\" bigint,\n\"sessionid\" int,\n\"username\" 
string,\n\"started\" timestamp,\n\"status\" string,\n\"query\" 
string,\n\"finished\" timestamp,\n\"workers\" int,\n\"memory\" int\n)\nexternal 
name sysmon.queue;"      ]
 [ "sys",       "queue",        1,      "int",  ""      ]
 [ "sys",       "queue",        2,      "clob", ""      ]
 [ "sys",       "queue",        3,      "timestamp",    ""      ]
@@ -3125,7 +3125,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "st_numinteriorring",   1,      "geometry",     ""      ]
 [ "sys",       "st_numinteriorrings",  0,      "int",  "create function 
st_numinteriorrings(geom geometry) returns integer external name 
geom.\"NumInteriorRings\";"   ]
 [ "sys",       "st_numinteriorrings",  1,      "geometry",     ""      ]
-[ "sys",       "st_numpatches",        0,      "int",  "create function 
st_numpatches(geom geometry) returns integer begin\nreturn select 
st_numgeometries(geom);\nend;"       ]
+[ "sys",       "st_numpatches",        0,      "int",  "create function 
st_numpatches(geom geometry) returns integer\nbegin\nreturn select 
st_numgeometries(geom);\nend;"      ]
 [ "sys",       "st_numpatches",        1,      "geometry",     ""      ]
 [ "sys",       "st_numpoints", 0,      "int",  "create function 
st_numpoints(geom geometry) returns integer external name geom.\"NumPoints\";" ]
 [ "sys",       "st_numpoints", 1,      "geometry",     ""      ]
@@ -3135,7 +3135,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "st_overlaps",  0,      "boolean",      "create function 
st_overlaps(geom1 geometry, geom2 geometry) returns boolean external name 
geom.\"Overlaps\";"  ]
 [ "sys",       "st_overlaps",  1,      "geometry",     ""      ]
 [ "sys",       "st_overlaps",  2,      "geometry",     ""      ]
-[ "sys",       "st_patchn",    0,      "geometry",     "create function 
st_patchn(geom geometry, patchnum integer) returns geometry begin\nreturn 
select st_geometryn(geom, patchnum);\nend;"  ]
+[ "sys",       "st_patchn",    0,      "geometry",     "create function 
st_patchn(geom geometry, patchnum integer) returns geometry\nbegin\nreturn 
select st_geometryn(geom, patchnum);\nend;" ]
 [ "sys",       "st_patchn",    1,      "geometry",     ""      ]
 [ "sys",       "st_patchn",    2,      "int",  ""      ]
 [ "sys",       "st_point",     0,      "geometry",     "create function 
st_point(x double, y double) returns geometry external name 
geom.\"MakePoint\";"       ]
@@ -3294,7 +3294,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "stddev_samp",  1,      "month_interval",       ""      ]
 [ "sys",       "stop", 0,      "bigint",       "create procedure sys.stop(tag 
bigint)\nexternal name sysmon.stop;"     ]
 [ "sys",       "stopsession",  0,      "int",  "create procedure 
sys.stopsession(\"sessionid\" int)\nexternal name clients.stopsession;"       ]
-[ "sys",       "storage",      0,      "varchar",      "create function 
sys.\"storage\"()\nreturns table (\n\"schema\" varchar(1024),\n\"table\" 
varchar(1024),\n\"column\" varchar(1024), \"type\" varchar(1024),\n\"mode\" 
varchar(15),\nlocation varchar(1024),\n\"count\" bigint,\ntypewidth 
int,\ncolumnsize bigint,\nheapsize bigint,\nhashes bigint,\nphash 
boolean,\n\"imprints\" bigint,\nsorted boolean,\nrevsorted boolean,\n\"unique\" 
boolean,\norderidx bigint\n)\nexternal name sql.\"storage\";"       ]
+[ "sys",       "storage",      0,      "varchar",      "create function 
sys.\"storage\"()\nreturns table (\n\"schema\" varchar(1024),\n\"table\" 
varchar(1024),\n\"column\" varchar(1024),\n\"type\" varchar(1024),\n\"mode\" 
varchar(15),\nlocation varchar(1024),\n\"count\" bigint,\ntypewidth 
int,\ncolumnsize bigint,\nheapsize bigint,\nhashes bigint,\nphash 
boolean,\n\"imprints\" bigint,\nsorted boolean,\nrevsorted boolean,\n\"unique\" 
boolean,\norderidx bigint\n)\nexternal name sql.\"storage\";"      ]
 [ "sys",       "storage",      1,      "varchar",      ""      ]
 [ "sys",       "storage",      2,      "varchar",      ""      ]
 [ "sys",       "storage",      3,      "varchar",      ""      ]
@@ -3489,7 +3489,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "timestamp_to_str",     0,      "clob", "create function 
timestamp_to_str(d timestamp with time zone, format string) returns 
string\nexternal name mtime.\"timestamp_to_str\";" ]
 [ "sys",       "timestamp_to_str",     1,      "timestamptz",  ""      ]
 [ "sys",       "timestamp_to_str",     2,      "clob", ""      ]
-[ "sys",       "tracelog",     0,      "bigint",       "create function 
sys.tracelog()\nreturns table (\nticks bigint, stmt string )\nexternal name 
sql.dump_trace;"   ]
+[ "sys",       "tracelog",     0,      "bigint",       "create function 
sys.tracelog()\nreturns table (\nticks bigint,\nstmt string\n)\nexternal name 
sql.dump_trace;" ]
 [ "sys",       "tracelog",     1,      "clob", ""      ]
 [ "sys",       "trim", 0,      "char", "trim"  ]
 [ "sys",       "trim", 1,      "char", ""      ]
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 
b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
@@ -28,7 +28,7 @@ stdout of test 'systemfunctions` in dire
 % sys.,        sys.,   sys.,   sys.,   . # table_name
 % schema,      function,       argno,  argtype,        definition # name
 % varchar,     varchar,        int,    varchar,        varchar # type
-% 8,   24,     2,      14,     681 # length
+% 8,   24,     2,      14,     679 # length
 [ "json",      "filter",       0,      "json", "create function json.filter(js 
json, pathexpr string)\nreturns json external name json.filter;"        ]
 [ "json",      "filter",       1,      "json", ""      ]
 [ "json",      "filter",       2,      "clob", ""      ]
@@ -456,7 +456,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "code", 1,      "int",  ""      ]
 [ "sys",       "code", 0,      "clob", "unicode"       ]
 [ "sys",       "code", 1,      "int",  ""      ]
-[ "sys",       "columnsize",   0,      "bigint",       "create function 
sys.columnsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\n if tpe 
in ('tinyint', 'boolean')\nthen return count;\nend if;\nif tpe = 
'smallint'\nthen return 2 * count;\nend if;\nif tpe in ('int', 'real', 'date', 
'time', 'timetz', 'sec_interval', 'month_interval')\nthen return 4 * 
count;\nend if;\nif tpe in ('bigint', 'double', 'timestamp', 'timestamptz', 
'inet', 'oid')\nthen return 8 * count;\nend if;\nif tpe in ('hugeint', 
'decimal', 'uuid', 'mbr')\nthen return 16 * count;\nend if;\n if tpe in 
('varchar', 'char', 'clob', 'json', 'url')\nthen return 4 * count;\nend if;\nif 
tpe in ('blob', 'geometry', 'geometrya')\nthen return 8 * count;\nend 
if;\nreturn 8 * count;\nend;"    ]
+[ "sys",       "columnsize",   0,      "bigint",       "create function 
sys.columnsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\nif tpe 
in ('tinyint', 'boolean')\nthen return count;\nend if;\nif tpe = 
'smallint'\nthen return 2 * count;\nend if;\nif tpe in ('int', 'real', 'date', 
'time', 'timetz', 'sec_interval', 'month_interval')\nthen return 4 * 
count;\nend if;\nif tpe in ('bigint', 'double', 'timestamp', 'timestamptz', 
'inet', 'oid')\nthen return 8 * count;\nend if;\nif tpe in ('hugeint', 
'decimal', 'uuid', 'mbr')\nthen return 16 * count;\nend if;\nif tpe in 
('varchar', 'char', 'clob', 'json', 'url')\nthen return 4 * count;\nend if;\nif 
tpe in ('blob', 'geometry', 'geometrya')\nthen return 8 * count;\nend 
if;\nreturn 8 * count;\nend;"      ]
 [ "sys",       "columnsize",   1,      "varchar",      ""      ]
 [ "sys",       "columnsize",   2,      "bigint",       ""      ]
 [ "sys",       "concat",       0,      "char", "+"     ]
@@ -937,10 +937,10 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "has_z",        1,      "int",  ""      ]
 [ "sys",       "hash", 0,      "bigint",       "hash"  ]
 [ "sys",       "hash", 1,      "any",  ""      ]
-[ "sys",       "hashsize",     0,      "bigint",       "create function 
sys.hashsize(b boolean, count bigint)\nreturns bigint\nbegin\n if b = 
true\nthen return 8 * count;\nend if;\nreturn 0;\nend;"  ]
+[ "sys",       "hashsize",     0,      "bigint",       "create function 
sys.hashsize(b boolean, count bigint)\nreturns bigint\nbegin\nif b = true\nthen 
return 8 * count;\nend if;\nreturn 0;\nend;"   ]
 [ "sys",       "hashsize",     1,      "boolean",      ""      ]
 [ "sys",       "hashsize",     2,      "bigint",       ""      ]
-[ "sys",       "heapsize",     0,      "bigint",       "create function 
sys.heapsize(tpe varchar(1024), count bigint, distincts bigint, avgwidth 
int)\nreturns bigint\nbegin\n if tpe in ('varchar', 'char', 'clob', 'json', 
'url')\nthen return 8192 + ((avgwidth + 8) * distincts);\nend if;\nif tpe in 
('blob', 'geometry', 'geometrya')\nthen return 32 + (avgwidth * count);\nend 
if;\nreturn 0;\nend;"   ]
+[ "sys",       "heapsize",     0,      "bigint",       "create function 
sys.heapsize(tpe varchar(1024), count bigint, distincts bigint, avgwidth 
int)\nreturns bigint\nbegin\nif tpe in ('varchar', 'char', 'clob', 'json', 
'url')\nthen return 8192 + ((avgwidth + 8) * distincts);\nend if;\nif tpe in 
('blob', 'geometry', 'geometrya')\nthen return 32 + (avgwidth * count);\nend 
if;\nreturn 0;\nend;"    ]
 [ "sys",       "heapsize",     1,      "varchar",      ""      ]
 [ "sys",       "heapsize",     2,      "bigint",       ""      ]
 [ "sys",       "heapsize",     3,      "bigint",       ""      ]
@@ -973,7 +973,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "ilike",        2,      "clob", ""      ]
 [ "sys",       "ilike",        0,      "clob", "create filter function 
\"ilike\"(val string, pat string) external name algebra.\"ilike\";"     ]
 [ "sys",       "ilike",        1,      "clob", ""      ]
-[ "sys",       "imprintsize",  0,      "bigint",       "create function 
sys.imprintsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\n if 
tpe in ('tinyint', 'boolean')\nthen return cast(0.2 * count as bigint);\nend 
if;\nif tpe = 'smallint'\nthen return cast(0.4 * count as bigint);\nend if;\nif 
tpe in ('int', 'real', 'date', 'time', 'timetz', 'sec_interval', 
'month_interval')\nthen return cast(0.8 * count as bigint);\nend if;\nif tpe in 
('bigint', 'double', 'timestamp', 'timestamptz', 'inet', 'oid')\nthen return 
cast(1.6 * count as bigint);\nend if;\n if tpe in ('hugeint', 'decimal', 
'uuid', 'mbr')\nthen return cast(3.2 * count as bigint);\nend if;\n return 
0;\nend;"  ]
+[ "sys",       "imprintsize",  0,      "bigint",       "create function 
sys.imprintsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\nif tpe 
in ('tinyint', 'boolean')\nthen return cast(0.2 * count as bigint);\nend 
if;\nif tpe = 'smallint'\nthen return cast(0.4 * count as bigint);\nend if;\nif 
tpe in ('int', 'real', 'date', 'time', 'timetz', 'sec_interval', 
'month_interval')\nthen return cast(0.8 * count as bigint);\nend if;\nif tpe in 
('bigint', 'double', 'timestamp', 'timestamptz', 'inet', 'oid')\nthen return 
cast(1.6 * count as bigint);\nend if;\nif tpe in ('hugeint', 'decimal', 'uuid', 
'mbr')\nthen return cast(3.2 * count as bigint);\nend if;\nreturn 0;\nend;"     
]
 [ "sys",       "imprintsize",  1,      "varchar",      ""      ]
 [ "sys",       "imprintsize",  2,      "bigint",       ""      ]
 [ "sys",       "index",        0,      "tinyint",      "index" ]
@@ -1840,7 +1840,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "querycache",   0,      "clob", "create function 
sys.querycache()\nreturns table (query string, count int)\nexternal name 
sql.dump_cache;"      ]
 [ "sys",       "querycache",   1,      "int",  ""      ]
 [ "sys",       "querylog",     0,      "clob", "create procedure 
sys.querylog(filename string)\nexternal name sql.logfile;"    ]
-[ "sys",       "querylog_calls",       0,      "oid",  "create function 
sys.querylog_calls()\nreturns table(\nid oid, \"start\" timestamp, \"stop\" 
timestamp, arguments string, tuples bigint, run bigint, ship bigint, cpu int, 
io int )\nexternal name sql.querylog_calls;" ]
+[ "sys",       "querylog_calls",       0,      "oid",  "create function 
sys.querylog_calls()\nreturns table(\nid oid,\n\"start\" timestamp,\n\"stop\" 
timestamp,\narguments string,\ntuples bigint,\nrun bigint,\nship bigint,\ncpu 
int,\nio int\n)\nexternal name sql.querylog_calls;"        ]
 [ "sys",       "querylog_calls",       1,      "timestamp",    ""      ]
 [ "sys",       "querylog_calls",       2,      "timestamp",    ""      ]
 [ "sys",       "querylog_calls",       3,      "clob", ""      ]
@@ -1849,7 +1849,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "querylog_calls",       6,      "bigint",       ""      ]
 [ "sys",       "querylog_calls",       7,      "int",  ""      ]
 [ "sys",       "querylog_calls",       8,      "int",  ""      ]
-[ "sys",       "querylog_catalog",     0,      "oid",  "create function 
sys.querylog_catalog()\nreturns table(\nid oid,\nowner string,\ndefined 
timestamp,\nquery string,\npipe string,\n\"plan\" string, mal int, optimize 
bigint )\nexternal name sql.querylog_catalog;"     ]
+[ "sys",       "querylog_catalog",     0,      "oid",  "create function 
sys.querylog_catalog()\nreturns table(\nid oid,\nowner string,\ndefined 
timestamp,\nquery string,\npipe string,\n\"plan\" string,\nmal int,\noptimize 
bigint\n)\nexternal name sql.querylog_catalog;"  ]
 [ "sys",       "querylog_catalog",     1,      "clob", ""      ]
 [ "sys",       "querylog_catalog",     2,      "timestamp",    ""      ]
 [ "sys",       "querylog_catalog",     3,      "clob", ""      ]
@@ -1858,7 +1858,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "querylog_catalog",     6,      "int",  ""      ]
 [ "sys",       "querylog_catalog",     7,      "bigint",       ""      ]
 [ "sys",       "querylog_enable",      0,      "int",  "create procedure 
sys.querylog_enable(threshold integer)\nexternal name sql.querylog_enable;"   ]
-[ "sys",       "queue",        0,      "bigint",       "create function 
sys.queue()\nreturns table(\n\"tag\" bigint,\n\"sessionid\" int,\n\"username\" 
string,\n\"started\" timestamp,\n\"status\" string, \"query\" 
string,\n\"finished\" timestamp, \"workers\" int,\n\"memory\" int\n)\nexternal 
name sysmon.queue;"        ]
+[ "sys",       "queue",        0,      "bigint",       "create function 
sys.queue()\nreturns table(\n\"tag\" bigint,\n\"sessionid\" int,\n\"username\" 
string,\n\"started\" timestamp,\n\"status\" string,\n\"query\" 
string,\n\"finished\" timestamp,\n\"workers\" int,\n\"memory\" int\n)\nexternal 
name sysmon.queue;"      ]
 [ "sys",       "queue",        1,      "int",  ""      ]
 [ "sys",       "queue",        2,      "clob", ""      ]
 [ "sys",       "queue",        3,      "timestamp",    ""      ]
@@ -3583,7 +3583,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "st_numinteriorring",   1,      "geometry",     ""      ]
 [ "sys",       "st_numinteriorrings",  0,      "int",  "create function 
st_numinteriorrings(geom geometry) returns integer external name 
geom.\"NumInteriorRings\";"   ]
 [ "sys",       "st_numinteriorrings",  1,      "geometry",     ""      ]
-[ "sys",       "st_numpatches",        0,      "int",  "create function 
st_numpatches(geom geometry) returns integer begin\nreturn select 
st_numgeometries(geom);\nend;"       ]
+[ "sys",       "st_numpatches",        0,      "int",  "create function 
st_numpatches(geom geometry) returns integer\nbegin\nreturn select 
st_numgeometries(geom);\nend;"      ]
 [ "sys",       "st_numpatches",        1,      "geometry",     ""      ]
 [ "sys",       "st_numpoints", 0,      "int",  "create function 
st_numpoints(geom geometry) returns integer external name geom.\"NumPoints\";" ]
 [ "sys",       "st_numpoints", 1,      "geometry",     ""      ]
@@ -3593,7 +3593,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "st_overlaps",  0,      "boolean",      "create function 
st_overlaps(geom1 geometry, geom2 geometry) returns boolean external name 
geom.\"Overlaps\";"  ]
 [ "sys",       "st_overlaps",  1,      "geometry",     ""      ]
 [ "sys",       "st_overlaps",  2,      "geometry",     ""      ]
-[ "sys",       "st_patchn",    0,      "geometry",     "create function 
st_patchn(geom geometry, patchnum integer) returns geometry begin\nreturn 
select st_geometryn(geom, patchnum);\nend;"  ]
+[ "sys",       "st_patchn",    0,      "geometry",     "create function 
st_patchn(geom geometry, patchnum integer) returns geometry\nbegin\nreturn 
select st_geometryn(geom, patchnum);\nend;" ]
 [ "sys",       "st_patchn",    1,      "geometry",     ""      ]
 [ "sys",       "st_patchn",    2,      "int",  ""      ]
 [ "sys",       "st_point",     0,      "geometry",     "create function 
st_point(x double, y double) returns geometry external name 
geom.\"MakePoint\";"       ]
@@ -3760,7 +3760,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "stddev_samp",  1,      "hugeint",      ""      ]
 [ "sys",       "stop", 0,      "bigint",       "create procedure sys.stop(tag 
bigint)\nexternal name sysmon.stop;"     ]
 [ "sys",       "stopsession",  0,      "int",  "create procedure 
sys.stopsession(\"sessionid\" int)\nexternal name clients.stopsession;"       ]
-[ "sys",       "storage",      0,      "varchar",      "create function 
sys.\"storage\"()\nreturns table (\n\"schema\" varchar(1024),\n\"table\" 
varchar(1024),\n\"column\" varchar(1024), \"type\" varchar(1024),\n\"mode\" 
varchar(15),\nlocation varchar(1024),\n\"count\" bigint,\ntypewidth 
int,\ncolumnsize bigint,\nheapsize bigint,\nhashes bigint,\nphash 
boolean,\n\"imprints\" bigint,\nsorted boolean,\nrevsorted boolean,\n\"unique\" 
boolean,\norderidx bigint\n)\nexternal name sql.\"storage\";"       ]
+[ "sys",       "storage",      0,      "varchar",      "create function 
sys.\"storage\"()\nreturns table (\n\"schema\" varchar(1024),\n\"table\" 
varchar(1024),\n\"column\" varchar(1024),\n\"type\" varchar(1024),\n\"mode\" 
varchar(15),\nlocation varchar(1024),\n\"count\" bigint,\ntypewidth 
int,\ncolumnsize bigint,\nheapsize bigint,\nhashes bigint,\nphash 
boolean,\n\"imprints\" bigint,\nsorted boolean,\nrevsorted boolean,\n\"unique\" 
boolean,\norderidx bigint\n)\nexternal name sql.\"storage\";"      ]
 [ "sys",       "storage",      1,      "varchar",      ""      ]
 [ "sys",       "storage",      2,      "varchar",      ""      ]
 [ "sys",       "storage",      3,      "varchar",      ""      ]
@@ -3963,7 +3963,7 @@ stdout of test 'systemfunctions` in dire
 [ "sys",       "timestamp_to_str",     0,      "clob", "create function 
timestamp_to_str(d timestamp with time zone, format string) returns 
string\nexternal name mtime.\"timestamp_to_str\";" ]
 [ "sys",       "timestamp_to_str",     1,      "timestamptz",  ""      ]
 [ "sys",       "timestamp_to_str",     2,      "clob", ""      ]
-[ "sys",       "tracelog",     0,      "bigint",       "create function 
sys.tracelog()\nreturns table (\nticks bigint, stmt string )\nexternal name 
sql.dump_trace;"   ]
+[ "sys",       "tracelog",     0,      "bigint",       "create function 
sys.tracelog()\nreturns table (\nticks bigint,\nstmt string\n)\nexternal name 
sql.dump_trace;" ]
 [ "sys",       "tracelog",     1,      "clob", ""      ]
 [ "sys",       "trim", 0,      "char", "trim"  ]
 [ "sys",       "trim", 1,      "char", ""      ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to