Changeset: 41ae3ff31ac9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41ae3ff31ac9 Modified Files: sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out sql/test/leaks/Tests/check0_nogeom.stable.out sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check5_nogeom.stable.out sql/test/mapi/Tests/php_monetdb_nogeom.stable.out Branch: default Log Message:
Merge with Oct2012; updated output for default branch. diffs (truncated from 395 to 300 lines): diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out @@ -57,10 +57,10 @@ Ready. [ 5220, "queryhistory", 2000, NULL, 0, true, 0, false, 0 ] [ 5234, "callhistory", 2000, NULL, 0, true, 0, false, 0 ] [ 5251, "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 ] -[ 5648, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] -[ 5689, "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 ] -[ 5711, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -[ 5820, "r", 2000, NULL, 0, false, 0, false, 0 ] +[ 5684, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] +[ 5725, "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 ] +[ 5747, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +[ 5856, "r", 2000, NULL, 0, false, 0, false, 0 ] # 18:53:13 > # 18:53:13 > "Done." 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 @@ -191,7 +191,7 @@ Ready. [ "sys", "like", 2, "clob", "" ] [ "sys", "masklen", 0, "int", "create function \"masklen\" (p inet) returns int\n\texternal name inet.\"masklen\";" ] [ "sys", "masklen", 1, "inet", "" ] -[ "sys", "median", 0, "tinyint", "\ncreate aggregate median(val tinyint) returns tinyint\n\texternal name \"aggr\".\"median\";" ] +[ "sys", "median", 0, "tinyint", "create aggregate median(val tinyint) returns tinyint\n\texternal name \"aggr\".\"median\";" ] [ "sys", "median", 1, "tinyint", "" ] [ "sys", "median", 0, "smallint", "create aggregate median(val smallint) returns smallint\n\texternal name \"aggr\".\"median\";" ] [ "sys", "median", 1, "smallint", "" ] @@ -257,6 +257,24 @@ Ready. [ "sys", "setmasklen", 2, "int", "" ] [ "sys", "shrink", 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-- Copyright August 2008-2012 MonetDB B.V.\n-- All Rights Reserved.\n\n-- Vacuum a relational table should be done with care.\n-- For, the oid's are used in join-indices.\n\n-- Vacuum of tables may improve IO performance and disk footprint.\n-- The foreign key constraints should be dropped before\n-- and re-established after th e cluster operation.\n\ncreate procedure shrink(sys string, tab string)\n\texternal name sql.shrink;" ] [ "sys", "shrink", 1, "clob", "" ] +[ "sys", "stddev", 0, "tinyint", "create aggregate stddev(val tinyint) returns tinyint\n\texternal name \"aggr\".\"stddev\";" ] +[ "sys", "stddev", 1, "tinyint", "" ] +[ "sys", "stddev", 0, "smallint", "create aggregate stddev(val smallint) returns smallint\n\texternal name \"aggr\".\"stddev\";" ] +[ "sys", "stddev", 1, "smallint", "" ] +[ "sys", "stddev", 0, "int", "create aggregate stddev(val integer) returns integer\n\texternal name \"aggr\".\"stddev\";" ] +[ "sys", "stddev", 1, "int", "" ] +[ "sys", "stddev", 0, "bigint", "create aggregate stddev(val bigint) returns bigint\n\texternal name \"aggr\".\"stddev\";" ] +[ "sys", "stddev", 1, "bigint", "" ] +[ "sys", "stddev", 0, "real", "create aggregate stddev(val real) returns real\n\texternal name \"aggr\".\"stddev\";" ] +[ "sys", "stddev", 1, "real", "" ] +[ "sys", "stddev", 0, "double", "create aggregate stddev(val double) returns double\n\texternal name \"aggr\".\"stddev\";" ] +[ "sys", "stddev", 1, "double", "" ] +[ "sys", "stddev", 0, "date", "create aggregate stddev(val date) returns date\n\texternal name \"aggr\".\"stddev\";" ] +[ "sys", "stddev", 1, "date", "" ] +[ "sys", "stddev", 0, "time", "create aggregate stddev(val time) returns time\n\texternal name \"aggr\".\"stddev\";" ] +[ "sys", "stddev", 1, "time", "" ] +[ "sys", "stddev", 0, "timestamp", "create aggregate stddev(val timestamp) returns timestamp\n\texternal name \"aggr\".\"stddev\";" ] +[ "sys", "stddev", 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-2012 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", "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-2012 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\";" ] diff --git a/sql/test/leaks/Tests/check0_nogeom.stable.out b/sql/test/leaks/Tests/check0_nogeom.stable.out --- a/sql/test/leaks/Tests/check0_nogeom.stable.out +++ b/sql/test/leaks/Tests/check0_nogeom.stable.out @@ -54,26 +54,26 @@ Ready. [ "oid", "int", 8 ] [ "oid", "int", 8 ] [ "oid", "int", 155 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] [ "oid", "lng", 1 ] [ "oid", "lng", 2 ] [ "oid", "str", 1 ] [ "oid", "str", 1 ] [ "oid", "str", 1 ] [ "oid", "str", 155 ] -[ "oid", "str", 3093 ] -[ "oid", "str", 3093 ] +[ "oid", "str", 3111 ] +[ "oid", "str", 3111 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; % .L1, .bbp # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 549 ] +[ "transient", 598 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; % .L1, .bbp # table_name % L1, L2 # name diff --git a/sql/test/leaks/Tests/check1_nogeom.stable.out b/sql/test/leaks/Tests/check1_nogeom.stable.out --- a/sql/test/leaks/Tests/check1_nogeom.stable.out +++ b/sql/test/leaks/Tests/check1_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 61 ] [ "oid", "bit", 61 ] [ "oid", "bit", 326 ] -[ "oid", "bit", 1118 ] -[ "oid", "bit", 1118 ] +[ "oid", "bit", 1127 ] +[ "oid", "bit", 1127 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -88,15 +88,15 @@ Ready. [ "oid", "int", 326 ] [ "oid", "int", 326 ] [ "oid", "int", 326 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -180,11 +180,11 @@ Ready. [ "oid", "str", 326 ] [ "oid", "str", 326 ] [ "oid", "str", 326 ] -[ "oid", "str", 1118 ] -[ "oid", "str", 1118 ] -[ "oid", "str", 1118 ] -[ "oid", "str", 3093 ] -[ "oid", "str", 3093 ] +[ "oid", "str", 1127 ] +[ "oid", "str", 1127 ] +[ "oid", "str", 1127 ] +[ "oid", "str", 3111 ] +[ "oid", "str", 3111 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check2_nogeom.stable.out b/sql/test/leaks/Tests/check2_nogeom.stable.out --- a/sql/test/leaks/Tests/check2_nogeom.stable.out +++ b/sql/test/leaks/Tests/check2_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 61 ] [ "oid", "bit", 61 ] [ "oid", "bit", 326 ] -[ "oid", "bit", 1118 ] -[ "oid", "bit", 1118 ] +[ "oid", "bit", 1127 ] +[ "oid", "bit", 1127 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -88,15 +88,15 @@ Ready. [ "oid", "int", 326 ] [ "oid", "int", 326 ] [ "oid", "int", 326 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -180,11 +180,11 @@ Ready. [ "oid", "str", 326 ] [ "oid", "str", 326 ] [ "oid", "str", 326 ] -[ "oid", "str", 1118 ] -[ "oid", "str", 1118 ] -[ "oid", "str", 1118 ] -[ "oid", "str", 3093 ] -[ "oid", "str", 3093 ] +[ "oid", "str", 1127 ] +[ "oid", "str", 1127 ] +[ "oid", "str", 1127 ] +[ "oid", "str", 3111 ] +[ "oid", "str", 3111 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check3_nogeom.stable.out b/sql/test/leaks/Tests/check3_nogeom.stable.out --- a/sql/test/leaks/Tests/check3_nogeom.stable.out +++ b/sql/test/leaks/Tests/check3_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 62 ] [ "oid", "bit", 62 ] [ "oid", "bit", 328 ] -[ "oid", "bit", 1118 ] -[ "oid", "bit", 1118 ] +[ "oid", "bit", 1127 ] +[ "oid", "bit", 1127 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -88,15 +88,15 @@ Ready. [ "oid", "int", 328 ] [ "oid", "int", 328 ] [ "oid", "int", 328 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -180,11 +180,11 @@ Ready. [ "oid", "str", 328 ] [ "oid", "str", 328 ] [ "oid", "str", 328 ] -[ "oid", "str", 1118 ] -[ "oid", "str", 1118 ] -[ "oid", "str", 1118 ] -[ "oid", "str", 3093 ] -[ "oid", "str", 3093 ] +[ "oid", "str", 1127 ] +[ "oid", "str", 1127 ] +[ "oid", "str", 1127 ] +[ "oid", "str", 3111 ] +[ "oid", "str", 3111 ] [ "oid", "timestamp", 0 ] [ "oid", "timestamp", 0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check4_nogeom.stable.out b/sql/test/leaks/Tests/check4_nogeom.stable.out --- a/sql/test/leaks/Tests/check4_nogeom.stable.out +++ b/sql/test/leaks/Tests/check4_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ "oid", "bit", 63 ] [ "oid", "bit", 63 ] [ "oid", "bit", 330 ] -[ "oid", "bit", 1118 ] -[ "oid", "bit", 1118 ] +[ "oid", "bit", 1127 ] +[ "oid", "bit", 1127 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -88,15 +88,15 @@ Ready. [ "oid", "int", 330 ] [ "oid", "int", 330 ] [ "oid", "int", 330 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 1118 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] -[ "oid", "int", 3093 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 1127 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] +[ "oid", "int", 3111 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
