Changeset: ce1d3176efa2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce1d3176efa2
Added Files:
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out.int128
Removed Files:
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
Modified Files:
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
Branch: default
Log Message:
Approvals.
diffs (truncated from 1230 to 300 lines):
diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
@@ -38,69 +38,6 @@ project (
| ) [ dbg.a as d ] [ dbg.d, sys.sum no nil (dbg.b) as L3.L3, L3.L3 as L6.L6 ]
) [ dbg.d, L3 as L4.L3, sys.sql_mul(sys.sql_div(L6, tinyint "2" as L10.L10),
tinyint "2") as L11.f ]
#set optimizer = 'sequential_pipe';
-#explain SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg
GROUP BY d;
-% .explain # table_name
-% mal # name
-% clob # type
-% 145 # length
-function user.s8_1():void;
- X_59:void := querylog.define("explain select a as d, sum(b), (2 * (sum(b)
/ (select 2))) as f from dbg group by d;","sequential_pipe",35);
- X_26 := bat.new(nil:str);
- X_33 := bat.append(X_26,"sys.dbg");
- X_43 := bat.append(X_33,"sys.L4");
- X_52 := bat.append(X_43,"sys.L11");
- X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"d");
- X_45 := bat.append(X_35,"L3");
- X_54 := bat.append(X_45,"f");
- X_29 := bat.new(nil:str);
- X_37 := bat.append(X_29,"int");
- X_47 := bat.append(X_37,"bigint");
- X_56 := bat.append(X_47,"bigint");
- X_30 := bat.new(nil:int);
- X_39 := bat.append(X_30,32);
- X_49 := bat.append(X_39,64);
- X_57 := bat.append(X_49,64);
- X_32 := bat.new(nil:int);
- X_41 := bat.append(X_32,0);
- X_51 := bat.append(X_41,0);
- X_58 := bat.append(X_51,0);
- X_0 := sql.mvc();
- C_1:bat[:oid] := sql.tid(X_0,"sys","dbg");
- X_4:bat[:int] := sql.bind(X_0,"sys","dbg","a",0);
- X_7 := algebra.projection(C_1,X_4);
- (X_8,r1_11,r2_11) := group.groupdone(X_7);
- X_11 := algebra.projection(r1_11,X_7);
- X_14:bat[:int] := sql.bind(X_0,"sys","dbg","b",0);
- X_16 := algebra.projection(C_1,X_14);
- X_17:bat[:lng] := aggr.subsum(X_16,X_8,r1_11,true,true);
- X_12 := bat.setKey(X_11,true);
- X_19:bat[:lng] := batcalc./(X_17,2);
- X_23:bat[:lng] := batcalc.*(X_19,2);
- sql.resultSet(X_52,X_54,X_56,X_57,X_58,X_12,X_17,X_23);
-end user.s8_1;
-#inline actions= 0 time=4 usec
-#remap actions= 2 time=57 usec
-#costmodel actions= 1 time=2 usec
-#coercion actions= 0 time=1 usec
-#evaluate actions= 2 time=16 usec
-#emptybind actions= 0 time=7 usec
-#aliases actions= 2 time=6 usec
-#mergetable actions= 0 time=39 usec
-#deadcode actions= 0 time=6 usec
-#aliases actions= 0 time=5 usec
-#constants actions= 4 time=10 usec
-#commonTerms actions= 0 time=6 usec
-#projectionpath actions= 0 time=3 usec
-#reorder actions= 1 time=24 usec
-#deadcode actions= 0 time=5 usec
-#reduce actions=26 time=8 usec
-#matpack actions= 0 time=3 usec
-#multiplex actions= 0 time=2 usec
-#profiler actions= 1 time=1 usec
-#candidates actions= 1 time=0 usec
-#garbagecollector actions= 1 time=15 usec
-#total actions= 1 time=311 usec
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
% sys.dbg, sys.L4, sys.L11 # table_name
@@ -124,69 +61,6 @@ project (
| ) [ dbg.a as d ] [ dbg.d, sys.sum no nil (dbg.b) as L3.L3, L3.L3 as L6.L6 ]
) [ dbg.d, L3 as L4.e, sys.sql_mul(sys.sql_div(L6, tinyint "2" as L10.L10),
tinyint "2") as L11.f ]
#set optimizer = 'sequential_pipe';
-#explain SELECT a as d, SUM(b) as e, (2 * (SUM(b) / (SELECT 2))) as f FROM dbg
GROUP BY d;
-% .explain # table_name
-% mal # name
-% clob # type
-% 150 # length
-function user.s20_1():void;
- X_59:void := querylog.define("explain select a as d, sum(b) as e, (2 *
(sum(b) / (select 2))) as f from dbg group by d;","sequential_pipe",35);
- X_26 := bat.new(nil:str);
- X_33 := bat.append(X_26,"sys.dbg");
- X_43 := bat.append(X_33,"sys.L4");
- X_52 := bat.append(X_43,"sys.L11");
- X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"d");
- X_45 := bat.append(X_35,"e");
- X_54 := bat.append(X_45,"f");
- X_29 := bat.new(nil:str);
- X_37 := bat.append(X_29,"int");
- X_47 := bat.append(X_37,"bigint");
- X_56 := bat.append(X_47,"bigint");
- X_30 := bat.new(nil:int);
- X_39 := bat.append(X_30,32);
- X_49 := bat.append(X_39,64);
- X_57 := bat.append(X_49,64);
- X_32 := bat.new(nil:int);
- X_41 := bat.append(X_32,0);
- X_51 := bat.append(X_41,0);
- X_58 := bat.append(X_51,0);
- X_0 := sql.mvc();
- C_1:bat[:oid] := sql.tid(X_0,"sys","dbg");
- X_4:bat[:int] := sql.bind(X_0,"sys","dbg","a",0);
- X_7 := algebra.projection(C_1,X_4);
- (X_8,r1_11,r2_11) := group.groupdone(X_7);
- X_11 := algebra.projection(r1_11,X_7);
- X_14:bat[:int] := sql.bind(X_0,"sys","dbg","b",0);
- X_16 := algebra.projection(C_1,X_14);
- X_17:bat[:lng] := aggr.subsum(X_16,X_8,r1_11,true,true);
- X_12 := bat.setKey(X_11,true);
- X_19:bat[:lng] := batcalc./(X_17,2);
- X_23:bat[:lng] := batcalc.*(X_19,2);
- sql.resultSet(X_52,X_54,X_56,X_57,X_58,X_12,X_17,X_23);
-end user.s20_1;
-#inline actions= 0 time=1 usec
-#remap actions= 2 time=40 usec
-#costmodel actions= 1 time=1 usec
-#coercion actions= 0 time=2 usec
-#evaluate actions= 2 time=13 usec
-#emptybind actions= 0 time=7 usec
-#aliases actions= 2 time=6 usec
-#mergetable actions= 0 time=39 usec
-#deadcode actions= 0 time=6 usec
-#aliases actions= 0 time=5 usec
-#constants actions= 4 time=10 usec
-#commonTerms actions= 0 time=5 usec
-#projectionpath actions= 0 time=3 usec
-#reorder actions= 1 time=22 usec
-#deadcode actions= 0 time=6 usec
-#reduce actions=26 time=8 usec
-#matpack actions= 0 time=3 usec
-#multiplex actions= 0 time=2 usec
-#profiler actions= 1 time=2 usec
-#candidates actions= 1 time=1 usec
-#garbagecollector actions= 1 time=15 usec
-#total actions= 1 time=283 usec
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b) as e, (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP
#BY d;
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
@@ -43,70 +43,11 @@ Ready.
#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
-% 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",35:int);
-barrier X_80 := language.dataflow();
- X_35 := bat.new(nil:str);
- X_42 := bat.append(X_35,"sys.L2");
- X_52 := bat.append(X_42,"sys.L4");
- X_37 := bat.new(nil:str);
- X_44 := bat.append(X_37,"id1");
- X_54 := bat.append(X_44,"id2");
- X_38 := bat.new(nil:str);
- X_46 := bat.append(X_38,"int");
- X_56 := bat.append(X_46,"int");
- X_39 := bat.new(nil:int);
- X_48 := bat.append(X_39,32:int);
- X_57 := bat.append(X_48,32:int);
- X_41 := bat.new(nil:int);
- X_50 := bat.append(X_41,0:int);
- X_58 := bat.append(X_50,0:int);
- X_3 := sql.mvc();
- C_4:bat[:oid] := sql.tid(X_3,"sys","treeitems");
- X_7:bat[:lng] := sql.bind(X_3,"sys","treeitems","pre",0:int);
- X_10 := algebra.projection(C_4,X_7);
- X_14:bat[:lng] := sql.bind(X_3,"sys","treeitems","size",0:int);
- X_16 := algebra.projection(C_4,X_14);
- X_17:bat[:lng] := batcalc.+(X_10,X_16);
- (X_20,r1_21) :=
algebra.subrangejoin(X_10,X_10,X_17,nil:BAT,nil:BAT,true,true,nil:lng);
- X_27:bat[:int] := sql.bind(X_3,"sys","treeitems","subject",0:int);
- X_29 := algebra.projection(C_4,X_27);
- X_30 := algebra.projection(r1_21,X_29);
- X_33 := algebra.projection(X_20,X_29);
- language.pass(X_10);
- language.pass(X_10);
- language.pass(C_4);
- language.pass(X_29);
-exit X_80;
- sql.resultSet(X_52,X_54,X_56,X_57,X_58,X_30,X_33);
-end user.s6_1;
-#inline actions= 0 time=3 usec
-#remap actions= 1 time=31 usec
-#costmodel actions= 1 time=2 usec
-#coercion actions= 0 time=1 usec
-#evaluate actions= 0 time=3 usec
-#emptybind actions= 0 time=7 usec
-#aliases actions= 0 time=5 usec
-#mergetable actions= 0 time=33 usec
-#deadcode actions= 0 time=6 usec
-#aliases actions= 0 time=5 usec
-#constants actions= 3 time=8 usec
-#commonTerms actions= 5 time=12 usec
-#projectionpath actions= 0 time=5 usec
-#deadcode actions= 5 time=7 usec
-#reorder actions= 1 time=21 usec
-#reduce actions=28 time=8 usec
-#matpack actions= 0 time=3 usec
-#dataflow actions=27 time=24 usec
-#multiplex actions= 0 time=2 usec
-#profiler actions= 1 time=3 usec
-#candidates actions= 1 time=1 usec
-#garbagecollector actions= 1 time=18 usec
-#total actions= 1 time=309 usec
+% sys.L2, sys.L4 # table_name
+% id1, id2 # name
+% int, int # type
+% 1, 1 # length
+[ 1, 1 ]
#ROLLBACK;
# 20:18:31 >
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
deleted file mode 100644
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
+++ /dev/null
@@ -1,55 +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 ]
-#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;
-% sys.L2, sys.L4 # table_name
-% id1, id2 # name
-% int, int # type
-% 1, 1 # length
-[ 1, 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.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.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
