Changeset: 1c71cc97ae46 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c71cc97ae46
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out.int128
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 543 to 300 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
@@ -30,16 +30,16 @@ stderr of test 'opt_sql_append` in direc
# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
# 22:58:57 >
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-13169/.s.monetdb.36172
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-13169/.s.monetdb.36172
QUERY = explain copy into ttt from 'a:\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: a:\tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-13169/.s.monetdb.36172
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-13169/.s.monetdb.36172
QUERY = explain copy into ttt from 'Z:/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: Z:/tmp/xyz
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -55,8 +55,8 @@ Ready.
% .L # table_name
% def # name
% clob # type
-% 470 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();"
]
+% 489 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
@@ -64,10 +64,10 @@ Ready.
% 150 # length
function user.s4_1{autoCommit=true}():void;
X_25:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe");
-barrier X_34 := language.dataflow();
+barrier X_35 := language.dataflow();
X_2 := sql.mvc();
(X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0);
-exit X_34;
+exit X_35;
X_16 := sql.append(X_2,"sys","ttt","a",X_13);
X_18 := sql.append(X_16,"sys","ttt","b",X_14);
X_20 := sql.append(X_18,"sys","ttt","c",X_15);
@@ -89,8 +89,8 @@ end user.s4_1;
% .L # table_name
% def # name
% clob # type
-% 493 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 512 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
@@ -98,10 +98,10 @@ end user.s4_1;
% 150 # length
function user.s12_1{autoCommit=true}():void;
X_25:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1");
-barrier X_35 := language.dataflow();
+barrier X_36 := language.dataflow();
X_2 := sql.mvc();
(X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0);
-exit X_35;
+exit X_36;
X_16 := sql.append(X_2,"sys","ttt","a",X_13);
X_18 := sql.append(X_16,"sys","ttt","b",X_14);
X_22 := aggr.count(X_15);
diff --git a/sql/benchmarks/tpch/Tests/16-explain.stable.out
b/sql/benchmarks/tpch/Tests/16-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/16-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/16-explain.stable.out
@@ -77,7 +77,8 @@ function user.s2_1{autoCommit=true}(A0:s
X_35 := sql.delta(X_30,X_32,r1_32,X_34);
X_36 := algebra.leftfetchjoin(X_28,X_35);
X_38 := algebra.likesubselect(X_36,nil:BAT,A10,"",false);
- X_41:bat[:oid,:int] := sql.bind(X_13,"sys","supplier","s_suppkey",0);
+ X_214:bat[:oid,:int] := sql.bind(X_13,"sys","supplier","s_suppkey",0);
+ X_41:bat[:oid,:int] := mosaic.decompress(X_214);
(X_43,r1_45) := sql.bind(X_13,"sys","supplier","s_suppkey",2);
X_45:bat[:oid,:int] := sql.bind(X_13,"sys","supplier","s_suppkey",1);
X_47 := sql.delta(X_41,X_43,r1_45,X_45);
@@ -95,7 +96,8 @@ function user.s2_1{autoCommit=true}(A0:s
X_70:bat[:oid,:int] := sql.bind(X_13,"sys","part","p_size",1);
X_71 := sql.delta(X_66,X_68,r1_72,X_70);
X_72 := algebra.leftfetchjoin(X_64,X_71);
- X_73:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_type",0);
+ X_215:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_type",0);
+ X_73:bat[:oid,:str] := mosaic.decompress(X_215);
(X_75,r1_80) := sql.bind(X_13,"sys","part","p_type",2);
X_78:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_type",1);
X_79 := sql.delta(X_73,X_75,r1_80,X_78);
@@ -124,10 +126,10 @@ function user.s2_1{autoCommit=true}(A0:s
X_107 := bat.mergecand(X_105,X_106);
X_108 := algebra.leftfetchjoin(X_107,X_64);
(X_109,r1_124) :=
algebra.subjoin(X_63,X_108,nil:BAT,nil:BAT,false,nil:lng);
- X_212 := algebra.leftfetchjoin(r1_124,X_107);
- X_113:bat[:oid,:str] := algebra.leftfetchjoin(X_212,X_80);
- X_114:bat[:oid,:str] := algebra.leftfetchjoin(X_212,X_88);
- X_115:bat[:oid,:int] := algebra.leftfetchjoin(X_212,X_72);
+ X_213 := algebra.leftfetchjoin(r1_124,X_107);
+ X_113:bat[:oid,:str] := algebra.leftfetchjoin(X_213,X_80);
+ X_114:bat[:oid,:str] := algebra.leftfetchjoin(X_213,X_88);
+ X_115:bat[:oid,:int] := algebra.leftfetchjoin(X_213,X_72);
X_116:bat[:oid,:int] := algebra.leftfetchjoinPath(X_109,X_52,X_26);
(X_117,r1_136,r2_136) := group.subgroup(X_116);
(X_120,r1_139,r2_139) := group.subgroup(X_115,X_117);
diff --git a/sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
@@ -125,13 +125,13 @@ function user.s2_1{autoCommit=true}(A0:i
X_120 := algebra.leftfetchjoin(X_110,X_119);
(X_121,r1_166) :=
algebra.subjoin(X_108,X_120,nil:BAT,nil:BAT,false,nil:lng);
X_124 := algebra.tdiff(X_109,X_121);
- X_181 := algebra.leftfetchjoin(X_124,X_107);
- X_125:bat[:oid,:str] := algebra.leftfetchjoinPath(X_181,X_52,X_36);
+ X_182 := algebra.leftfetchjoin(X_124,X_107);
+ X_125:bat[:oid,:str] := algebra.leftfetchjoinPath(X_182,X_52,X_36);
X_126:bat[:oid,:str] := batstr.substring(X_125,A0,A1);
(X_127,r1_178,r2_178) := group.subgroupdone(X_126);
X_130 := algebra.leftfetchjoin(r1_178,X_126);
X_135:bat[:oid,:wrd] := aggr.subcount(X_127,X_127,r1_178,false);
- X_137:bat[:oid,:lng] := algebra.leftfetchjoin(X_181,X_73);
+ X_137:bat[:oid,:lng] := algebra.leftfetchjoin(X_182,X_73);
X_138:bat[:oid,:hge] := aggr.subsum(X_137,X_127,r1_178,true,true);
(X_131,r1_182,r2_182) := algebra.subsort(X_130,false,false);
X_134 := algebra.leftfetchjoin(r1_182,X_130);
diff --git a/sql/test/leaks/Tests/check1_bam.stable.out.int128
b/sql/test/leaks/Tests/check1_bam.stable.out.int128
--- a/sql/test/leaks/Tests/check1_bam.stable.out.int128
+++ b/sql/test/leaks/Tests/check1_bam.stable.out.int128
@@ -39,11 +39,11 @@ Ready.
[ "oid", "bit", 0 ]
[ "oid", "bit", 4 ]
[ "oid", "bit", 45 ]
-[ "oid", "bit", 329 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bte", 4224 ]
+[ "oid", "bit", 330 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bte", 4236 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -99,21 +99,21 @@ Ready.
[ "oid", "int", 206 ]
[ "oid", "int", 231 ]
[ "oid", "int", 231 ]
-[ "oid", "int", 329 ]
-[ "oid", "int", 329 ]
-[ "oid", "int", 329 ]
-[ "oid", "int", 329 ]
-[ "oid", "int", 329 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 4224 ]
-[ "oid", "int", 4224 ]
-[ "oid", "int", 4224 ]
-[ "oid", "int", 4224 ]
-[ "oid", "int", 4224 ]
+[ "oid", "int", 330 ]
+[ "oid", "int", 330 ]
+[ "oid", "int", 330 ]
+[ "oid", "int", 330 ]
+[ "oid", "int", 330 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 4236 ]
+[ "oid", "int", 4236 ]
+[ "oid", "int", 4236 ]
+[ "oid", "int", 4236 ]
+[ "oid", "int", 4236 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -232,15 +232,15 @@ Ready.
[ "oid", "str", 46 ]
[ "oid", "str", 46 ]
[ "oid", "str", 206 ]
-[ "oid", "str", 329 ]
-[ "oid", "str", 329 ]
-[ "oid", "str", 329 ]
-[ "oid", "str", 329 ]
-[ "oid", "str", 1504 ]
-[ "oid", "str", 1504 ]
-[ "oid", "str", 1504 ]
-[ "oid", "str", 4224 ]
-[ "oid", "str", 4224 ]
+[ "oid", "str", 330 ]
+[ "oid", "str", 330 ]
+[ "oid", "str", 330 ]
+[ "oid", "str", 330 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 4236 ]
+[ "oid", "str", 4236 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check2_bam.stable.out.int128
b/sql/test/leaks/Tests/check2_bam.stable.out.int128
--- a/sql/test/leaks/Tests/check2_bam.stable.out.int128
+++ b/sql/test/leaks/Tests/check2_bam.stable.out.int128
@@ -39,11 +39,11 @@ Ready.
[ "oid", "bit", 0 ]
[ "oid", "bit", 4 ]
[ "oid", "bit", 45 ]
-[ "oid", "bit", 329 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bit", 1504 ]
-[ "oid", "bte", 4224 ]
+[ "oid", "bit", 330 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bit", 1511 ]
+[ "oid", "bte", 4236 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -99,21 +99,21 @@ Ready.
[ "oid", "int", 206 ]
[ "oid", "int", 231 ]
[ "oid", "int", 231 ]
-[ "oid", "int", 329 ]
-[ "oid", "int", 329 ]
-[ "oid", "int", 329 ]
-[ "oid", "int", 329 ]
-[ "oid", "int", 329 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 1504 ]
-[ "oid", "int", 4224 ]
-[ "oid", "int", 4224 ]
-[ "oid", "int", 4224 ]
-[ "oid", "int", 4224 ]
-[ "oid", "int", 4224 ]
+[ "oid", "int", 330 ]
+[ "oid", "int", 330 ]
+[ "oid", "int", 330 ]
+[ "oid", "int", 330 ]
+[ "oid", "int", 330 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 1511 ]
+[ "oid", "int", 4236 ]
+[ "oid", "int", 4236 ]
+[ "oid", "int", 4236 ]
+[ "oid", "int", 4236 ]
+[ "oid", "int", 4236 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -232,15 +232,15 @@ Ready.
[ "oid", "str", 46 ]
[ "oid", "str", 46 ]
[ "oid", "str", 206 ]
-[ "oid", "str", 329 ]
-[ "oid", "str", 329 ]
-[ "oid", "str", 329 ]
-[ "oid", "str", 329 ]
-[ "oid", "str", 1504 ]
-[ "oid", "str", 1504 ]
-[ "oid", "str", 1504 ]
-[ "oid", "str", 4224 ]
-[ "oid", "str", 4224 ]
+[ "oid", "str", 330 ]
+[ "oid", "str", 330 ]
+[ "oid", "str", 330 ]
+[ "oid", "str", 330 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 1511 ]
+[ "oid", "str", 4236 ]
+[ "oid", "str", 4236 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check3_bam.stable.out.int128
b/sql/test/leaks/Tests/check3_bam.stable.out.int128
--- a/sql/test/leaks/Tests/check3_bam.stable.out.int128
+++ b/sql/test/leaks/Tests/check3_bam.stable.out.int128
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
