Changeset: ffd19b86ca37 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ffd19b86ca37
Modified Files:
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:
approved nogeom output according to recent checkins
diffs (truncated from 1135 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
@@ -54,11 +54,11 @@ 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 ]
-[ 5298, "history", 5255, "create view querylog.history
as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run,
ql.ship, ql.cpu, ql.space, ql.io \nfrom querylog.catalog() qd, querylog.calls()
ql\nwhere qd.id = ql.id and qd.owner = user;", 1, false, 0,
false, 0 ]
-[ 5828, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 5869, "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 ]
-[ 5891, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6000, "r", 2000, NULL, 0, false, 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
]
# 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
@@ -48,10 +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
-% 8, 35, 1, 9, 1582 # length
-[ "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 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 th
e 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;" ]
-[ "querylog", "catalog", 0, "table", "create function
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;" ]
-[ "querylog", "init", 0, "smallint", "create procedure
querylog.init(threshold smallint)\nexternal name sql.querylog_init_threshold;"
]
+% 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;" ]
@@ -233,10 +230,18 @@ Ready.
[ "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", "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", "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;" ]
+[ "sys", "queue", 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-- System monitoring\n\n-- show status of all active SQL
queries.\ncreate function sys.queue()\nreturns table(\n\tqtag
bigint,\n\t\"user\" string,\n\tstarted timestamp,\n\testimate
timestamp,\n\tprogress int,\n\tstatus string,\n\ttag oid,\n\tquery string\n)\
nexternal name sql.sysmon_queue;" ]
[ "sys", "radians", 0, "double", "create function
radians(d double) \nreturns double\n\treturn d*pi()/180;" ]
[ "sys", "radians", 1, "double", "" ]
+[ "sys", "resume", 0, "int", "create procedure
sys.resume(tag int)\nexternal name sql.sysmon_resume;" ]
+[ "sys", "resume", 0, "bigint", "create procedure
sys.resume(tag bigint)\nexternal name sql.sysmon_resume;" ]
[ "sys", "reuse", 0, "clob", "create procedure reuse(sys
string, tab string)\n\texternal name sql.reuse;" ]
[ "sys", "reuse", 1, "clob", "" ]
[ "sys", "reverse", 0, "clob", "/*\nThe contents of this file
are subject to the MonetDB Public License\nVersion 1.1 (the \"License\"); you
may not use this file except in\ncompliance with the License. You may obtain a
copy of the License at\nhttp://www.monetdb.org/Legal/MonetDBLicense\n\nSoftware
distributed under the License is distributed on an \"AS IS\"\nbasis, WITHOUT
WARRANTY OF ANY KIND, either express or implied. See the\nLicense for the
specific language governing rights and limitations\nunder the License.\n\nThe
Original Code is the MonetDB Database System.\n\nThe Initial Developer of the
Original Code is CWI.\nPortions created by CWI are Copyright (C) 1997-July 2008
CWI.\nCopyright August 2008-2013 MonetDB B.V.\nAll Rights Reserved.\n*/\n\n\n--
add function signatures to SQL catalog\n\n\n-- Reverse a string\ncreate
function reverse(src string)\nreturns string external name udf.reverse;" ]
@@ -282,6 +287,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", "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, "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\";" ]
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
-[ 12 ]
+[ 13 ]
# 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
@@ -53,27 +53,27 @@ Ready.
[ "oid", "int", 2 ]
[ "oid", "int", 8 ]
[ "oid", "int", 8 ]
-[ "oid", "int", 155 ]
-[ "oid", "int", 1167 ]
-[ "oid", "int", 3209 ]
-[ "oid", "int", 3209 ]
-[ "oid", "int", 3209 ]
-[ "oid", "int", 3209 ]
-[ "oid", "int", 3209 ]
+[ "oid", "int", 135 ]
+[ "oid", "int", 1177 ]
+[ "oid", "int", 3205 ]
+[ "oid", "int", 3205 ]
+[ "oid", "int", 3205 ]
+[ "oid", "int", 3205 ]
+[ "oid", "int", 3205 ]
[ "oid", "lng", 1 ]
[ "oid", "lng", 2 ]
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
-[ "oid", "str", 155 ]
-[ "oid", "str", 3209 ]
-[ "oid", "str", 3209 ]
+[ "oid", "str", 135 ]
+[ "oid", "str", 3205 ]
+[ "oid", "str", 3205 ]
#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", 510 ]
+[ "transient", 471 ]
#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
@@ -27,15 +27,25 @@ Ready.
% .bbp, .bbp, .bbp # table_name
% htype, ttype, count # name
% clob, clob, bigint # type
-% 3, 9, 4 # length
+% 3, 3, 4 # length
[ "oid", "bit", 0 ]
[ "oid", "bit", 0 ]
[ "oid", "bit", 0 ]
-[ "oid", "bit", 61 ]
-[ "oid", "bit", 61 ]
-[ "oid", "bit", 326 ]
-[ "oid", "bit", 1167 ]
-[ "oid", "bit", 1167 ]
+[ "oid", "bit", 62 ]
+[ "oid", "bit", 62 ]
+[ "oid", "bit", 336 ]
+[ "oid", "bit", 1177 ]
+[ "oid", "bit", 1177 ]
+[ "oid", "int", 0 ]
+[ "oid", "int", 0 ]
+[ "oid", "int", 0 ]
+[ "oid", "int", 0 ]
+[ "oid", "int", 0 ]
+[ "oid", "int", 0 ]
+[ "oid", "int", 0 ]
+[ "oid", "int", 0 ]
+[ "oid", "int", 0 ]
+[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -55,18 +65,8 @@ Ready.
[ "oid", "int", 2 ]
[ "oid", "int", 2 ]
[ "oid", "int", 2 ]
-[ "oid", "int", 2 ]
-[ "oid", "int", 2 ]
-[ "oid", "int", 2 ]
-[ "oid", "int", 2 ]
-[ "oid", "int", 2 ]
-[ "oid", "int", 2 ]
-[ "oid", "int", 2 ]
-[ "oid", "int", 2 ]
[ "oid", "int", 3 ]
[ "oid", "int", 3 ]
-[ "oid", "int", 4 ]
-[ "oid", "int", 4 ]
[ "oid", "int", 19 ]
[ "oid", "int", 19 ]
[ "oid", "int", 19 ]
@@ -78,33 +78,25 @@ Ready.
[ "oid", "int", 29 ]
[ "oid", "int", 29 ]
[ "oid", "int", 29 ]
-[ "oid", "int", 61 ]
-[ "oid", "int", 61 ]
-[ "oid", "int", 155 ]
-[ "oid", "int", 271 ]
-[ "oid", "int", 271 ]
-[ "oid", "int", 326 ]
-[ "oid", "int", 326 ]
-[ "oid", "int", 326 ]
-[ "oid", "int", 326 ]
-[ "oid", "int", 326 ]
-[ "oid", "int", 1167 ]
-[ "oid", "int", 1167 ]
-[ "oid", "int", 1167 ]
-[ "oid", "int", 1167 ]
-[ "oid", "int", 3209 ]
-[ "oid", "int", 3209 ]
-[ "oid", "int", 3209 ]
-[ "oid", "int", 3209 ]
-[ "oid", "int", 3209 ]
-[ "oid", "lng", 0 ]
-[ "oid", "lng", 0 ]
-[ "oid", "lng", 0 ]
-[ "oid", "lng", 0 ]
-[ "oid", "lng", 0 ]
-[ "oid", "lng", 0 ]
-[ "oid", "lng", 0 ]
-[ "oid", "lng", 0 ]
+[ "oid", "int", 62 ]
+[ "oid", "int", 62 ]
+[ "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", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -133,15 +125,12 @@ Ready.
[ "oid", "oid", 0 ]
[ "oid", "oid", 0 ]
[ "oid", "oid", 0 ]
-[ "oid", "oid", 0 ]
-[ "oid", "oid", 0 ]
-[ "oid", "oid", 0 ]
[ "oid", "sht", 0 ]
[ "oid", "sht", 0 ]
[ "oid", "sht", 0 ]
-[ "oid", "sht", 61 ]
-[ "oid", "sht", 61 ]
-[ "oid", "sht", 271 ]
+[ "oid", "sht", 62 ]
+[ "oid", "sht", 62 ]
+[ "oid", "sht", 222 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
@@ -167,30 +156,21 @@ Ready.
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
[ "oid", "str", 2 ]
-[ "oid", "str", 2 ]
-[ "oid", "str", 2 ]
[ "oid", "str", 3 ]
-[ "oid", "str", 4 ]
[ "oid", "str", 29 ]
[ "oid", "str", 29 ]
-[ "oid", "str", 61 ]
-[ "oid", "str", 61 ]
-[ "oid", "str", 155 ]
-[ "oid", "str", 326 ]
-[ "oid", "str", 326 ]
-[ "oid", "str", 326 ]
-[ "oid", "str", 326 ]
-[ "oid", "str", 1167 ]
-[ "oid", "str", 1167 ]
-[ "oid", "str", 1167 ]
-[ "oid", "str", 3209 ]
-[ "oid", "str", 3209 ]
-[ "oid", "timestamp", 0 ]
-[ "oid", "timestamp", 0 ]
-[ "oid", "wrd", 0 ]
-[ "oid", "wrd", 0 ]
-[ "oid", "wrd", 0 ]
-[ "oid", "wrd", 0 ]
+[ "oid", "str", 62 ]
+[ "oid", "str", 62 ]
+[ "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 ]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # table_name
% L1, L2 # name
@@ -202,7 +182,7 @@ Ready.
% L1, L2 # name
% char, wrd # type
% 10, 3 # length
-[ "persistent", 163 ]
+[ "persistent", 143 ]
# 22:02:15 >
# 22:02:15 > Done.
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
@@ -27,15 +27,25 @@ Ready.
% .bbp, .bbp, .bbp # table_name
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
