Changeset: 5500c2d20db8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5500c2d20db8 Modified Files: sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out sql/test/Tests/trace_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/leaks/Tests/drop3_nogeom.stable.out sql/test/leaks/Tests/select1_nogeom.stable.out sql/test/leaks/Tests/select2_nogeom.stable.out sql/test/leaks/Tests/temp1_nogeom.stable.out sql/test/leaks/Tests/temp2_nogeom.stable.out sql/test/leaks/Tests/temp3_nogeom.stable.out sql/test/mapi/Tests/php_monetdb_nogeom.stable.out Branch: default Log Message:
(re-)approved output of *_nogeom tests diffs (truncated from 854 to 300 lines): diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err @@ -30,7 +30,7 @@ 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-30433/.s.monetdb.30902 QUERY = select * from tables where name; ERROR = !conversion of string 'systemfunctions' to type bit failed. 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 @@ -54,11 +54,19 @@ Ready. [ 5104, "user_role", 2000, NULL, 0, true, 0, false, 0 ] [ 5107, "auths", 2000, NULL, 0, true, 0, false, 0 ] [ 5111, "privileges", 2000, NULL, 0, true, 0, false, 0 ] -[ 5297, "querylog_history", 2000, "create view sys.querylog_history as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;", 1, true, 0, false, 0 ] -[ 5857, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] -[ 5898, "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 ] -[ 5920, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -[ 6029, "r", 2000, NULL, 0, false, 0, false, 0 ] +[ 5288, "querylog_catalog", 2000, "-- create table views for convenience\ncreate view sys.querylog_catalog as select * from sys.querylog_catalog();", 1, true, 0, false, 0 ] +[ 5300, "querylog_calls", 2000, "create view sys.querylog_calls as select * from sys.querylog_calls();", 1, true, 0, false, 0 ] +[ 5318, "querylog_history", 2000, "create view sys.querylog_history as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;", 1, true, 0, false, 0 ] +[ 5357, "tracelog", 2000, "create view sys.tracelog as select * from sys.tracelog();", 1, true, 0, false, 0 ] +[ 5595, "optimizers", 2000, "create view sys.optimizers as select * from sys.optimizers();", 1, true, 0, false, 0 ] +[ 5605, "environment", 2000, "create view sys.environment as select * from sys.environment();", 1, true, 0, false, 0 ] +[ 5647, "queue", 2000, "create view sys.queue as select * from sys.queue();", 1, true, 0, false, 0 ] +[ 5903, "storage", 2000, "create view sys.storage as select * from sys.storage();", 1, true, 0, false, 0 ] +[ 5915, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] +[ 5958, "storagemodel", 2000, "create view sys.storagemodel as select * from sys.storagemodel();", 1, true, 0, false, 0 ] +[ 5967, "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 ] +[ 5989, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +[ 6098, "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 @@ -54,10 +54,9 @@ Ready. [ "sys", "alpha", 0, "double", "create function alpha(pdec double, pradius double)\nreturns double external name sql.alpha;" ] [ "sys", "alpha", 1, "double", "" ] [ "sys", "alpha", 2, "double", "" ] -[ "sys", "bbp", 0, "table", "-- The BAT buffer pool overview\ncreate function 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, "table", "-- 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", "broadcast", 0, "inet", "create function \"broadcast\" (p inet) returns inet \n\texternal name inet.\"broadcast\";" ] [ "sys", "broadcast", 1, "inet", "" ] -[ "sys", "clients", 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\ncreate function clients () \n\treturns table (\"user\" string, login string, lastcommand string,\n\t\t actions int, seconds bigint) \n\texternal name sql.clients;" ] [ "sys", "cluster1", 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-2013 MonetDB B.V.\n-- All Rights Reserved.\n\n-- Clustering a relational table should be done with care.\n-- For, the oid's are used in join-indices.\n\n-- Clustering of tables may improve IO performance\n-- The foreign key constraints should be dropped before\n-- and re-established after the cluster operation.\n\ncreate procedure cluster1(sys string, tab string)\n\texternal name sql.cluster1;" ] [ "sys", "cluster1", 1, "clob", "" ] [ "sys", "cluster2", 0, "clob", "create procedure cluster2(sys string, tab string)\n\texternal name sql.cluster2;" ] @@ -110,8 +109,8 @@ Ready. [ "sys", "dropdictionary", 0, "clob", "create procedure dropdictionary (s string, t string)\n external name sql.dropdictionary;" ] [ "sys", "dropdictionary", 1, "clob", "" ] [ "sys", "env", 0, "table", "CREATE FUNCTION env () RETURNS TABLE( name varchar(1024), value varchar(2048)) EXTERNAL NAME sql.sql_environment;" ] -[ "sys", "environment", 0, "table", "-- The environment table\ncreate function environment()\n\treturns table (\"name\" string, value string)\n\texternal name sql.sql_environment;" ] -[ "sys", "evalalgebra", 0, "clob", "create procedure evalalgebra( ra_stmt string, opt bool)\n\texternal name sql.\"evalAlgebra\";" ] +[ "sys", "environment", 0, "table", "-- The environment table\ncreate function sys.environment()\n\treturns table (\"name\" string, value string)\n\texternal name sql.sql_environment;" ] +[ "sys", "evalalgebra", 0, "clob", "create procedure sys.evalalgebra( ra_stmt string, opt bool)\n\texternal name sql.\"evalAlgebra\";" ] [ "sys", "evalalgebra", 1, "boolean", "" ] [ "sys", "fuse", 0, "smallint", "-- fuse two (1-byte) tinyint values into one (2-byte) smallint value\ncreate function fuse(one tinyint, two tinyint)\nreturns smallint external name udf.fuse;" ] [ "sys", "fuse", 1, "tinyint", "" ] @@ -226,14 +225,14 @@ Ready. [ "sys", "newurl", 1, "clob", "" ] [ "sys", "newurl", 2, "clob", "" ] [ "sys", "newurl", 3, "clob", "" ] -[ "sys", "optimizer_stats", 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-- show the optimizer statistics maintained by the SQL frontend\ncreate function optimizer_stats () \n\treturns table (rewrite string, count int) \n\texternal name sql.dump_opt_stats;" ] -[ "sys", "optimizers", 0, "table", "-- MONETDB KERNEL SECTION\n-- optimizer pipe catalog\ncreate function optimizers () \n\treturns table (name string, def string, status string)\n\texternal name sql.optimizers;" ] -[ "sys", "password_hash", 0, "clob", "create function password_hash (username string) \n\treturns string \n\texternal name sql.password;" ] +[ "sys", "optimizer_stats", 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-- show the optimizer statistics maintained by the SQL frontend\ncreate function sys.optimizer_stats () \n\treturns table (rewrite string, count int) \n\texternal name sql.dump_opt_stats;" ] +[ "sys", "optimizers", 0, "table", "-- MONETDB KERNEL SECTION\n-- optimizer pipe catalog\ncreate function sys.optimizers () \n\treturns table (name string, def string, status string)\n\texternal name sql.optimizers;" ] +[ "sys", "password_hash", 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-2013 MonetDB B.V.\n-- All Rights Reserved.\n\ncreate function password_hash (username string) \n\treturns string \n\texternal name sql.password;" ] [ "sys", "password_hash", 1, "clob", "" ] [ "sys", "pause", 0, "int", "-- operations to manipulate the state of havoc queries\ncreate procedure sys.pause(tag int)\nexternal name sql.sysmon_pause;" ] [ "sys", "pause", 0, "bigint", "create procedure sys.pause(tag bigint)\nexternal name sql.sysmon_pause;" ] -[ "sys", "querycache", 0, "table", "-- SQL QUERY CACHE\n-- The SQL query cache returns a table with the query plans kept\n\ncreate function querycache() \n\treturns table (query string, count int) \n\texternal name sql.dump_cache;" ] -[ "sys", "querylog", 0, "clob", "-- Trace the SQL input\ncreate procedure querylog(filename string) \n\texternal name sql.logfile;" ] +[ "sys", "querycache", 0, "table", "-- SQL QUERY CACHE\n-- The SQL query cache returns a table with the query plans kept\n\ncreate function sys.querycache() \n\treturns table (query string, count int) \n\texternal name sql.dump_cache;" ] +[ "sys", "querylog", 0, "clob", "-- Trace the SQL input\ncreate procedure sys.querylog(filename string) \n\texternal name sql.logfile;" ] [ "sys", "querylog_calls", 0, "table", "-- Each query call is stored in the table calls\n-- At regular intervals the query history table should be cleaned.\n-- This can be done manually on the SQL console, or be integrated\n-- in the keepQuery and keepCall upon need.\n-- The parameters are geared at understanding the resource claims\n-- They reflect the effect of the total workload mix during execution.\n-- The 'cpu' gives the average cpu load percentage over all cores on the \n-- server during execution phase. \n-- increasing cpu load indicates better use of multi-cores.\n-- The 'io' indicate IOs during complete query run.\n-- The 'space' is the total amount of intermediates created in MB.\n-- Reducing the space component improves performance/\n-- All timing in usec and all storage in bytes.\n\ncreate function sys.querylog_calls()\nreturns table(\n\tid oid,\t\t\t\t -- references query plan\n\t\"start\" timestamp,\t-- time the statement was started\n\t\"stop\" timestamp,\t-- time the statement was completely finished\n\targuments string,\t-- actual call structure\n\ttuples wrd,\t\t\t-- number of tuples in the result set\n\trun bigint,\t\t-- time spent (in usec) until the result export\n\tship bigint,\t\t-- time spent (in usec) to ship the result set\n\tcpu int, \t\t-- average cpu load percentage during execution\n\tio int,\t\t\t-- percentage time waiting for IO to finish \n\tspace bigint\t\t-- total storage size of intermediates created (in MB)\n)\nexternal name sql.querylog_calls;" ] [ "sys", "querylog_catalog", 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-- QUERY HISTORY\n-- The query history mechanism of MonetDB/SQL relies on a few hooks.\n-- The most important one is a global system variable which controls\n-- monitoring of all sessions. \n\ncreate function sys.querylog_catalog()\nreturns table (\n\tid oid,\n\towner string,\n\tdefined timestamp,\n\tquery string,\n\tpipe string,\n\tmal int,\t\t\t-- size of MAL plan\n\toptimize bigint \t-- time in usec\n)\nexternal name sql.querylog_catalog;" ] [ "sys", "querylog_enable", 0, "smallint", "create procedure sys.querylog_enable(threshold smallint)\nexternal name sql.querylog_enable_threshold;" ] @@ -296,7 +295,7 @@ Ready. [ "sys", "str_to_date", 2, "clob", "" ] [ "sys", "text", 0, "clob", "create function \"text\" (p inet) returns clob\n\texternal name inet.\"text\";" ] [ "sys", "text", 1, "inet", "" ] -[ "sys", "tracelog", 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-- make the offline tracing table available for inspection\ncreate function tracelog() \n\treturns table (\n\t\tevent integer,\t\t-- event counter\n\t\tclk varchar(20), \t-- wallclock, no mtime in kernel\n\t\tpc varchar(50), \t-- module.function[nr]\n\t\t thread int, \t\t-- thread identifier\n\t\t\"user\" int, \t\t-- user identifier\n\t\tticks bigint, \t\t-- time in microseconds\n\t\treads bigint, \t\t-- number of blocks read\n\t\twrites bigint, \t-- number of blocks written\n\t\trbytes bigint,\t\t-- amount of bytes touched\n\t\twbytes bigint,\t\t-- amount of bytes written\n\t\ttype string,\t\t-- return types\n\t\tstmt string\t\t\t-- actual statement executed\n\t)\n\texternal name sql.dump_trace;" ] +[ "sys", "tracelog", 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-- make the offline tracing table available for inspection\ncreate function sys.tracelog() \n\treturns table (\n\t\tevent integer,\t\t-- event counter\n\t\tclk varchar(20), \t-- wallclock, no mtime in kernel\n\t\tpc varchar(50), \t-- module.function[nr]\n \t\tthread int, \t\t-- thread identifier\n\t\t\"user\" int, \t\t-- user identifier\n\t\tticks bigint, \t\t-- time in microseconds\n\t\treads bigint, \t\t-- number of blocks read\n\t\twrites bigint, \t-- number of blocks written\n\t\trbytes bigint,\t\t-- amount of bytes touched\n\t\twbytes bigint,\t\t-- amount of bytes written\n\t\ttype string,\t\t-- return types\n\t\tstmt string\t\t\t-- actual statement executed\n\t)\n\texternal name sql.dump_trace;" ] [ "sys", "vacuum", 0, "clob", "create procedure vacuum(sys string, tab string)\n\texternal name sql.vacuum;" ] [ "sys", "vacuum", 1, "clob", "" ] [ "sys", "var", 0, "table", "CREATE FUNCTION var() RETURNS TABLE( name varchar(1024)) EXTERNAL NAME sql.sql_variables;" ] diff --git a/sql/test/Tests/trace_nogeom.stable.out b/sql/test/Tests/trace_nogeom.stable.out --- a/sql/test/Tests/trace_nogeom.stable.out +++ b/sql/test/Tests/trace_nogeom.stable.out @@ -35,7 +35,7 @@ Ready. % L1 # name % wrd # type % 2 # length -[ 13 ] +[ 14 ] # 11:14:41 > # 11:14:41 > Done. 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", 135 ] -[ "oid", "int", 1177 ] -[ "oid", "int", 3205 ] -[ "oid", "int", 3205 ] -[ "oid", "int", 3205 ] -[ "oid", "int", 3205 ] -[ "oid", "int", 3205 ] +[ "oid", "int", 1176 ] +[ "oid", "int", 3204 ] +[ "oid", "int", 3204 ] +[ "oid", "int", 3204 ] +[ "oid", "int", 3204 ] +[ "oid", "int", 3204 ] [ "oid", "lng", 1 ] [ "oid", "lng", 2 ] [ "oid", "str", 1 ] [ "oid", "str", 1 ] [ "oid", "str", 1 ] [ "oid", "str", 135 ] -[ "oid", "str", 3205 ] -[ "oid", "str", 3205 ] +[ "oid", "str", 3204 ] +[ "oid", "str", 3204 ] #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", 471 ] +[ "transient", 360 ] #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 @@ -31,11 +31,11 @@ Ready. [ "oid", "bit", 0 ] [ "oid", "bit", 0 ] [ "oid", "bit", 0 ] -[ "oid", "bit", 62 ] -[ "oid", "bit", 62 ] -[ "oid", "bit", 336 ] -[ "oid", "bit", 1177 ] -[ "oid", "bit", 1177 ] +[ "oid", "bit", 69 ] +[ "oid", "bit", 69 ] +[ "oid", "bit", 393 ] +[ "oid", "bit", 1176 ] +[ "oid", "bit", 1176 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -78,25 +78,25 @@ Ready. [ "oid", "int", 29 ] [ "oid", "int", 29 ] [ "oid", "int", 29 ] -[ "oid", "int", 62 ] -[ "oid", "int", 62 ] +[ "oid", "int", 69 ] +[ "oid", "int", 69 ] [ "oid", "int", 135 ] -[ "oid", "int", 222 ] -[ "oid", "int", 222 ] -[ "oid", "int", 336 ] -[ "oid", "int", 336 ] -[ "oid", "int", 336 ] -[ "oid", "int", 336 ] -[ "oid", "int", 336 ] -[ "oid", "int", 1177 ] -[ "oid", "int", 1177 ] -[ "oid", "int", 1177 ] -[ "oid", "int", 1177 ] -[ "oid", "int", 3205 ] -[ "oid", "int", 3205 ] -[ "oid", "int", 3205 ] -[ "oid", "int", 3205 ] -[ "oid", "int", 3205 ] +[ "oid", "int", 230 ] +[ "oid", "int", 230 ] +[ "oid", "int", 393 ] +[ "oid", "int", 393 ] +[ "oid", "int", 393 ] +[ "oid", "int", 393 ] +[ "oid", "int", 393 ] +[ "oid", "int", 1176 ] +[ "oid", "int", 1176 ] +[ "oid", "int", 1176 ] +[ "oid", "int", 1176 ] +[ "oid", "int", 3204 ] +[ "oid", "int", 3204 ] +[ "oid", "int", 3204 ] +[ "oid", "int", 3204 ] +[ "oid", "int", 3204 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -128,9 +128,9 @@ Ready. [ "oid", "sht", 0 ] [ "oid", "sht", 0 ] [ "oid", "sht", 0 ] -[ "oid", "sht", 62 ] -[ "oid", "sht", 62 ] -[ "oid", "sht", 222 ] +[ "oid", "sht", 69 ] +[ "oid", "sht", 69 ] +[ "oid", "sht", 230 ] [ "oid", "str", 0 ] [ "oid", "str", 0 ] [ "oid", "str", 0 ] @@ -159,24 +159,24 @@ Ready. [ "oid", "str", 3 ] [ "oid", "str", 29 ] [ "oid", "str", 29 ] -[ "oid", "str", 62 ] -[ "oid", "str", 62 ] +[ "oid", "str", 69 ] +[ "oid", "str", 69 ] [ "oid", "str", 135 ] -[ "oid", "str", 336 ] -[ "oid", "str", 336 ] -[ "oid", "str", 336 ] -[ "oid", "str", 336 ] -[ "oid", "str", 1177 ] -[ "oid", "str", 1177 ] -[ "oid", "str", 1177 ] -[ "oid", "str", 3205 ] -[ "oid", "str", 3205 ] +[ "oid", "str", 393 ] +[ "oid", "str", 393 ] +[ "oid", "str", 393 ] +[ "oid", "str", 393 ] +[ "oid", "str", 1176 ] +[ "oid", "str", 1176 ] +[ "oid", "str", 1176 ] +[ "oid", "str", 3204 ] +[ "oid", "str", 3204 ] #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", 170 ] +[ "transient", 176 ] #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/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 @@ -31,11 +31,11 @@ Ready. [ "oid", "bit", 0 ] [ "oid", "bit", 0 ] [ "oid", "bit", 0 ] -[ "oid", "bit", 62 ] -[ "oid", "bit", 62 ] -[ "oid", "bit", 336 ] -[ "oid", "bit", 1177 ] -[ "oid", "bit", 1177 ] +[ "oid", "bit", 69 ] +[ "oid", "bit", 69 ] +[ "oid", "bit", 393 ] +[ "oid", "bit", 1176 ] +[ "oid", "bit", 1176 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -78,25 +78,25 @@ Ready. [ "oid", "int", 29 ] [ "oid", "int", 29 ] [ "oid", "int", 29 ] -[ "oid", "int", 62 ] -[ "oid", "int", 62 ] +[ "oid", "int", 69 ] +[ "oid", "int", 69 ] [ "oid", "int", 135 ] -[ "oid", "int", 222 ] -[ "oid", "int", 222 ] -[ "oid", "int", 336 ] -[ "oid", "int", 336 ] -[ "oid", "int", 336 ] -[ "oid", "int", 336 ] -[ "oid", "int", 336 ] -[ "oid", "int", 1177 ] -[ "oid", "int", 1177 ] -[ "oid", "int", 1177 ] -[ "oid", "int", 1177 ] _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
