Changeset: caca7a9d6d4a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=caca7a9d6d4a
Modified Files:
sql/test/Tests/systemfunctions_nogeom.stable.out
Branch: Feb2013
Log Message:
systemfunctions_nogeom: (re-)approved no-geom output
diffs (32 lines):
diff --git a/sql/test/Tests/systemfunctions_nogeom.stable.out
b/sql/test/Tests/systemfunctions_nogeom.stable.out
--- a/sql/test/Tests/systemfunctions_nogeom.stable.out
+++ b/sql/test/Tests/systemfunctions_nogeom.stable.out
@@ -48,7 +48,7 @@ Ready.
% sys.s, sys.f, sys.a, sys.a, sys. # table_name
% schema, function, argno, argtype, definition # name
% varchar, varchar, int, varchar, varchar # type
-% 3, 35, 1, 9, 1579 # length
+% 3, 35, 1, 9, 1582 # length
[ "sys", "abbrev", 0, "clob", "create function \"abbrev\" (p
inet) returns clob\n\texternal name inet.\"abbrev\";" ]
[ "sys", "abbrev", 1, "inet", "" ]
[ "sys", "alpha", 0, "double", "create function
alpha(pdec double, pradius double)\nreturns double external name sql.alpha;" ]
@@ -62,7 +62,7 @@ Ready.
[ "sys", "cluster1", 1, "clob", "" ]
[ "sys", "cluster2", 0, "clob", "create procedure cluster2(sys
string, tab string)\n\texternal name sql.cluster2;" ]
[ "sys", "cluster2", 1, "clob", "" ]
-[ "sys", "columnsize", 0, "bigint", "-- The predicted
storage footprint of the complete database \n-- determines the amount of
diskspace needed for persistent storage\n-- and the upperbound when all
possible index structures are created.\n-- The storage requirement for foreign
key joins is split amongst the participants.\n\ncreate function
sys.columnsize(nme string, i bigint, d bigint)\nreturns
bigint\nbegin\n\tcase\n\twhen nme = 'boolean' then return i;\n\twhen nme =
'char' then return 2*i;\n\twhen nme = 'smallint' then return 2 * i;\n\twhen nme
= 'int'\t then return 4 * i;\n\twhen nme = 'bigint'\t then return 8 *
i;\n\twhen nme = 'timestamp' then return 8 * i;\n\twhen nme = 'varchar'
then\n\t\tcase\n\t\twhen cast(d as bigint) << 8 then return i;\n\t\twhen cast(d
as bigint) << 16 then return 2 * i;\n\t\twhen cast(d as bigint) << 32 then
return 4 * i;\n\t\telse return 8 * i;\n\t\tend case;\n\telse return 8 *
i;\n\tend case;\nend;" ]
+[ "sys", "columnsize", 0, "bigint", "-- The predicted
storage footprint of the complete database\n-- determines the amount of
diskspace needed for persistent storage\n-- and the upperbound when all
possible index structures are created.\n-- The storage requirement for foreign
key joins is split amongst the participants.\n\ncreate function
sys.columnsize(nme string, i bigint, d bigint)\nreturns
bigint\nbegin\n\tcase\n\twhen nme = 'boolean' then return i;\n\twhen nme =
'char' then return 2*i;\n\twhen nme = 'smallint' then return 2 * i;\n\twhen nme
= 'int'\t then return 4 * i;\n\twhen nme = 'bigint'\t then return 8 *
i;\n\twhen nme = 'timestamp' then return 8 * i;\n\twhen nme = 'varchar'
then\n\t\tcase\n\t\twhen cast(d as bigint) << 8 then return i;\n\t\twhen cast(d
as bigint) << 16 then return 2 * i;\n\t\twhen cast(d as bigint) << 32 then
return 4 * i;\n\t\telse return 8 * i;\n\t\tend case;\n\telse return 8 *
i;\n\tend case;\nend;" ]
[ "sys", "columnsize", 1, "clob", "" ]
[ "sys", "columnsize", 2, "bigint", "" ]
[ "sys", "columnsize", 3, "bigint", "" ]
@@ -293,8 +293,8 @@ Ready.
[ "sys", "stddev_samp", 1, "time", "" ]
[ "sys", "stddev_samp", 0, "double", "create aggregate
stddev_samp(val timestamp) returns double\n\texternal name \"aggr\".\"stdev\";"
]
[ "sys", "stddev_samp", 1, "timestamp", "" ]
-[ "sys", "storage", 0, "table", "-- 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-- Copyright August 2008-2013 MonetDB B.V.\n-- All
Rights Reserved.\n\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 direc
tly, 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", "storagemodel", 0, "table", "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,\t\t\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", 0, "table", "-- 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-- Copyright August 2008-2013 MonetDB B.V.\n-- All
Rights Reserved.\n\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 direc
tly, 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", "storagemodel", 0, "table", "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", "str_to_date", 0, "date", "\n-- 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-- Copyright August 2008-2013 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
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
