Changeset: 6f180aa7ae7f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f180aa7ae7f
Modified Files:
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/leaks/Tests/check0.stable.out
Branch: Feb2013
Log Message:
Approve after 04ad0c9e2637.
diffs (117 lines):
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -96,13 +96,13 @@ mTests_sql_jdbc_tests sys tables SYSTEM
mTests_sql_jdbc_tests sys tablestoragemodel SYSTEM VIEW -- A
summary of the table storage requirement is is available as a table view.
-- The auxillary column denotes the maximum space if all non-sorted columns
-- would be augmented with a hash (rare situation)
-create view tablestoragemodel
+create view sys.tablestoragemodel
as select "schema","table",max(count) as "count",
sum(columnsize) as columnsize,
sum(heapsize) as heapsize,
sum(indices) as indices,
sum(case when sorted = false then 8 * count else 0 end) as auxillary
-from storagemodel() group by "schema","table"; null null null rowid
SYSTEM
+from sys.storagemodel() group by "schema","table"; null null null
rowid SYSTEM
mTests_sql_jdbc_tests sys users SYSTEM VIEW SELECT u."name" AS
"name", ui."fullname", ui."default_schema" FROM db_users() AS u LEFT JOIN
"sys"."db_user_info" AS ui ON u."name" = ui."name" ; null null null
rowid SYSTEM
# 20:09:14 >
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
@@ -30,9 +30,9 @@ stderr of test 'predicate_select.Bug-309
# 18:53:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=32323"
# 18:53:13 >
-MAPI = (monetdb) /var/tmp/mtest-14514/.s.monetdb.38632
+MAPI = (monetdb) /var/tmp/mtest-16462/.s.monetdb.36324
QUERY = select * from tables where name;
-ERROR = !conversion of string 'systemfunctions' to type bit failed.
+ERROR = !conversion of string 'r' to type bit failed.
# 18:53:13 >
# 18:53:13 > "Done."
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
@@ -27,7 +27,7 @@ Ready.
% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables # table_name
% id, name, schema_id, query, type, system, commit_action,
readonly, temporary # name
% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, tinyint # type
-% 4, 17, 4, 488, 1, 5, 1, 5, 1 # length
+% 4, 17, 4, 496, 1, 5, 1, 5, 1 # length
[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
0 ]
[ 2006, "types", 2000, NULL, 0, true, 0, false,
0 ]
[ 2015, "functions", 2000, NULL, 0, true, 0, false,
0 ]
@@ -58,7 +58,7 @@ Ready.
[ 5276, "callhistory", 2000, NULL, 0, true, 0, false,
0 ]
[ 5293, "querylog", 2000, "create view querylog as\nselect qd.*,
ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id =
ql.id;", 1, true, 0, false, 0 ]
[ 6034, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6075, "tablestoragemodel", 2000, "-- A summary of the table
storage requirement is is available as a table view.\n-- The auxillary column
denotes the maximum space if all non-sorted columns\n-- would be augmented with
a hash (rare situation)\ncreate view tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom storagemodel() group by \"schema\",\"table\";", 1,
true, 0, false, 0 ]
+[ 6075, "tablestoragemodel", 2000, "-- A summary of the table
storage requirement is is available as a table view.\n-- The auxillary column
denotes the maximum space if all non-sorted columns\n-- would be augmented with
a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1,
true, 0, false, 0 ]
[ 6097, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
[ 6206, "r", 2000, NULL, 0, false, 0, false, 0
]
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.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, 15, 1579 # length
+% 3, 35, 1, 15, 1582 # length
[ "sys", "Intersect", 0, "boolean", "create function
\"Intersect\"(a geometry, b geometry) returns boolean external name
geom.\"Intersect\";" ]
[ "sys", "Intersect", 1, "geometry", "" ]
[ "sys", "Intersect", 2, "geometry", "" ]
@@ -78,7 +78,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 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", "" ]
@@ -204,7 +204,7 @@ 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", "heapsize", 0, "bigint", "create function
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", 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", "" ]
[ "sys", "heapsize", 3, "int", "" ]
@@ -215,7 +215,7 @@ 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
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", 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", "intersection", 0, "geometry", "create function
intersection(a geometry, b geometry) returns geometry external name
geom.\"Intersection\";" ]
@@ -388,8 +388,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 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
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
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", "" ]
diff --git a/sql/test/leaks/Tests/check0.stable.out
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -73,7 +73,7 @@ Ready.
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 509 ]
+[ "transient", 514 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .bbp # table_name
% L1, L2 # name
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
