Changeset: 8d07fab26584 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d07fab26584
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/Tests/setoptimizer.stable.out
sql/test/mosaic/Tests/xqueries.stable.out
sql/test/mosaic/Tests/xqueries_delta.stable.out
sql/test/mosaic/Tests/xqueries_rle.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 544 to 300 lines):
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.
% .L1 # table_name
% def # name
% clob # type
-% 563 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();"
]
+% 522 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
@@ -64,8 +64,6 @@ Ready.
% 158 # length
function user.s10_1():void;
X_1:void := querylog.define("explain copy into ttt from \\'/tmp/xyz\\';",
"sequential_pipe", 21:int);
-function user.s8_1():void;
- X_1:void := querylog.define("explain copy into ttt from \\'/tmp/xyz\\';",
"default_pipe", 21:int);
X_4 := sql.mvc();
(X_25:bat[:int], X_26:bat[:int], X_27:bat[:int]) := sql.copy_from(nil:ptr,
"|", "\\n", nil:str, "null", "/tmp/xyz", -1:lng, 0:lng, 0:int, 0:int, nil:str);
X_29 := sql.append(X_4, "sys", "ttt", "a", X_25);
@@ -116,8 +114,8 @@ end user.s10_1;
% .L1 # table_name
% def # name
% clob # type
-% 586 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 545 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
diff --git
a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128
b/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128
--- a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128
+++ b/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128
@@ -29,17 +29,18 @@ Ready.
[ 1 ]
#SELECT EXTRACT (SECOND FROM FIPS2)
#* 1000000 - 999990 FROM A;
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
% decimal # type
% 41 # length
-[ -990.000000 ]
+[ 10.000000 ]
#select EXTRACT (SECOND FROM FIPS2) FROM A;
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
% decimal # type
% 11 # length
-[ 0.999 ]
+[ 1.000 ]
+#drop table A;
# 14:08:04 >
# 14:08:04 > Done.
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -299,39 +299,39 @@ end user.s10_1;
% clob # type
% 142 # length
function user.s20_1():void;
- X_91:void := querylog.define("-- no query", "sequential_pipe", 12:int);
- X_38 := bat.new(nil:str);
- X_45 := bat.append(X_38, "sys.functions");
- X_55 := bat.append(X_45, "sys.functions");
+ X_90:void := querylog.define("-- no query", "sequential_pipe", 12:int);
+ X_37 := bat.new(nil:str);
+ X_44 := bat.append(X_37, "sys.functions");
+ X_54 := bat.append(X_44, "sys.functions");
+ X_39 := bat.new(nil:str);
+ X_46 := bat.append(X_39, "name");
+ X_55 := bat.append(X_46, "func");
X_40 := bat.new(nil:str);
- X_47 := bat.append(X_40, "name");
- X_56 := bat.append(X_47, "func");
- X_41 := bat.new(nil:str);
- X_49 := bat.append(X_41, "varchar");
- X_58 := bat.append(X_49, "varchar");
- X_42 := bat.new(nil:int);
- X_51 := bat.append(X_42, 256:int);
- X_59 := bat.append(X_51, 8196:int);
- X_44 := bat.new(nil:int);
- X_53 := bat.append(X_44, 0:int);
- X_61 := bat.append(X_53, 0:int);
+ X_48 := bat.append(X_40, "varchar");
+ X_57 := bat.append(X_48, "varchar");
+ X_41 := bat.new(nil:int);
+ X_50 := bat.append(X_41, 256:int);
+ X_58 := bat.append(X_50, 8196:int);
+ X_43 := bat.new(nil:int);
+ X_52 := bat.append(X_43, 0:int);
+ X_60 := bat.append(X_52, 0:int);
X_5 := sql.mvc();
- C_150:bat[:oid] := sql.tid(X_5, "sys", "functions");
- X_6:bat[:oid] := mosaic.decompress(C_150);
+ C_149:bat[:oid] := sql.tid(X_5, "sys", "functions");
+ X_6:bat[:oid] := mosaic.decompress(C_149);
X_9:bat[:str] := sql.bind(X_5, "sys", "functions", "name", 0:int);
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5, "sys", "functions",
"name", 2:int);
X_12:bat[:str] := sql.bind(X_5, "sys", "functions", "name", 1:int);
X_18 := sql.projectdelta(X_6, X_9, C_14, X_15, X_12);
- X_102:bat[:bit] := batalgebra.like(X_18, "%optimizers%":str);
- C_32 := algebra.select(X_102, true, true, true, false, false);
- X_35 := algebra.projection(C_32, X_18);
+ X_101:bat[:bit] := batalgebra.like(X_18, "%optimizers%":str);
+ C_32 := algebra.select(X_101, true, true, true, true, false);
+ X_34 := algebra.projection(C_32, X_18);
X_19:bat[:str] := sql.bind(X_5, "sys", "functions", "func", 0:int);
(C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5, "sys", "functions",
"func", 2:int);
X_21:bat[:str] := sql.bind(X_5, "sys", "functions", "func", 1:int);
X_25 := sql.projectdelta(X_6, X_19, C_22, X_23, X_21);
- X_36 := algebra.projection(C_32, X_25);
+ X_35 := algebra.projection(C_32, X_25);
X_2:void := querylog.define("explain select name,func from functions where
contains(name, \\'optimizers\\');", "sequential_pipe", 37:int);
- sql.resultSet(X_55, X_56, X_58, X_59, X_61, X_35, X_36);
+ sql.resultSet(X_54, X_55, X_57, X_58, X_60, X_34, X_35);
end user.s20_1;
#inline actions= 0 time=6 usec
#remap actions= 1 time=59 usec
@@ -362,39 +362,39 @@ end user.s20_1;
% clob # type
% 146 # length
function user.s22_1():void;
- X_91:void := querylog.define("-- no query", "sequential_pipe", 12:int);
- X_38 := bat.new(nil:str);
- X_45 := bat.append(X_38, "sys.functions");
- X_55 := bat.append(X_45, "sys.functions");
+ X_90:void := querylog.define("-- no query", "sequential_pipe", 12:int);
+ X_37 := bat.new(nil:str);
+ X_44 := bat.append(X_37, "sys.functions");
+ X_54 := bat.append(X_44, "sys.functions");
+ X_39 := bat.new(nil:str);
+ X_46 := bat.append(X_39, "name");
+ X_55 := bat.append(X_46, "func");
X_40 := bat.new(nil:str);
- X_47 := bat.append(X_40, "name");
- X_56 := bat.append(X_47, "func");
- X_41 := bat.new(nil:str);
- X_49 := bat.append(X_41, "varchar");
- X_58 := bat.append(X_49, "varchar");
- X_42 := bat.new(nil:int);
- X_51 := bat.append(X_42, 256:int);
- X_59 := bat.append(X_51, 8196:int);
- X_44 := bat.new(nil:int);
- X_53 := bat.append(X_44, 0:int);
- X_61 := bat.append(X_53, 0:int);
+ X_48 := bat.append(X_40, "varchar");
+ X_57 := bat.append(X_48, "varchar");
+ X_41 := bat.new(nil:int);
+ X_50 := bat.append(X_41, 256:int);
+ X_58 := bat.append(X_50, 8196:int);
+ X_43 := bat.new(nil:int);
+ X_52 := bat.append(X_43, 0:int);
+ X_60 := bat.append(X_52, 0:int);
X_5 := sql.mvc();
- C_150:bat[:oid] := sql.tid(X_5, "sys", "functions");
- X_6:bat[:oid] := mosaic.decompress(C_150);
+ C_149:bat[:oid] := sql.tid(X_5, "sys", "functions");
+ X_6:bat[:oid] := mosaic.decompress(C_149);
X_9:bat[:str] := sql.bind(X_5, "sys", "functions", "name", 0:int);
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5, "sys", "functions",
"name", 2:int);
X_12:bat[:str] := sql.bind(X_5, "sys", "functions", "name", 1:int);
X_18 := sql.projectdelta(X_6, X_9, C_14, X_15, X_12);
- X_102:bat[:bit] := batalgebra.not_like(X_18, "%optimizers%":str);
- C_32 := algebra.select(X_102, true, true, true, false, false);
- X_35 := algebra.projection(C_32, X_18);
+ X_101:bat[:bit] := batalgebra.not_like(X_18, "%optimizers%":str);
+ C_32 := algebra.select(X_101, true, true, true, true, false);
+ X_34 := algebra.projection(C_32, X_18);
X_19:bat[:str] := sql.bind(X_5, "sys", "functions", "func", 0:int);
(C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5, "sys", "functions",
"func", 2:int);
X_21:bat[:str] := sql.bind(X_5, "sys", "functions", "func", 1:int);
X_25 := sql.projectdelta(X_6, X_19, C_22, X_23, X_21);
- X_36 := algebra.projection(C_32, X_25);
+ X_35 := algebra.projection(C_32, X_25);
X_2:void := querylog.define("explain select name,func from functions where
not_contains(name, \\'optimizers\\');", "sequential_pipe", 37:int);
- sql.resultSet(X_55, X_56, X_58, X_59, X_61, X_35, X_36);
+ sql.resultSet(X_54, X_55, X_57, X_58, X_60, X_34, X_35);
end user.s22_1;
#inline actions= 0 time=4 usec
#remap actions= 1 time=53 usec
@@ -425,39 +425,39 @@ end user.s22_1;
% clob # type
% 143 # length
function user.s24_1():void;
- X_91:void := querylog.define("-- no query", "sequential_pipe", 12:int);
- X_38 := bat.new(nil:str);
- X_45 := bat.append(X_38, "sys.functions");
- X_55 := bat.append(X_45, "sys.functions");
+ X_90:void := querylog.define("-- no query", "sequential_pipe", 12:int);
+ X_37 := bat.new(nil:str);
+ X_44 := bat.append(X_37, "sys.functions");
+ X_54 := bat.append(X_44, "sys.functions");
+ X_39 := bat.new(nil:str);
+ X_46 := bat.append(X_39, "name");
+ X_55 := bat.append(X_46, "func");
X_40 := bat.new(nil:str);
- X_47 := bat.append(X_40, "name");
- X_56 := bat.append(X_47, "func");
- X_41 := bat.new(nil:str);
- X_49 := bat.append(X_41, "varchar");
- X_58 := bat.append(X_49, "varchar");
- X_42 := bat.new(nil:int);
- X_51 := bat.append(X_42, 256:int);
- X_59 := bat.append(X_51, 8196:int);
- X_44 := bat.new(nil:int);
- X_53 := bat.append(X_44, 0:int);
- X_61 := bat.append(X_53, 0:int);
+ X_48 := bat.append(X_40, "varchar");
+ X_57 := bat.append(X_48, "varchar");
+ X_41 := bat.new(nil:int);
+ X_50 := bat.append(X_41, 256:int);
+ X_58 := bat.append(X_50, 8196:int);
+ X_43 := bat.new(nil:int);
+ X_52 := bat.append(X_43, 0:int);
+ X_60 := bat.append(X_52, 0:int);
X_5 := sql.mvc();
- C_150:bat[:oid] := sql.tid(X_5, "sys", "functions");
- X_6:bat[:oid] := mosaic.decompress(C_150);
+ C_149:bat[:oid] := sql.tid(X_5, "sys", "functions");
+ X_6:bat[:oid] := mosaic.decompress(C_149);
X_9:bat[:str] := sql.bind(X_5, "sys", "functions", "name", 0:int);
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5, "sys", "functions",
"name", 2:int);
X_12:bat[:str] := sql.bind(X_5, "sys", "functions", "name", 1:int);
X_18 := sql.projectdelta(X_6, X_9, C_14, X_15, X_12);
- X_102:bat[:bit] := batalgebra.ilike(X_18, "%optimizers%":str);
- C_32 := algebra.select(X_102, true, true, true, false, false);
- X_35 := algebra.projection(C_32, X_18);
+ X_101:bat[:bit] := batalgebra.ilike(X_18, "%optimizers%":str);
+ C_32 := algebra.select(X_101, true, true, true, true, false);
+ X_34 := algebra.projection(C_32, X_18);
X_19:bat[:str] := sql.bind(X_5, "sys", "functions", "func", 0:int);
(C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5, "sys", "functions",
"func", 2:int);
X_21:bat[:str] := sql.bind(X_5, "sys", "functions", "func", 1:int);
X_25 := sql.projectdelta(X_6, X_19, C_22, X_23, X_21);
- X_36 := algebra.projection(C_32, X_25);
+ X_35 := algebra.projection(C_32, X_25);
X_2:void := querylog.define("explain select name,func from functions where
icontains(name, \\'optimizers\\');", "sequential_pipe", 37:int);
- sql.resultSet(X_55, X_56, X_58, X_59, X_61, X_35, X_36);
+ sql.resultSet(X_54, X_55, X_57, X_58, X_60, X_34, X_35);
end user.s24_1;
#inline actions= 0 time=4 usec
#remap actions= 1 time=52 usec
@@ -488,39 +488,39 @@ end user.s24_1;
% clob # type
% 147 # length
function user.s26_1():void;
- X_91:void := querylog.define("-- no query", "sequential_pipe", 12:int);
- X_38 := bat.new(nil:str);
- X_45 := bat.append(X_38, "sys.functions");
- X_55 := bat.append(X_45, "sys.functions");
+ X_90:void := querylog.define("-- no query", "sequential_pipe", 12:int);
+ X_37 := bat.new(nil:str);
+ X_44 := bat.append(X_37, "sys.functions");
+ X_54 := bat.append(X_44, "sys.functions");
+ X_39 := bat.new(nil:str);
+ X_46 := bat.append(X_39, "name");
+ X_55 := bat.append(X_46, "func");
X_40 := bat.new(nil:str);
- X_47 := bat.append(X_40, "name");
- X_56 := bat.append(X_47, "func");
- X_41 := bat.new(nil:str);
- X_49 := bat.append(X_41, "varchar");
- X_58 := bat.append(X_49, "varchar");
- X_42 := bat.new(nil:int);
- X_51 := bat.append(X_42, 256:int);
- X_59 := bat.append(X_51, 8196:int);
- X_44 := bat.new(nil:int);
- X_53 := bat.append(X_44, 0:int);
- X_61 := bat.append(X_53, 0:int);
+ X_48 := bat.append(X_40, "varchar");
+ X_57 := bat.append(X_48, "varchar");
+ X_41 := bat.new(nil:int);
+ X_50 := bat.append(X_41, 256:int);
+ X_58 := bat.append(X_50, 8196:int);
+ X_43 := bat.new(nil:int);
+ X_52 := bat.append(X_43, 0:int);
+ X_60 := bat.append(X_52, 0:int);
X_5 := sql.mvc();
- C_150:bat[:oid] := sql.tid(X_5, "sys", "functions");
- X_6:bat[:oid] := mosaic.decompress(C_150);
+ C_149:bat[:oid] := sql.tid(X_5, "sys", "functions");
+ X_6:bat[:oid] := mosaic.decompress(C_149);
X_9:bat[:str] := sql.bind(X_5, "sys", "functions", "name", 0:int);
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5, "sys", "functions",
"name", 2:int);
X_12:bat[:str] := sql.bind(X_5, "sys", "functions", "name", 1:int);
X_18 := sql.projectdelta(X_6, X_9, C_14, X_15, X_12);
- X_102:bat[:bit] := batalgebra.not_ilike(X_18, "%optimizers%":str);
- C_32 := algebra.select(X_102, true, true, true, false, false);
- X_35 := algebra.projection(C_32, X_18);
+ X_101:bat[:bit] := batalgebra.not_ilike(X_18, "%optimizers%":str);
+ C_32 := algebra.select(X_101, true, true, true, true, false);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
