Changeset: 6778e187bb1c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6778e187bb1c Modified Files: 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 Branch: Feb2013 Log Message:
merging diffs (truncated from 334 to 300 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 @@ -45,7 +45,7 @@ Ready. # 16:39:08 > #select s.name as "schema", f.name as "function", a.number as "argno", a.type as "argtype", case a.number when 0 then f.func else '' end as "definition" from sys.functions f, sys.schemas s, sys.args a where s.id = f.schema_id and f.id = a.func_id and f.id in (select * from sys.systemfunctions) order by s.name, f.name, f.id, a.number; -% sys.s, sys.f, sys.a, sys.a, sys. # table_name +% sys.L3, sys.L3, sys.L3, sys.L3, sys.L3 # table_name % schema, function, argno, argtype, definition # name % varchar, varchar, int, varchar, varchar # type % 3, 35, 1, 9, 1582 # length 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 @@ -25,13 +25,20 @@ Ready. # 11:14:41 > mclient -lsql -i -umonetdb -Pmonetdb --host=loki --port=30924 # 11:14:41 > -% sys.types # table_name +# 11:43:05 > +# 11:43:05 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23209" "--port=33225" +# 11:43:05 > + +#set optimizer='sequential_pipe'; +#set trace = 'none'; -- non-documented feature to not get any trace output +#TRACE SELECT count(*) FROM types; +% sys.L1 # table_name % L1 # name % wrd # type % 2 # length [ 29 ] #SELECT COUNT(*) FROM tracelog(); -% . # table_name +% .L1 # table_name % L1 # name % wrd # type % 2 # length 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 @@ -69,13 +69,13 @@ Ready. [ "oid", "str", 3220 ] [ "oid", "str", 3220 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 510 ] +[ "transient", 503 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 10, 2 # length 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 @@ -192,13 +192,13 @@ Ready. [ "oid", "wrd", 0 ] [ "oid", "wrd", 0 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 170 ] +[ "transient", 161 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 10, 3 # length 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 @@ -192,13 +192,13 @@ Ready. [ "oid", "wrd", 0 ] [ "oid", "wrd", 0 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 170 ] +[ "transient", 161 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 10, 3 # length 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 @@ -192,13 +192,13 @@ Ready. [ "oid", "wrd", 0 ] [ "oid", "wrd", 0 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 190 ] +[ "transient", 181 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 10, 3 # length 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 @@ -192,13 +192,13 @@ Ready. [ "oid", "wrd", 0 ] [ "oid", "wrd", 0 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 190 ] +[ "transient", 181 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 10, 3 # length diff --git a/sql/test/leaks/Tests/check5_nogeom.stable.out b/sql/test/leaks/Tests/check5_nogeom.stable.out --- a/sql/test/leaks/Tests/check5_nogeom.stable.out +++ b/sql/test/leaks/Tests/check5_nogeom.stable.out @@ -192,13 +192,13 @@ Ready. [ "oid", "wrd", 0 ] [ "oid", "wrd", 0 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 190 ] +[ "transient", 181 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 10, 3 # length diff --git a/sql/test/leaks/Tests/drop3_nogeom.stable.out b/sql/test/leaks/Tests/drop3_nogeom.stable.out --- a/sql/test/leaks/Tests/drop3_nogeom.stable.out +++ b/sql/test/leaks/Tests/drop3_nogeom.stable.out @@ -24,13 +24,20 @@ Ready. # 22:02:53 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35803 # 22:02:53 > -% .L1, .bbp # table_name +# 23:13:33 > +# 23:13:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-31224" "--port=38593" +# 23:13:33 > + +#set optimizer='minimal_pipe'; +#drop table x; +#select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length [ "transient", 181 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 10, 3 # length diff --git a/sql/test/leaks/Tests/select1_nogeom.stable.out b/sql/test/leaks/Tests/select1_nogeom.stable.out --- a/sql/test/leaks/Tests/select1_nogeom.stable.out +++ b/sql/test/leaks/Tests/select1_nogeom.stable.out @@ -24,23 +24,27 @@ Ready. # 22:03:05 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=32575 # 22:03:05 > -% . # table_name +#set optimizer='minimal_pipe'; +#select 1; +% .L # table_name % single_value # name % tinyint # type % 1 # length [ 1 ] -% .bbp # table_name +#select count(*) from bbp() as bbp where refcnt > 0; +% .L1 # table_name % L1 # name % wrd # type % 3 # length [ 344 ] #select 1; -% . # table_name +% .L # table_name % single_value # name % tinyint # type % 1 # length [ 1 ] -% .bbp # table_name +#select count(*) from bbp() as bbp where refcnt > 0; +% .L1 # table_name % L1 # name % wrd # type % 3 # length diff --git a/sql/test/leaks/Tests/select2_nogeom.stable.out b/sql/test/leaks/Tests/select2_nogeom.stable.out --- a/sql/test/leaks/Tests/select2_nogeom.stable.out +++ b/sql/test/leaks/Tests/select2_nogeom.stable.out @@ -24,23 +24,27 @@ Ready. # 22:03:05 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=32575 # 22:03:05 > -% . # table_name +#set optimizer='minimal_pipe'; +#select 1; +% .L # table_name % single_value # name % tinyint # type % 1 # length [ 1 ] -% .bbp # table_name +#select count(*) from bbp() as bbp where refcnt > 0; +% .L1 # table_name % L1 # name % wrd # type % 3 # length [ 344 ] #select 1; -% . # table_name +% .L # table_name % single_value # name % tinyint # type % 1 # length [ 1 ] -% .bbp # table_name +#select count(*) from bbp() as bbp where refcnt > 0; +% .L1 # table_name % L1 # name % wrd # type % 3 # length diff --git a/sql/test/leaks/Tests/temp1_nogeom.stable.out b/sql/test/leaks/Tests/temp1_nogeom.stable.out --- a/sql/test/leaks/Tests/temp1_nogeom.stable.out +++ b/sql/test/leaks/Tests/temp1_nogeom.stable.out @@ -24,13 +24,20 @@ Ready. # 22:02:41 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=32566 # 22:02:41 > -% .L1, .bbp # table_name +# 23:13:32 > +# 23:13:32 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-31224" "--port=38593" +# 23:13:32 > + +#set optimizer='minimal_pipe'; +#create temporary table x ( i int, j int ); +#select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length [ "transient", 164 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .bbp # table_name +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 10, 3 # length diff --git a/sql/test/leaks/Tests/temp2_nogeom.stable.out b/sql/test/leaks/Tests/temp2_nogeom.stable.out --- a/sql/test/leaks/Tests/temp2_nogeom.stable.out +++ b/sql/test/leaks/Tests/temp2_nogeom.stable.out @@ -24,13 +24,21 @@ Ready. # 22:02:41 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=32566 # 22:02:41 > -% .L1, .bbp # table_name +# 23:13:32 > +# 23:13:32 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-31224" "--port=38593" +# 23:13:32 > + +#set optimizer='minimal_pipe'; +#create table x ( i int, j int ); +#drop table x; +#select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; +% .L1, .L2 # table_name % L1, L2 # name % char, wrd # type % 9, 3 # length _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
