Changeset: a331c02fb78f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a331c02fb78f Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/exports.stable.out sql/test/Tests/systemfunctions.stable.out Branch: default Log Message:
Approve the tests diffs (117 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -40498,7 +40498,7 @@ address MKEYhash_sht; command mkey.hash(v:bte):wrd address MKEYhash_bte; command mkey.hash(v:bit):wrd -address MKEYhash_bit; +address MKEYhash_bte; pattern mkey.hash(v:any):wrd address MKEYhash; comment compute a hash int number from any value diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1346,7 +1346,7 @@ str CMDvarSIGN(Client cntxt, MalBlkPtr m str CMDvarSUB(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDvarSUBsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDvarXOR(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CNTRScounter2bat(int *bid, int *idx); +str CNTRScounter2bat(int *kid, int *vid, int *idx); str CNTRScounter2str(str *ret, int *idx); str CNTRSeventName(str *ret, int *nr); str CNTRSeventNumber(int *ret, str *nme); 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 @@ -49,7 +49,7 @@ Ready. % sys.L3, sys.L3, sys.L3, sys.L3, sys.L3 # table_name % schema, function, argno, argtype, definition # name % varchar, varchar, int, varchar, varchar # type -% 4, 35, 2, 15, 1646 # length +% 4, 35, 2, 15, 1662 # length [ "json", "filter", 0, "json", "-- access the top level key by name, return its value\ncreate function json.filter(js json, pathexpr string)\nreturns json external name json.filter;" ] [ "json", "filter", 1, "json", "" ] [ "json", "filter", 2, "clob", "" ] @@ -62,6 +62,8 @@ Ready. [ "json", "filter", 0, "json", "create function json.filter(js json, name bigint)\nreturns json external name json.filter;" ] [ "json", "filter", 1, "json", "" ] [ "json", "filter", 2, "bigint", "" ] +[ "json", "integer", 0, "bigint", "create function json.\"integer\"(js json)\nreturns bigint external name json.\"integer\";" ] +[ "json", "integer", 1, "json", "" ] [ "json", "isarray", 0, "boolean", "create function json.isarray(js string)\nreturns bool external name json.isarray;" ] [ "json", "isarray", 1, "clob", "" ] [ "json", "isarray", 0, "boolean", "create function json.isarray(js json)\nreturns bool external name json.isarray;" ] @@ -78,6 +80,8 @@ Ready. [ "json", "keyarray", 1, "json", "" ] [ "json", "length", 0, "int", "-- return the number of primary components\ncreate function json.length(js json)\nreturns integer external name json.length;" ] [ "json", "length", 1, "json", "" ] +[ "json", "number", 0, "double", "create function json.number(js json)\nreturns float external name json.number;" ] +[ "json", "number", 1, "json", "" ] [ "json", "text", 0, "clob", "create function json.text(js json, e string)\nreturns string external name json.text;" ] [ "json", "text", 1, "json", "" ] [ "json", "text", 2, "clob", "" ] @@ -116,7 +120,7 @@ Ready. [ "sys", "area", 1, "geometry", "" ] [ "sys", "astext", 0, "clob", "create function astext(g geometry) returns string external name geom.\"AsText\";" ] [ "sys", "astext", 1, "geometry", "" ] -[ "sys", "bbp", 0, "int", "-- The BAT buffer pool overview\ncreate function sys.bbp () \n\treturns table (id int, name string, htype string, \n\t\tttype string, count bigint, refcnt int, lrefcnt int, \n\t\tlocation string, heat int, dirty string, \n\t\tstatus string, kind string) \n\texternal name sql.bbp;" ] +[ "sys", "bbp", 0, "int", "-- The BAT buffer pool overview\ncreate function sys.bbp () \n\treturns table (id int, name string, htype string, \n\t\tttype string, count bigint, refcnt int, lrefcnt int, \n\t\tlocation string, heat int, dirty string, \n\t\tstatus string, kind string) \n\texternal name bbp.get;" ] [ "sys", "bbp", 1, "clob", "" ] [ "sys", "bbp", 2, "clob", "" ] [ "sys", "bbp", 3, "clob", "" ] @@ -304,6 +308,9 @@ Ready. [ "sys", "gzexpand", 1, "clob", "" ] [ "sys", "gztruncate", 0, "clob", "-- Truncate the storage for columns with a compressed image\ncreate procedure gztruncate (s string, t string)\n external name sql.gztruncate;" ] [ "sys", "gztruncate", 1, "clob", "" ] +[ "sys", "hashsize", 0, "bigint", "create function sys.hashsize(b boolean, i bigint)\nreturns bigint\nbegin\n\t-- assume non-compound keys\n\tif b = true\n\tthen\n\t\treturn 8 * i;\n\tend if;\n\treturn 0;\nend;" ] +[ "sys", "hashsize", 1, "boolean", "" ] +[ "sys", "hashsize", 2, "bigint", "" ] [ "sys", "heapsize", 0, "bigint", "create function sys.heapsize(tpe string, i bigint, w int)\nreturns bigint\nbegin\n\tif tpe <> 'varchar' and tpe <> 'clob'\n\tthen\n\t\treturn 0;\n\tend if;\n\treturn 10240 + i * w;\nend;" ] [ "sys", "heapsize", 1, "clob", "" ] [ "sys", "heapsize", 2, "bigint", "" ] @@ -315,9 +322,9 @@ Ready. [ "sys", "ilike", 0, "clob", "create filter function \"ilike\"(val string, pat string, esc string) external name algebra.ilikesubselect;" ] [ "sys", "ilike", 1, "clob", "" ] [ "sys", "ilike", 2, "clob", "" ] -[ "sys", "indexsize", 0, "bigint", "create function sys.indexsize(b boolean, i bigint)\nreturns bigint\nbegin\n\t-- assume non-compound keys\n\tif b = true\n\tthen\n\t\treturn 8 * i;\n\tend if;\n\treturn 0;\nend;" ] -[ "sys", "indexsize", 1, "boolean", "" ] -[ "sys", "indexsize", 2, "bigint", "" ] +[ "sys", "imprintsize", 0, "bigint", "create function sys.imprintsize(i bigint, nme string)\nreturns bigint\nbegin\n\tif nme = 'boolean'\n\t\tor nme = 'tinyint'\n\t\tor nme = 'smallint'\n\t\tor nme = 'int'\t\n\t\tor nme = 'bigint'\t\n\t\tor nme = 'decimal'\t\n\t\tor nme = 'date'\n\t\tor nme = 'timestamp'\n\t\tor nme = 'real'\n\t\tor nme = 'double'\n\tthen\n\t\treturn cast( i * 0.12 as bigint);\n\tend if ;\n\treturn 0;\nend;" ] +[ "sys", "imprintsize", 1, "bigint", "" ] +[ "sys", "imprintsize", 2, "clob", "" ] [ "sys", "intersection", 0, "geometry", "create function intersection(a geometry, b geometry) returns geometry external name geom.\"Intersection\";" ] [ "sys", "intersection", 1, "geometry", "" ] [ "sys", "intersection", 2, "geometry", "" ] @@ -568,7 +575,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", "-- The contents of this file are subject to the MonetDB Public License\n-- Version 1.1 (the \"License\"); you may not use this file except in\n-- compliance with the License. You may obtain a copy of the License at\n-- http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the\n-- License for the specific language governing rights and limitations\n-- under the License.\n--\n-- The Original Code is the MonetDB Database System.\n--\n-- The Initial Developer of the Original Code is CWI.\n-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI.\n-- Copyright August 2008-2014 MonetDB B.V.\n-- All Rights Reserved.\n\n-- Author M.Kersten\n-- This script gives the database administrator insight in the actual\n-- footprint of the persistent tables and the maximum playground used\n-- when indices are introduced upon them.\n-- By chancing the storagemodelinput table directly, the footprint for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage footprint of an existing database can be\n-- obtained by the table procuding function storage()\n-- It represents the actual state of affairs, i.e. storage on disk\n-- of columns and foreign key indices, and possible temporary hash indices.\n-- For strings we take a sample to determine their average length.\n\ncreate function sys.storage()\nreturns table (\"schema\" string, \"table\" string, \"column\" string, \"type\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, indices bigint, sorted boolean)\nexternal name sql.storage;" ] +[ "sys", "storage", 0, "clob", "-- The contents of this file are subject to the MonetDB Public License\n-- Version 1.1 (the \"License\"); you may not use this file except in\n-- compliance with the License. You may obtain a copy of the License at\n-- http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the\n-- License for the specific language governing rights and limitations\n-- under the License.\n--\n-- The Original Code is the MonetDB Database System.\n--\n-- The Initial Developer of the Original Code is CWI.\n-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI.\n-- Copyright August 2008-2014 MonetDB B.V.\n-- All Rights Reserved.\n\n-- Author M.Kersten\n-- This script gives the database administrator insight in the actual\n-- footprint of the persistent tables and the maximum playground used\n-- when indices are introduced upon them.\n-- By chancing the storagemodelinput table directly, the footprint for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage footprint of an existing database can be\n-- obtained by the table procuding function storage()\n-- It represents the actual state of affairs, i.e. storage on disk\n-- of columns and foreign key indices, and possible temporary hash indices.\n-- For strings we take a sample to determine their average length.\n\ncreate function sys.storage()\nreturns table (\"schema\" string, \"table\" string, \"column\" string, \"type\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, imprints bigint, sorted boolean)\nexternal name sql.storage;" ] [ "sys", "storage", 1, "clob", "" ] [ "sys", "storage", 2, "clob", "" ] [ "sys", "storage", 3, "clob", "" ] @@ -578,8 +585,9 @@ Ready. [ "sys", "storage", 7, "bigint", "" ] [ "sys", "storage", 8, "bigint", "" ] [ "sys", "storage", 9, "bigint", "" ] -[ "sys", "storage", 10, "boolean", "" ] -[ "sys", "storagemodel", 0, "clob", "create function sys.storagemodel()\nreturns table (\n\t\"schema\" string,\n\t\"table\" string,\n\t\"column\" string,\n\t\"type\" string,\n\t\"count\"\tbigint,\n\tcolumnsize bigint,\n\theapsize bigint,\n\tindices bigint,\n\tsorted boolean)\nbegin\n\treturn select i.\"schema\", i.\"table\", i.\"column\", i.\"type\", i.\"count\",\n\tcolumnsize(i.\"type\", i.count, i.\"distinct\"),\n\theapsize(i.\"type\", i.\"distinct\", i.\"atomwidth\"),\n\tindexsize(i.\"reference\", i.\"count\"),\n\ti.sorted\n\tfrom sys.storagemodelinput i;\nend;" ] +[ "sys", "storage", 10, "bigint", "" ] +[ "sys", "storage", 11, "boolean", "" ] +[ "sys", "storagemodel", 0, "clob", "create function sys.storagemodel()\nreturns table (\n\t\"schema\" string,\n\t\"table\" string,\n\t\"column\" string,\n\t\"type\" string,\n\t\"count\"\tbigint,\n\tcolumnsize bigint,\n\theapsize bigint,\n\thashes bigint,\n\timprints bigint,\n\tsorted boolean)\nbegin\n\treturn select i.\"schema\", i.\"table\", i.\"column\", i.\"type\", i.\"count\",\n\tcolumnsize(i.\"type\", i.count, i.\"distinct\"),\n\theapsize(i.\"type\", i.\"distinct\", i.\"atomwidth\"),\n\thashsize(i.\"reference\", i.\"count\"),\n\timprintsize(i.\"count\",i.\"type\"),\n\ti.sorted\n\tfrom sys.storagemodelinput i;\nend;" ] [ "sys", "storagemodel", 1, "clob", "" ] [ "sys", "storagemodel", 2, "clob", "" ] [ "sys", "storagemodel", 3, "clob", "" ] @@ -587,7 +595,8 @@ Ready. [ "sys", "storagemodel", 5, "bigint", "" ] [ "sys", "storagemodel", 6, "bigint", "" ] [ "sys", "storagemodel", 7, "bigint", "" ] -[ "sys", "storagemodel", 8, "boolean", "" ] +[ "sys", "storagemodel", 8, "bigint", "" ] +[ "sys", "storagemodel", 9, "boolean", "" ] [ "sys", "str_to_date", 0, "date", "-- The contents of this file are subject to the MonetDB Public License\n-- Version 1.1 (the \"License\"); you may not use this file except in\n-- compliance with the License. You may obtain a copy of the License at\n-- http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under the License is distributed on an \"AS IS\"\n-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the\n-- License for the specific language governing rights and limitations\n-- under the License.\n--\n-- The Original Code is the MonetDB Database System.\n--\n-- The Initial Developer of the Original Code is CWI.\n-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI.\n-- Copyright August 2008-2014 MonetDB B.V.\n-- All Rights Reserved.\n\ncreate function str_to_date(s string, format string) returns date\n\texternal name mtime.\"str_to_date\";" ] [ "sys", "str_to_date", 1, "clob", "" ] [ "sys", "str_to_date", 2, "clob", "" ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
