Changeset: 19766d7c01ac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=19766d7c01ac
Removed Files:
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.err.single
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single
Modified Files:
sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.sql
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.sql
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.sql
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
Branch: Dec2016
Log Message:
Simplify tests so that we need fewer special outputs.
diffs (truncated from 1566 to 300 lines):
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql
@@ -1,3 +1,5 @@
+set optimizer = 'sequential_pipe';
+
START TRANSACTION;
CREATE TABLE treeitems (
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
@@ -46,10 +46,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 194 # length
-function user.s6_1():void;
- X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","default_pipe",27:int);
-barrier X_82 := language.dataflow();
+% 197 # length
+function user.s8_1():void;
+ X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","sequential_pipe",21:int);
X_37 := bat.new(nil:str);
X_43 := bat.new(nil:int);
X_41 := bat.new(nil:int);
@@ -69,11 +68,6 @@ barrier X_82 := language.dataflow();
X_31 := algebra.projection(C_4,X_29);
X_35 := algebra.projection(X_22,X_31);
X_32 := algebra.projection(r1_23,X_31);
- language.pass(X_10);
- language.pass(X_10);
- language.pass(C_4);
- language.pass(X_31);
-exit X_82;
X_44 := bat.append(X_37,"sys.L2");
X_46 := bat.append(X_39,"id1");
X_48 := bat.append(X_40,"int");
@@ -85,7 +79,7 @@ exit X_82;
X_59 := bat.append(X_50,32:int);
X_60 := bat.append(X_52,0:int);
sql.resultSet(X_54,X_56,X_58,X_59,X_60,X_32,X_35);
-end user.s6_1;
+end user.s8_1;
#inline actions= 0 time=3 usec
#remap actions= 1 time=31 usec
#costmodel actions= 1 time=2 usec
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
@@ -46,10 +46,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 194 # length
-function user.s6_1():void;
- X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","default_pipe",27:int);
-barrier X_84 := language.dataflow();
+% 197 # length
+function user.s8_1():void;
+ X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","sequential_pipe",21:int);
X_39 := bat.new(nil:str);
X_45 := bat.new(nil:int);
X_43 := bat.new(nil:int);
@@ -69,11 +68,6 @@ barrier X_84 := language.dataflow();
X_33 := algebra.projection(C_4,X_31);
X_37 := algebra.projection(X_24,X_33);
X_34 := algebra.projection(r1_25,X_33);
- language.pass(X_11);
- language.pass(X_11);
- language.pass(C_4);
- language.pass(X_33);
-exit X_84;
X_46 := bat.append(X_39,"sys.L2");
X_48 := bat.append(X_41,"id1");
X_50 := bat.append(X_42,"int");
@@ -85,9 +79,9 @@ exit X_84;
X_61 := bat.append(X_52,32:int);
X_62 := bat.append(X_54,0:int);
sql.resultSet(X_56,X_58,X_60,X_61,X_62,X_34,X_37);
-end user.s6_1;
-#inline actions= 0 time=3 usec
-#remap actions= 1 time=125 usec
+end user.s8_1;
+#inline actions= 0 time=5 usec
+#remap actions= 1 time=168 usec
#costmodel actions= 1 time=2 usec
#coercion actions= 0 time=2 usec
#evaluate actions= 0 time=4 usec
diff --git
a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
deleted file mode 100644
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
+++ /dev/null
@@ -1,88 +0,0 @@
-stdout of test 'between.Bug-3259` in directory 'sql/test/BugTracker-2013`
itself:
-
-
-# 20:18:30 >
-# 20:18:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31042" "--set"
"mapi_usock=/var/tmp/mtest-5226/.s.monetdb.31042" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
-# 20:18:30 >
-
-# MonetDB 5 server v11.15.4
-# This is an unreleased version
-# Serving database 'mTests_sql_test_BugTracker-2013', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 3.778 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:31042/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-5226/.s.monetdb.31042
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-
-Ready.
-
-# 20:18:31 >
-# 20:18:31 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5226" "--port=31042"
-# 20:18:31 >
-
-#START TRANSACTION;
-#CREATE TABLE treeitems (
-# "tree" CHARACTER LARGE OBJECT,
-# "subject" INTEGER,
-# "pre" BIGINT,
-# "post" BIGINT,
-# "size" BIGINT,
-# "level" TINYINT,
-# "prob" DOUBLE DEFAULT 1.0,
-# CONSTRAINT "treeitems_tree_pre_unique" UNIQUE ("tree", "pre"),
-# CONSTRAINT "treeitems_tree_post_unique" UNIQUE ("tree", "post")
-#);
-#insert into treeitems values('sequoia',1,2,2,2,2,2.0);
-[ 1 ]
-#explain
-#SELECT t1.subject as id1, t2.subject as id2
-#FROM treeitems t1, treeitems t2
-#WHERE t2.pre between t1.pre and t1.pre + t1.size;
-% .explain # table_name
-% mal # name
-% clob # type
-% 191 # length
-function user.s2_1():void;
- X_59:void := querylog.define("explain\nselect t1.subject as id1,
t2.subject as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre
and t1.pre + t1.size;","default_pipe",33);
- X_36 := bat.new(nil:str);
- X_43 := bat.append(X_36,"sys.L");
- X_53 := bat.append(X_43,"sys.L");
- X_38 := bat.new(nil:str);
- X_45 := bat.append(X_38,"id1");
- X_54 := bat.append(X_45,"id2");
- X_39 := bat.new(nil:str);
- X_47 := bat.append(X_39,"int");
- X_56 := bat.append(X_47,"int");
- X_40 := bat.new(nil:int);
- X_49 := bat.append(X_40,32);
- X_57 := bat.append(X_49,32);
- X_42 := bat.new(nil:int);
- X_51 := bat.append(X_42,0);
- X_58 := bat.append(X_51,0);
- X_0 := sql.mvc();
- C_1:bat[:oid] := sql.tid(X_0,"sys","treeitems");
- X_4:bat[:lng] := sql.bind(X_0,"sys","treeitems","pre",0);
- X_7 := algebra.projection(C_1,X_4);
- X_8 := batcalc.hge(X_7);
- X_14:bat[:lng] := sql.bind(X_0,"sys","treeitems","size",0);
- X_16 := algebra.projection(C_1,X_14);
- X_17 := batcalc.hge(X_16);
- X_18:bat[:hge] := batcalc.+(X_8,X_17);
- (X_21,r1_22) :=
algebra.subrangejoin(X_8,X_8,X_18,nil:BAT,nil:BAT,true,true,nil:lng);
- X_28:bat[:int] := sql.bind(X_0,"sys","treeitems","subject",0);
- X_30 := algebra.projection(C_1,X_28);
- X_31 := algebra.projection(r1_22,X_30);
- X_34 := algebra.projection(X_21,X_30);
- sql.resultSet(X_53,X_54,X_56,X_57,X_58,X_31,X_34);
-end user.s2_1;
-#ROLLBACK;
-
-# 20:18:31 >
-# 20:18:31 > "Done."
-# 20:18:31 >
-
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
deleted file mode 100644
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
+++ /dev/null
@@ -1,86 +0,0 @@
-stdout of test 'between.Bug-3259` in directory 'sql/test/BugTracker-2013`
itself:
-
-
-# 20:18:30 >
-# 20:18:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31042" "--set"
"mapi_usock=/var/tmp/mtest-5226/.s.monetdb.31042" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
-# 20:18:30 >
-
-# MonetDB 5 server v11.15.4
-# This is an unreleased version
-# Serving database 'mTests_sql_test_BugTracker-2013', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 3.778 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:31042/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-5226/.s.monetdb.31042
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-
-Ready.
-
-# 20:18:31 >
-# 20:18:31 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5226" "--port=31042"
-# 20:18:31 >
-
-#START TRANSACTION;
-#CREATE TABLE treeitems (
-# "tree" CHARACTER LARGE OBJECT,
-# "subject" INTEGER,
-# "pre" BIGINT,
-# "post" BIGINT,
-# "size" BIGINT,
-# "level" TINYINT,
-# "prob" DOUBLE DEFAULT 1.0,
-# CONSTRAINT "treeitems_tree_pre_unique" UNIQUE ("tree", "pre"),
-# CONSTRAINT "treeitems_tree_post_unique" UNIQUE ("tree", "post")
-#);
-#insert into treeitems values('sequoia',1,2,2,2,2,2.0);
-[ 1 ]
-#explain
-#SELECT t1.subject as id1, t2.subject as id2
-#FROM treeitems t1, treeitems t2
-#WHERE t2.pre between t1.pre and t1.pre + t1.size;
-% .explain # table_name
-% mal # name
-% clob # type
-% 191 # length
-function user.s2_1():void;
- X_55:void := querylog.define("explain\nselect t1.subject as id1,
t2.subject as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre
and t1.pre + t1.size;","default_pipe",31);
- X_32 := bat.new(nil:str);
- X_39 := bat.append(X_32,"sys.L");
- X_49 := bat.append(X_39,"sys.L");
- X_34 := bat.new(nil:str);
- X_41 := bat.append(X_34,"id1");
- X_50 := bat.append(X_41,"id2");
- X_35 := bat.new(nil:str);
- X_43 := bat.append(X_35,"int");
- X_52 := bat.append(X_43,"int");
- X_36 := bat.new(nil:int);
- X_45 := bat.append(X_36,32);
- X_53 := bat.append(X_45,32);
- X_38 := bat.new(nil:int);
- X_47 := bat.append(X_38,0);
- X_54 := bat.append(X_47,0);
- X_0 := sql.mvc();
- C_1:bat[:oid] := sql.tid(X_0,"sys","treeitems");
- X_4:bat[:lng] := sql.bind(X_0,"sys","treeitems","pre",0);
- X_7 := algebra.projection(C_1,X_4);
- X_11:bat[:lng] := sql.bind(X_0,"sys","treeitems","size",0);
- X_13 := algebra.projection(C_1,X_11);
- X_14:bat[:lng] := batcalc.+(X_7,X_13);
- (X_17,r1_18) :=
algebra.subrangejoin(X_7,X_7,X_14,nil:BAT,nil:BAT,true,true,nil:lng);
- X_24:bat[:int] := sql.bind(X_0,"sys","treeitems","subject",0);
- X_26 := algebra.projection(C_1,X_24);
- X_27 := algebra.projection(r1_18,X_26);
- X_30 := algebra.projection(X_17,X_26);
- sql.resultSet(X_49,X_50,X_52,X_53,X_54,X_27,X_30);
-end user.s2_1;
-#ROLLBACK;
-
-# 20:18:31 >
-# 20:18:31 > "Done."
-# 20:18:31 >
-
diff --git a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.sql
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.sql
--- a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.sql
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.sql
@@ -3,6 +3,6 @@ insert into foo_nil_2dec values (timesta
insert into foo_nil_2dec values (timestamp '2014-10-05',43);
select (t-(select timestamp '1970-1-1')),v from foo_nil_2dec union all select
(t-(select timestamp '1970-1-1')),null from foo_nil_2dec;
-explain select (t-(select timestamp '1970-1-1')),v from foo_nil_2dec union all
select (t-(select timestamp '1970-1-1')),null from foo_nil_2dec;
+-- explain select (t-(select timestamp '1970-1-1')),v from foo_nil_2dec union
all select (t-(select timestamp '1970-1-1')),null from foo_nil_2dec;
drop table foo_nil_2dec;
diff --git a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
--- a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
@@ -39,90 +39,6 @@ Ready.
[ 1412467200.000, 43.000000000 ]
[ 1412467200.000, NULL ]
[ 1412467200.000, NULL ]
-#explain select (t-(select timestamp '1970-1-1')),v from foo_nil_2dec union
all select (t-(select timestamp '1970-1-1')),null from foo_nil_2dec;
-% .explain # table_name
-% mal # name
-% clob # type
-% 209 # length
-function user.s10_1():void;
- X_0:void := querylog.define("explain select (t-(select timestamp
\\'1970-1-1\\')),v from foo_nil_2dec union all select (t-(select timestamp
\\'1970-1-1\\')),null from foo_nil_2dec;","default_pipe",16:int);
-barrier X_125 := language.dataflow();
- X_4:bat[:lng] := bat.new(nil:lng);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
