Changeset: 1c91b4d8981f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c91b4d8981f
Removed Files:
sql/test/mapi/Tests/sql_int128.stable.out.int128.single
Modified Files:
sql/test/mapi/Tests/sql_int128.sql
sql/test/mapi/Tests/sql_int128.stable.out.int128
Branch: Oct2020
Log Message:
Use sequential pipe and avoid another stable output
diffs (truncated from 427 to 300 lines):
diff --git a/sql/test/mapi/Tests/sql_int128.sql
b/sql/test/mapi/Tests/sql_int128.sql
--- a/sql/test/mapi/Tests/sql_int128.sql
+++ b/sql/test/mapi/Tests/sql_int128.sql
@@ -1,3 +1,4 @@
+set optimizer='sequential_pipe';
CREATE TABLE mytest(a HUGEINT, b HUGEINT, c HUGEINT, d HUGEINT, e HUGEINT);
INSERT INTO mytest VALUES (1234567890987654321, 10000000000, NULL, NULL, NULL);
explain UPDATE mytest SET a = 1234567890987654321;
@@ -20,3 +21,4 @@ explain INSERT INTO sql_int128 VALUES (1
INSERT INTO sql_int128 VALUES
(123456789098765432101234567890987654321);
SELECT * FROM sql_int128;
ROLLBACK;
+set optimizer='default_pipe';
diff --git a/sql/test/mapi/Tests/sql_int128.stable.out.int128
b/sql/test/mapi/Tests/sql_int128.stable.out.int128
--- a/sql/test/mapi/Tests/sql_int128.stable.out.int128
+++ b/sql/test/mapi/Tests/sql_int128.stable.out.int128
@@ -12,9 +12,9 @@ stdout of test 'sql_int128` in directory
% .explain # table_name
% mal # name
% clob # type
-% 117 # length
+% 120 # length
function user.main():void;
- X_1:void := querylog.define("explain update mytest set a =
1234567890987654321;":str, "default_pipe":str, 9:int);
+ X_1:void := querylog.define("explain update mytest set a =
1234567890987654321;":str, "sequential_pipe":str, 9:int);
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
X_10:bat[:hge] := algebra.project(C_5:bat[:oid], 1234567890987654321:hge);
@@ -54,9 +54,9 @@ end user.main;
% .explain # table_name
% mal # name
% clob # type
-% 109 # length
+% 112 # length
function user.main():void;
- X_1:void := querylog.define("explain update mytest set b =
10000000000;":str, "default_pipe":str, 9:int);
+ X_1:void := querylog.define("explain update mytest set b =
10000000000;":str, "sequential_pipe":str, 9:int);
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
X_10:bat[:hge] := algebra.project(C_5:bat[:oid], 10000000000:hge);
@@ -96,10 +96,9 @@ end user.main;
% .explain # table_name
% mal # name
% clob # type
-% 104 # length
+% 107 # length
function user.main():void;
- X_1:void := querylog.define("explain update mytest set c = a * b;":str,
"default_pipe":str, 23:int);
-barrier X_90:bit := language.dataflow();
+ X_1:void := querylog.define("explain update mytest set c = a * b;":str,
"sequential_pipe":str, 23:int);
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
X_17:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "a":str,
0:int);
@@ -107,7 +106,6 @@ barrier X_90:bit := language.dataflow();
X_22:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "b":str,
0:int);
X_30:bat[:hge] := algebra.projection(C_5:bat[:oid], X_22:bat[:hge]);
X_31:bat[:hge] := batcalc.*(X_29:bat[:hge], X_30:bat[:hge], nil:BAT,
nil:BAT);
-exit X_90:bit;
X_35:int := sql.update(X_4:int, "sys":str, "mytest":str, "c":str,
C_5:bat[:oid], X_31:bat[:hge]);
X_37:lng := aggr.count(C_5:bat[:oid]);
sql.affectedRows(X_35:int, X_37:lng);
@@ -144,10 +142,9 @@ end user.main;
% .explain # table_name
% mal # name
% clob # type
-% 104 # length
+% 107 # length
function user.main():void;
- X_1:void := querylog.define("explain update mytest set d = c * b;":str,
"default_pipe":str, 23:int);
-barrier X_90:bit := language.dataflow();
+ X_1:void := querylog.define("explain update mytest set d = c * b;":str,
"sequential_pipe":str, 23:int);
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
X_22:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "c":str,
0:int);
@@ -155,7 +152,6 @@ barrier X_90:bit := language.dataflow();
X_17:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "b":str,
0:int);
X_29:bat[:hge] := algebra.projection(C_5:bat[:oid], X_17:bat[:hge]);
X_31:bat[:hge] := batcalc.*(X_30:bat[:hge], X_29:bat[:hge], nil:BAT,
nil:BAT);
-exit X_90:bit;
X_35:int := sql.update(X_4:int, "sys":str, "mytest":str, "d":str,
C_5:bat[:oid], X_31:bat[:hge]);
X_37:lng := aggr.count(C_5:bat[:oid]);
sql.affectedRows(X_35:int, X_37:lng);
@@ -189,10 +185,9 @@ end user.main;
% .explain # table_name
% mal # name
% clob # type
-% 104 # length
+% 107 # length
function user.main():void;
- X_1:void := querylog.define("explain update mytest set e = d + a;":str,
"default_pipe":str, 23:int);
-barrier X_90:bit := language.dataflow();
+ X_1:void := querylog.define("explain update mytest set e = d + a;":str,
"sequential_pipe":str, 23:int);
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
X_22:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "d":str,
0:int);
@@ -200,7 +195,6 @@ barrier X_90:bit := language.dataflow();
X_17:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "a":str,
0:int);
X_29:bat[:hge] := algebra.projection(C_5:bat[:oid], X_17:bat[:hge]);
X_31:bat[:hge] := batcalc.+(X_30:bat[:hge], X_29:bat[:hge], nil:BAT,
nil:BAT);
-exit X_90:bit;
X_35:int := sql.update(X_4:int, "sys":str, "mytest":str, "e":str,
C_5:bat[:oid], X_31:bat[:hge]);
X_37:lng := aggr.count(C_5:bat[:oid]);
sql.affectedRows(X_35:int, X_37:lng);
@@ -260,9 +254,9 @@ end user.main;
% .explain # table_name
% mal # name
% clob # type
-% 147 # length
+% 150 # length
function user.main():void;
- X_1:void := querylog.define("explain insert into sql_int128 values
(123456789098765432101234567890987654321);":str, "default_pipe":str, 7:int);
+ X_1:void := querylog.define("explain insert into sql_int128 values
(123456789098765432101234567890987654321);":str, "sequential_pipe":str, 7:int);
X_4:int := sql.mvc();
X_8:int := sql.append(X_4:int, "sys":str, "sql_int128":str, "i":str,
123456789098765432101234567890987654321:hge);
sql.affectedRows(X_8:int, 1:lng);
diff --git a/sql/test/mapi/Tests/sql_int128.stable.out.int128.single
b/sql/test/mapi/Tests/sql_int128.stable.out.int128.single
deleted file mode 100644
--- a/sql/test/mapi/Tests/sql_int128.stable.out.int128.single
+++ /dev/null
@@ -1,307 +0,0 @@
-stdout of test 'sql_int128` in directory 'sql/test/mapi` itself:
-
-
-# 07:30:43 >
-# 07:30:43 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34256" "--set"
"mapi_usock=/var/tmp/mtest-20272/.s.monetdb.34256" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/int128/prefix/_/var/MonetDB/mTests_sql_test_mapi"
"--set" "mal_listing=0"
-# 07:30:43 >
-
-#CREATE TABLE mytest(a HUGEINT, b HUGEINT, c HUGEINT, d HUGEINT, e HUGEINT);
-#INSERT INTO mytest VALUES (1234567890987654321, 10000000000, NULL, NULL,
NULL);
-[ 1 ]
-#explain UPDATE mytest SET a = 1234567890987654321;
-% .explain # table_name
-% mal # name
-% clob # type
-% 118 # length
-function user.main():void;
- X_1:void := querylog.define("explain update mytest set a =
1234567890987654321;":str, "default_pipe":str, 39:int);
- X_4:int := sql.mvc();
- C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
- X_17:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "a":str,
0:int);
- X_47:bat[:hge] := algebra.projection(C_5:bat[:oid], X_17:bat[:hge]);
- X_54:bat[:hge] := algebra.project(X_47:bat[:hge], 1234567890987654321:hge);
- X_56:int := sql.update(X_4:int, "sys":str, "mytest":str, "a":str,
C_5:bat[:oid], X_54:bat[:hge]);
- X_59:lng := aggr.count(C_5:bat[:oid]);
- sql.affectedRows(X_56:int, X_59:lng);
-end user.main;
-# optimizer.mitosis()
-# optimizer.dataflow()
-#inline actions= 0 time=0 usec
-#remap actions= 0 time=1 usec
-#costmodel actions= 1 time=1 usec
-#coercion actions= 0 time=1 usec
-#aliases actions= 1 time=2 usec
-#evaluate actions= 1 time=8 usec
-#emptybind actions= 0 time=0 usec
-#pushselect actions= 0 time=2 usec
-#aliases actions= 1 time=2 usec
-#mergetable actions= 0 time=13 usec
-#deadcode actions= 0 time=3 usec
-#aliases actions= 0 time=0 usec
-#constants actions= 0 time=1 usec
-#commonTerms actions= 0 time=1 usec
-#projectionpath actions= 0 time=1 usec
-#deadcode actions= 0 time=2 usec
-#reorder actions= 1 time=8 usec
-#matpack actions= 0 time=0 usec
-#dataflow actions= 0 time=3 usec
-#multiplex actions= 0 time=0 usec
-#profiler actions= 1 time=1 usec
-#candidates actions= 1 time=1 usec
-#deadcode actions= 0 time=2 usec
-#wlc actions= 0 time=0 usec
-#garbagecollector actions= 1 time=5 usec
-#total actions=29 time=116 usec
-#explain SET c = a * b;
-% .explain # table_name
-% mal # name
-% clob # type
-% 110 # length
-function user.main():void;
- X_1:void := querylog.define("explain update mytest set b =
10000000000;":str, "default_pipe":str, 39:int);
- X_4:int := sql.mvc();
- C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
- X_17:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "a":str,
0:int);
- X_47:bat[:hge] := algebra.projection(C_5:bat[:oid], X_17:bat[:hge]);
- X_54:bat[:hge] := algebra.project(X_47:bat[:hge], 10000000000:hge);
- X_56:int := sql.update(X_4:int, "sys":str, "mytest":str, "b":str,
C_5:bat[:oid], X_54:bat[:hge]);
- X_59:lng := aggr.count(C_5:bat[:oid]);
- sql.affectedRows(X_56:int, X_59:lng);
-end user.main;
-# optimizer.mitosis()
-# optimizer.dataflow()
-#inline actions= 0 time=1 usec
-#remap actions= 0 time=2 usec
-#costmodel actions= 1 time=1 usec
-#coercion actions= 1 time=6 usec
-#aliases actions= 1 time=6 usec
-#evaluate actions= 0 time=5 usec
-#emptybind actions= 6 time=10 usec
-#pushselect actions= 0 time=9 usec
-#aliases actions= 6 time=5 usec
-#mergetable actions= 0 time=28 usec
-#deadcode actions=22 time=10 usec
-#aliases actions= 0 time=0 usec
-#constants actions= 0 time=1 usec
-#commonTerms actions= 0 time=1 usec
-#projectionpath actions= 0 time=1 usec
-#deadcode actions= 0 time=3 usec
-#reorder actions= 1 time=10 usec
-#matpack actions= 0 time=0 usec
-#dataflow actions= 0 time=4 usec
-#multiplex actions= 0 time=1 usec
-#profiler actions= 1 time=1 usec
-#candidates actions= 1 time=1 usec
-#deadcode actions= 0 time=3 usec
-#wlc actions= 0 time=0 usec
-#garbagecollector actions= 1 time=8 usec
-#total actions=29 time=141 usec
-#explain SET d = c * b;
-% .explain # table_name
-% mal # name
-% clob # type
-% 104 # length
-function user.main():void;
- X_1:void := querylog.define("explain update mytest set c = a * b;":str,
"default_pipe":str, 38:int);
- X_4:int := sql.mvc();
- C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
- X_17:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "a":str,
0:int);
- X_47:bat[:hge] := algebra.projection(C_5:bat[:oid], X_17:bat[:hge]);
- X_22:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "b":str,
0:int);
- X_48:bat[:hge] := algebra.projection(C_5:bat[:oid], X_22:bat[:hge]);
- X_52:bat[:hge] := batcalc.*(X_47:bat[:hge], X_48:bat[:hge], nil:BAT,
nil:BAT);
- X_56:int := sql.update(X_4:int, "sys":str, "mytest":str, "c":str,
C_5:bat[:oid], X_52:bat[:hge]);
- X_58:lng := aggr.count(C_5:bat[:oid]);
- sql.affectedRows(X_56:int, X_58:lng);
-end user.main;
-# optimizer.mitosis()
-# optimizer.dataflow()
-#inline actions= 0 time=1 usec
-#remap actions= 0 time=1 usec
-#costmodel actions= 1 time=0 usec
-#coercion actions= 0 time=1 usec
-#aliases actions= 0 time=0 usec
-#evaluate actions= 0 time=2 usec
-#emptybind actions= 0 time=0 usec
-#pushselect actions= 0 time=2 usec
-#aliases actions= 0 time=0 usec
-#mergetable actions= 0 time=16 usec
-#deadcode actions= 0 time=4 usec
-#aliases actions= 0 time=0 usec
-#constants actions= 0 time=1 usec
-#commonTerms actions= 0 time=1 usec
-#projectionpath actions= 0 time=1 usec
-#deadcode actions= 0 time=2 usec
-#reorder actions= 1 time=9 usec
-#matpack actions= 0 time=0 usec
-#dataflow actions= 0 time=3 usec
-#multiplex actions= 0 time=1 usec
-#profiler actions= 1 time=0 usec
-#candidates actions= 1 time=1 usec
-#deadcode actions= 0 time=3 usec
-#wlc actions= 0 time=0 usec
-#garbagecollector actions= 1 time=9 usec
-#total actions=29 time=114 usec
-#explain SET e = d + a;
-% .explain # table_name
-% mal # name
-% clob # type
-% 104 # length
-function user.main():void;
- X_1:void := querylog.define("explain update mytest set d = c * b;":str,
"default_pipe":str, 38:int);
- X_4:int := sql.mvc();
- C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
- X_28:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "c":str,
0:int);
- X_49:bat[:hge] := algebra.projection(C_5:bat[:oid], X_28:bat[:hge]);
- X_22:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "b":str,
0:int);
- X_48:bat[:hge] := algebra.projection(C_5:bat[:oid], X_22:bat[:hge]);
- X_52:bat[:hge] := batcalc.*(X_49:bat[:hge], X_48:bat[:hge], nil:BAT,
nil:BAT);
- X_56:int := sql.update(X_4:int, "sys":str, "mytest":str, "d":str,
C_5:bat[:oid], X_52:bat[:hge]);
- X_58:lng := aggr.count(C_5:bat[:oid]);
- sql.affectedRows(X_56:int, X_58:lng);
-end user.main;
-# optimizer.mitosis()
-# optimizer.dataflow()
-#inline actions= 0 time=1 usec
-#remap actions= 1 time=17 usec
-#costmodel actions= 1 time=1 usec
-#coercion actions= 0 time=2 usec
-#aliases actions= 0 time=1 usec
-#mergetable actions= 0 time=16 usec
-#deadcode actions= 0 time=3 usec
-#aliases actions= 0 time=0 usec
-#constants actions= 0 time=1 usec
-#commonTerms actions= 0 time=2 usec
-#projectionpath actions= 0 time=1 usec
-#deadcode actions= 0 time=2 usec
-#reorder actions= 1 time=9 usec
-#matpack actions= 0 time=1 usec
-#dataflow actions= 0 time=3 usec
-#multiplex actions= 0 time=1 usec
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
