Changeset: d07b6d5d5e21 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d07b6d5d5e21
Modified Files:
monetdb5/mal/Tests/tst611.malC
monetdb5/modules/mal/Tests/remote03.stable.err
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Tests/median_stdev.stable.out
sql/test/Tests/outerref_in_selection.stable.out
sql/test/Tests/outerref_in_selection.stable.out.int128
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3.stable.out.int128
Branch: leftmart
Log Message:
reverting some test outputs to the default .out
diffs (truncated from 448 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst611.malC b/monetdb5/mal/Tests/tst611.malC
--- a/monetdb5/mal/Tests/tst611.malC
+++ b/monetdb5/mal/Tests/tst611.malC
@@ -1,7 +1,7 @@
# initialization of BATs on the stack
# caused a problem when executed in interactve mode
function foo();
-RKA:= bat.new(:int,1048576);
+RKA:bat[:int]:= bat.new(:int,1048576);
bat.append(RKA,360:int);
io.print(RKA);
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.err
b/monetdb5/modules/mal/Tests/remote03.stable.err
--- a/monetdb5/modules/mal/Tests/remote03.stable.err
+++ b/monetdb5/modules/mal/Tests/remote03.stable.err
@@ -30,7 +30,7 @@ stderr of test 'remote03` in directory '
# 23:12:08 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-23626" "--port=30565"
# 23:12:08 >
-MAPI = (monetdb) /var/tmp/mtest-7799/.s.monetdb.33721
+MAPI = (monetdb) /var/tmp/mtest-25315/.s.monetdb.30153
QUERY = # let connect figure out itself how to connect to the running db
uri := sabaoth.getLocalConnectionURI();
conn:str := remote.connect(uri, "monetdb", "monetdb");
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out
b/sql/test/Dependencies/Tests/Dependencies.stable.out
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.out
@@ -275,7 +275,6 @@ Dependencies between database objects
[ "name", "dependencies_views_on_functions", "DEP_FUNC" ]
[ "name", "dependencies_views_on_triggers", "DEP_FUNC" ]
[ "name", "f2", "DEP_FUNC" ]
-[ "orderidx", "storagemodel", "DEP_FUNC" ]
[ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ]
[ "proj4text", "getproj4", "DEP_FUNC" ]
[ "reference", "storagemodel", "DEP_FUNC" ]
@@ -787,7 +786,6 @@ Cleanup
[ "name", "dependencies_tables_on_triggers", "DEP_FUNC" ]
[ "name", "dependencies_views_on_functions", "DEP_FUNC" ]
[ "name", "dependencies_views_on_triggers", "DEP_FUNC" ]
-[ "orderidx", "storagemodel", "DEP_FUNC" ]
[ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ]
[ "proj4text", "getproj4", "DEP_FUNC" ]
[ "reference", "storagemodel", "DEP_FUNC" ]
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
@@ -275,7 +275,6 @@ Dependencies between database objects
[ "name", "dependencies_views_on_functions", "DEP_FUNC" ]
[ "name", "dependencies_views_on_triggers", "DEP_FUNC" ]
[ "name", "f2", "DEP_FUNC" ]
-[ "orderidx", "storagemodel", "DEP_FUNC" ]
[ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ]
[ "proj4text", "getproj4", "DEP_FUNC" ]
[ "reference", "storagemodel", "DEP_FUNC" ]
@@ -790,7 +789,6 @@ Cleanup
[ "name", "dependencies_tables_on_triggers", "DEP_FUNC" ]
[ "name", "dependencies_views_on_functions", "DEP_FUNC" ]
[ "name", "dependencies_views_on_triggers", "DEP_FUNC" ]
-[ "orderidx", "storagemodel", "DEP_FUNC" ]
[ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ]
[ "proj4text", "getproj4", "DEP_FUNC" ]
[ "reference", "storagemodel", "DEP_FUNC" ]
diff --git a/sql/test/Tests/median_stdev.stable.out
b/sql/test/Tests/median_stdev.stable.out
--- a/sql/test/Tests/median_stdev.stable.out
+++ b/sql/test/Tests/median_stdev.stable.out
@@ -80,8 +80,8 @@ Ready.
# GROUP BY GroupID
#) G
#ON R.GroupID = G.GroupID AND R.rowNo BETWEEN N/2 AND N/2+N%2
-#GROUP BY R.groupID ORDER by R.groupID;
-% sys.r, .L3 # table_name
+#GROUP BY R.groupID;
+% sys.r, .L2 # table_name
% groupid, medianvalue # name
% int, double # type
% 1, 24 # length
diff --git a/sql/test/Tests/outerref_in_selection.stable.out
b/sql/test/Tests/outerref_in_selection.stable.out
--- a/sql/test/Tests/outerref_in_selection.stable.out
+++ b/sql/test/Tests/outerref_in_selection.stable.out
@@ -36,7 +36,7 @@ Ready.
# FROM capediff AS a
# WHERE a.cape_date <= b.cape_date) AS numppl
# FROM capediff AS b;
-% .b, .L1 # table_name
+% .b, .L2 # table_name
% cape_date, numppl # name
% date, bigint # type
% 10, 1 # length
diff --git a/sql/test/Tests/outerref_in_selection.stable.out.int128
b/sql/test/Tests/outerref_in_selection.stable.out.int128
--- a/sql/test/Tests/outerref_in_selection.stable.out.int128
+++ b/sql/test/Tests/outerref_in_selection.stable.out.int128
@@ -36,7 +36,7 @@ Ready.
# FROM capediff AS a
# WHERE a.cape_date <= b.cape_date) AS numppl
# FROM capediff AS b;
-% .b, .L1 # table_name
+% .b, .L2 # table_name
% cape_date, numppl # name
% date, hugeint # type
% 10, 1 # length
diff --git a/sql/test/Tests/systemfunctions.stable.out
b/sql/test/Tests/systemfunctions.stable.out
--- a/sql/test/Tests/systemfunctions.stable.out
+++ b/sql/test/Tests/systemfunctions.stable.out
@@ -454,12 +454,6 @@ Ready.
[ "sys", "corr", 0, "double", "create aggregate corr(e1
double, e2 double) returns double\n external name \"aggr\".\"corr\";" ]
[ "sys", "corr", 1, "double", "" ]
[ "sys", "corr", 2, "double", "" ]
-<<<<<<< local
-[ "sys", "createorderindex", 0, "clob", "create procedure
sys.createorderindex(sys string, tab string, col string)\n external name
sql.createorderindex;" ]
-[ "sys", "createorderindex", 1, "clob", "" ]
-[ "sys", "createorderindex", 2, "clob", "" ]
-[ "sys", "date_to_str", 0, "clob", "create function date_to_str(d
date, format string) returns string\n external name mtime.\"date_to_str\";"
]
-=======
[ "sys", "cos", 0, "real", "cos" ]
[ "sys", "cos", 1, "real", "" ]
[ "sys", "cos", 0, "double", "cos" ]
@@ -480,7 +474,6 @@ Ready.
[ "sys", "current_timestamp", 0, "timestamptz",
"current_timestamp" ]
[ "sys", "curtime", 0, "timetz", "current_time" ]
[ "sys", "date_to_str", 0, "clob", "create function date_to_str(d
date, format string) returns string\n external name mtime.\"date_to_str\";"
]
->>>>>>> other
[ "sys", "date_to_str", 1, "date", "" ]
[ "sys", "date_to_str", 2, "clob", "" ]
[ "sys", "day", 0, "int", "day" ]
@@ -557,11 +550,6 @@ Ready.
[ "sys", "dependencies_views_on_triggers", 0, "varchar",
"create function dependencies_views_on_triggers()\nreturns table (sch
varchar(100), usr varchar(100), dep_type varchar(32))\nreturn table (select
v.name, tri.name, 'DEP_TRIGGER' from tables as v, triggers as tri, dependencies
as dep where dep.id = v.id and dep.depend_id =tri.id and dep.depend_type = 8
and v.type = 1);" ]
[ "sys", "dependencies_views_on_triggers", 1, "varchar",
"" ]
[ "sys", "dependencies_views_on_triggers", 2, "varchar",
"" ]
-<<<<<<< local
-[ "sys", "droporderindex", 0, "clob", "create procedure
sys.droporderindex(sys string, tab string, col string)\n external name
sql.droporderindex;" ]
-[ "sys", "droporderindex", 1, "clob", "" ]
-[ "sys", "droporderindex", 2, "clob", "" ]
-=======
[ "sys", "diff", 0, "boolean", "diff" ]
[ "sys", "diff", 1, "any", "" ]
[ "sys", "diff", 0, "boolean", "diff" ]
@@ -594,7 +582,6 @@ Ready.
[ "sys", "editdistance2", 0, "int", "editdistance2" ]
[ "sys", "editdistance2", 1, "clob", "" ]
[ "sys", "editdistance2", 2, "clob", "" ]
->>>>>>> other
[ "sys", "env", 0, "varchar", "CREATE FUNCTION env () RETURNS
TABLE( name varchar(1024), value varchar(2048)) EXTERNAL NAME
sql.sql_environment;" ]
[ "sys", "env", 1, "varchar", "" ]
[ "sys", "environment", 0, "clob", "create function
sys.environment()\n returns table (\"name\" string, value string)\n external
name sql.sql_environment;" ]
@@ -679,14 +666,10 @@ Ready.
[ "sys", "get_type", 0, "clob", "create function get_type(info
integer, format integer) returns string external name geom.\"getType\";" ]
[ "sys", "get_type", 1, "int", "" ]
[ "sys", "get_type", 2, "int", "" ]
-<<<<<<< local
-[ "sys", "getanchor", 0, "clob", "create function getanchor(
theurl url ) returns string\n external name url.\"getAnchor\";" ]
-=======
[ "sys", "get_value_for", 0, "bigint", "get_value"
]
[ "sys", "get_value_for", 1, "varchar", "" ]
[ "sys", "get_value_for", 2, "varchar", "" ]
[ "sys", "getanchor", 0, "clob", "create function getanchor(
theurl url ) returns string\n external name url.\"getAnchor\";" ]
->>>>>>> other
[ "sys", "getanchor", 1, "url", "" ]
[ "sys", "getbasename", 0, "clob", "create function
getbasename(theurl url) returns string\n external name url.\"getBasename\";" ]
[ "sys", "getbasename", 1, "url", "" ]
@@ -1139,9 +1122,6 @@ Ready.
[ "sys", "median", 1, "time", "" ]
[ "sys", "median", 0, "timestamp", "create aggregate
median(val timestamp) returns timestamp\n external name \"aggr\".\"median\";" ]
[ "sys", "median", 1, "timestamp", "" ]
-<<<<<<< local
-[ "sys", "ms_round", 0, "double", "create function
ms_round(num double, prc int, truncat int)\nreturns double\nbegin\n if (truncat
= 0)\n then return round(num, prc);\n else return ms_trunc(num, prc);\n end
if;\nend;" ]
-=======
[ "sys", "min", 0, "any", "min" ]
[ "sys", "min", 1, "any", "" ]
[ "sys", "minute", 0, "int", "minutes" ]
@@ -1199,7 +1179,6 @@ Ready.
[ "sys", "month", 0, "int", "month" ]
[ "sys", "month", 1, "month_interval", "" ]
[ "sys", "ms_round", 0, "double", "create function
ms_round(num double, prc int, truncat int)\nreturns double\nbegin\n if (truncat
= 0)\n then return round(num, prc);\n else return ms_trunc(num, prc);\n end
if;\nend;" ]
->>>>>>> other
[ "sys", "ms_round", 1, "double", "" ]
[ "sys", "ms_round", 2, "int", "" ]
[ "sys", "ms_round", 3, "int", "" ]
@@ -4381,7 +4360,7 @@ Ready.
[ "sys", "stddev_samp", 1, "timestamp", "" ]
[ "sys", "stop", 0, "int", "create procedure sys.stop(tag
int)\nexternal name sql.sysmon_stop;" ]
[ "sys", "stop", 0, "bigint", "create procedure sys.stop(tag
bigint)\nexternal name sql.sysmon_stop;" ]
-[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"()\nreturns table (\n \"schema\" string,\n \"table\" string,\n
\"column\" string,\n \"type\" string,\n \"mode\" string,\n location string,\n
\"count\" bigint,\n typewidth int,\n columnsize bigint,\n heapsize bigint,\n
hashes bigint,\n phash boolean,\n imprints bigint,\n sorted boolean,\n orderidx
bigint\n)\nexternal name sql.\"storage\";" ]
+[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"()\nreturns table (\n \"schema\" string,\n \"table\" string,\n
\"column\" string,\n \"type\" string,\n \"mode\" string,\n location string,\n
\"count\" bigint,\n typewidth int,\n columnsize bigint,\n heapsize bigint,\n
hashes bigint,\n phash boolean,\n imprints bigint,\n sorted
boolean\n)\nexternal name sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
[ "sys", "storage", 3, "clob", "" ]
@@ -4395,8 +4374,7 @@ Ready.
[ "sys", "storage", 11, "boolean", "" ]
[ "sys", "storage", 12, "bigint", "" ]
[ "sys", "storage", 13, "boolean", "" ]
-[ "sys", "storage", 14, "bigint", "" ]
-[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string)\nreturns table (\n \"schema\" string,\n
\"table\" string,\n \"column\" string,\n \"type\" string,\n \"mode\" string,\n
location string,\n \"count\" bigint,\n typewidth int,\n columnsize bigint,\n
heapsize bigint,\n hashes bigint,\n phash boolean,\n imprints bigint,\n sorted
boolean,\n orderidx bigint\n)\nexternal name sql.\"storage\";" ]
+[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string)\nreturns table (\n \"schema\" string,\n
\"table\" string,\n \"column\" string,\n \"type\" string,\n \"mode\" string,\n
location string,\n \"count\" bigint,\n typewidth int,\n columnsize bigint,\n
heapsize bigint,\n hashes bigint,\n phash boolean,\n imprints bigint,\n sorted
boolean\n)\nexternal name sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
[ "sys", "storage", 3, "clob", "" ]
@@ -4410,9 +4388,8 @@ Ready.
[ "sys", "storage", 11, "boolean", "" ]
[ "sys", "storage", 12, "bigint", "" ]
[ "sys", "storage", 13, "boolean", "" ]
-[ "sys", "storage", 14, "bigint", "" ]
-[ "sys", "storage", 15, "clob", "" ]
-[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string, tname string)\nreturns table (\n \"schema\"
string,\n \"table\" string,\n \"column\" string,\n \"type\" string,\n \"mode\"
string,\n location string,\n \"count\" bigint,\n typewidth int,\n columnsize
bigint,\n heapsize bigint,\n hashes bigint,\n phash boolean,\n imprints
bigint,\n sorted boolean,\n orderidx bigint\n)\nexternal name sql.\"storage\";"
]
+[ "sys", "storage", 14, "clob", "" ]
+[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string, tname string)\nreturns table (\n \"schema\"
string,\n \"table\" string,\n \"column\" string,\n \"type\" string,\n \"mode\"
string,\n location string,\n \"count\" bigint,\n typewidth int,\n columnsize
bigint,\n heapsize bigint,\n hashes bigint,\n phash boolean,\n imprints
bigint,\n sorted boolean\n)\nexternal name sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
[ "sys", "storage", 3, "clob", "" ]
@@ -4426,10 +4403,9 @@ Ready.
[ "sys", "storage", 11, "boolean", "" ]
[ "sys", "storage", 12, "bigint", "" ]
[ "sys", "storage", 13, "boolean", "" ]
-[ "sys", "storage", 14, "bigint", "" ]
+[ "sys", "storage", 14, "clob", "" ]
[ "sys", "storage", 15, "clob", "" ]
-[ "sys", "storage", 16, "clob", "" ]
-[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string, tname string, cname string)\nreturns table (\n
\"schema\" string,\n \"table\" string,\n \"column\" string,\n \"type\"
string,\n \"mode\" string,\n location string,\n \"count\" bigint,\n typewidth
int,\n columnsize bigint,\n heapsize bigint,\n hashes bigint,\n phash
boolean,\n imprints bigint,\n sorted boolean,\n orderidx bigint\n)\nexternal
name sql.\"storage\";" ]
+[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string, tname string, cname string)\nreturns table (\n
\"schema\" string,\n \"table\" string,\n \"column\" string,\n \"type\"
string,\n \"mode\" string,\n location string,\n \"count\" bigint,\n typewidth
int,\n columnsize bigint,\n heapsize bigint,\n hashes bigint,\n phash
boolean,\n imprints bigint,\n sorted boolean\n)\nexternal name
sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
[ "sys", "storage", 3, "clob", "" ]
@@ -4443,11 +4419,10 @@ Ready.
[ "sys", "storage", 11, "boolean", "" ]
[ "sys", "storage", 12, "bigint", "" ]
[ "sys", "storage", 13, "boolean", "" ]
-[ "sys", "storage", 14, "bigint", "" ]
+[ "sys", "storage", 14, "clob", "" ]
[ "sys", "storage", 15, "clob", "" ]
[ "sys", "storage", 16, "clob", "" ]
-[ "sys", "storage", 17, "clob", "" ]
-[ "sys", "storagemodel", 0, "clob", "create function
sys.storagemodel()\nreturns table (\n \"schema\" string,\n \"table\" string,\n
\"column\" string,\n \"type\" string,\n \"count\" bigint,\n columnsize
bigint,\n heapsize bigint,\n hashes bigint,\n imprints bigint,\n sorted
boolean,\n orderidx bigint)\nbegin\n return select i.\"schema\", i.\"table\",
i.\"column\", i.\"type\", i.\"count\",\n columnsize(i.\"type\", i.count,
i.\"distinct\"),\n heapsize(i.\"type\", i.\"distinct\", i.\"atomwidth\"),\n
hashsize(i.\"reference\", i.\"count\"),\n
imprintsize(i.\"count\",i.\"type\"),\n i.sorted, i.orderidx\n from
sys.storagemodelinput i;\nend;" ]
+[ "sys", "storagemodel", 0, "clob", "create function
sys.storagemodel()\nreturns table (\n \"schema\" string,\n \"table\" string,\n
\"column\" string,\n \"type\" string,\n \"count\" bigint,\n columnsize
bigint,\n heapsize bigint,\n hashes bigint,\n imprints bigint,\n sorted
boolean)\nbegin\n return select i.\"schema\", i.\"table\", i.\"column\",
i.\"type\", i.\"count\",\n columnsize(i.\"type\", i.count, i.\"distinct\"),\n
heapsize(i.\"type\", i.\"distinct\", i.\"atomwidth\"),\n
hashsize(i.\"reference\", i.\"count\"),\n
imprintsize(i.\"count\",i.\"type\"),\n i.sorted\n from sys.storagemodelinput
i;\nend;" ]
[ "sys", "storagemodel", 1, "clob", "" ]
[ "sys", "storagemodel", 2, "clob", "" ]
[ "sys", "storagemodel", 3, "clob", "" ]
@@ -4457,7 +4432,6 @@ Ready.
[ "sys", "storagemodel", 7, "bigint", "" ]
[ "sys", "storagemodel", 8, "bigint", "" ]
[ "sys", "storagemodel", 9, "boolean", "" ]
-[ "sys", "storagemodel", 10, "bigint", "" ]
[ "sys", "str_to_date", 0, "date", "create function str_to_date(s
string, format string) returns date\n external name mtime.\"str_to_date\";"
]
[ "sys", "str_to_date", 1, "clob", "" ]
[ "sys", "str_to_date", 2, "clob", "" ]
diff --git a/sql/test/Tests/systemfunctions.stable.out.int128
b/sql/test/Tests/systemfunctions.stable.out.int128
--- a/sql/test/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/Tests/systemfunctions.stable.out.int128
@@ -486,11 +486,6 @@ Ready.
[ "sys", "corr", 0, "hugeint", "create aggregate corr(e1
hugeint, e2 hugeint) returns hugeint\n external name \"aggr\".\"corr\";" ]
[ "sys", "corr", 1, "hugeint", "" ]
[ "sys", "corr", 2, "hugeint", "" ]
-<<<<<<< local
-[ "sys", "createorderindex", 0, "clob", "create procedure
sys.createorderindex(sys string, tab string, col string)\n external name
sql.createorderindex;" ]
-[ "sys", "createorderindex", 1, "clob", "" ]
-[ "sys", "createorderindex", 2, "clob", "" ]
-=======
[ "sys", "cos", 0, "real", "cos" ]
[ "sys", "cos", 1, "real", "" ]
[ "sys", "cos", 0, "double", "cos" ]
@@ -510,7 +505,6 @@ Ready.
[ "sys", "current_time", 0, "timetz", "current_time" ]
[ "sys", "current_timestamp", 0, "timestamptz",
"current_timestamp" ]
[ "sys", "curtime", 0, "timetz", "current_time" ]
->>>>>>> other
[ "sys", "date_to_str", 0, "clob", "create function date_to_str(d
date, format string) returns string\n external name mtime.\"date_to_str\";"
]
[ "sys", "date_to_str", 1, "date", "" ]
[ "sys", "date_to_str", 2, "clob", "" ]
@@ -588,11 +582,6 @@ Ready.
[ "sys", "dependencies_views_on_triggers", 0, "varchar",
"create function dependencies_views_on_triggers()\nreturns table (sch
varchar(100), usr varchar(100), dep_type varchar(32))\nreturn table (select
v.name, tri.name, 'DEP_TRIGGER' from tables as v, triggers as tri, dependencies
as dep where dep.id = v.id and dep.depend_id =tri.id and dep.depend_type = 8
and v.type = 1);" ]
[ "sys", "dependencies_views_on_triggers", 1, "varchar",
"" ]
[ "sys", "dependencies_views_on_triggers", 2, "varchar",
"" ]
-<<<<<<< local
-[ "sys", "droporderindex", 0, "clob", "create procedure
sys.droporderindex(sys string, tab string, col string)\n external name
sql.droporderindex;" ]
-[ "sys", "droporderindex", 1, "clob", "" ]
-[ "sys", "droporderindex", 2, "clob", "" ]
-=======
[ "sys", "diff", 0, "boolean", "diff" ]
[ "sys", "diff", 1, "any", "" ]
[ "sys", "diff", 0, "boolean", "diff" ]
@@ -625,7 +614,6 @@ Ready.
[ "sys", "editdistance2", 0, "int", "editdistance2" ]
[ "sys", "editdistance2", 1, "clob", "" ]
[ "sys", "editdistance2", 2, "clob", "" ]
->>>>>>> other
[ "sys", "env", 0, "varchar", "CREATE FUNCTION env () RETURNS
TABLE( name varchar(1024), value varchar(2048)) EXTERNAL NAME
sql.sql_environment;" ]
[ "sys", "env", 1, "varchar", "" ]
[ "sys", "environment", 0, "clob", "create function
sys.environment()\n returns table (\"name\" string, value string)\n external
name sql.sql_environment;" ]
@@ -4912,7 +4900,7 @@ Ready.
[ "sys", "stddev_samp", 1, "hugeint", "" ]
[ "sys", "stop", 0, "int", "create procedure sys.stop(tag
int)\nexternal name sql.sysmon_stop;" ]
[ "sys", "stop", 0, "bigint", "create procedure sys.stop(tag
bigint)\nexternal name sql.sysmon_stop;" ]
-[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"()\nreturns table (\n \"schema\" string,\n \"table\" string,\n
\"column\" string,\n \"type\" string,\n \"mode\" string,\n location string,\n
\"count\" bigint,\n typewidth int,\n columnsize bigint,\n heapsize bigint,\n
hashes bigint,\n phash boolean,\n imprints bigint,\n sorted boolean,\n orderidx
bigint\n)\nexternal name sql.\"storage\";" ]
+[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"()\nreturns table (\n \"schema\" string,\n \"table\" string,\n
\"column\" string,\n \"type\" string,\n \"mode\" string,\n location string,\n
\"count\" bigint,\n typewidth int,\n columnsize bigint,\n heapsize bigint,\n
hashes bigint,\n phash boolean,\n imprints bigint,\n sorted
boolean\n)\nexternal name sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
[ "sys", "storage", 3, "clob", "" ]
@@ -4926,8 +4914,7 @@ Ready.
[ "sys", "storage", 11, "boolean", "" ]
[ "sys", "storage", 12, "bigint", "" ]
[ "sys", "storage", 13, "boolean", "" ]
-[ "sys", "storage", 14, "bigint", "" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
