Changeset: b3a59e2c533d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3a59e2c533d
Modified Files:
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
Approve output
diffs (truncated from 1178 to 300 lines):
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
@@ -44,7 +44,7 @@ Ready.
% mal # name
% clob # type
% 206 # length
-function user.s5_1{autoCommit=true}(A0:timestamp,A1:timestamp,A2:void):void;
+function user.s5_1(A0:timestamp,A1:timestamp,A2:void):void;
X_55: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",74);
barrier X_111 := language.dataflow();
X_33 := bat.new(nil:oid,nil:str);
@@ -62,27 +62,27 @@ barrier X_111 := language.dataflow();
X_39 := bat.new(nil:oid,nil:int);
X_48 := bat.append(X_39,0);
X_54 := bat.append(X_48,9);
- X_6:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
- X_5 := sql.mvc();
- X_64:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",0,2);
- X_66:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,0,2);
- (X_68:bat[:oid,:oid],X_69:bat[:oid,:timestamp]) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,0,2);
+ X_5:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
+ X_4 := sql.mvc();
+ X_64:bat[:oid,:oid] := sql.tid(X_4,"sys","foo_nil_2dec",0,2);
+ X_66:bat[:oid,:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",0,0,2);
+ (X_68:bat[:oid,:oid],X_69:bat[:oid,:timestamp]) :=
sql.bind(X_4,"sys","foo_nil_2dec","t",2,0,2);
X_78 := sql.delta(X_66,X_68,X_69);
X_80 := algebra.leftfetchjoin(X_64,X_78);
- X_16 := calc.timestamp(A0,7);
- X_82 := algebra.project(X_80,X_16);
+ X_15 := calc.timestamp(A0,7);
+ X_82 := algebra.project(X_80,X_15);
X_84 := batmtime.diff(X_80,X_82);
- X_65:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",1,2);
- X_67:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,1,2);
- (X_70:bat[:oid,:oid],X_71:bat[:oid,:timestamp]) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,1,2);
- X_14:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",1);
- X_79 := sql.delta(X_67,X_70,X_71,X_14);
+ X_65:bat[:oid,:oid] := sql.tid(X_4,"sys","foo_nil_2dec",1,2);
+ X_67:bat[:oid,:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",0,1,2);
+ (X_70:bat[:oid,:oid],X_71:bat[:oid,:timestamp]) :=
sql.bind(X_4,"sys","foo_nil_2dec","t",2,1,2);
+ X_13:bat[:oid,:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",1);
+ X_79 := sql.delta(X_67,X_70,X_71,X_13);
X_81 := algebra.leftfetchjoin(X_65,X_79);
- X_83 := algebra.project(X_81,X_16);
+ X_83 := algebra.project(X_81,X_15);
X_85 := batmtime.diff(X_81,X_83);
X_96 := mat.packIncrement(X_84,2);
- X_18:bat[:oid,:lng] := mat.packIncrement(X_96,X_85);
- X_19 := bat.append(X_6,X_18,true);
+ X_17:bat[:oid,:lng] := mat.packIncrement(X_96,X_85);
+ X_18 := bat.append(X_5,X_17,true);
X_20 := calc.timestamp(A1,7);
X_86 := algebra.project(X_80,X_20);
X_88 := batmtime.diff(X_80,X_86);
@@ -90,15 +90,15 @@ barrier X_111 := language.dataflow();
X_89 := batmtime.diff(X_81,X_87);
X_99 := mat.packIncrement(X_88,2);
X_21:bat[:oid,:lng] := mat.packIncrement(X_99,X_89);
- X_22 := bat.append(X_19,X_21,true);
+ X_22 := bat.append(X_18,X_21,true);
X_23:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
- X_72:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,0,2);
- (X_74:bat[:oid,:oid],X_75:bat[:oid,:lng]) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,0,2);
+ X_72:bat[:oid,:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",0,0,2);
+ (X_74:bat[:oid,:oid],X_75:bat[:oid,:lng]) :=
sql.bind(X_4,"sys","foo_nil_2dec","v",2,0,2);
X_90 := sql.delta(X_72,X_74,X_75);
X_92 := algebra.leftfetchjoin(X_64,X_90);
- X_73:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,1,2);
- (X_76:bat[:oid,:oid],X_77:bat[:oid,:lng]) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,1,2);
- X_25:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",1);
+ X_73:bat[:oid,:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",0,1,2);
+ (X_76:bat[:oid,:oid],X_77:bat[:oid,:lng]) :=
sql.bind(X_4,"sys","foo_nil_2dec","v",2,1,2);
+ X_25:bat[:oid,:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",1);
X_91 := sql.delta(X_73,X_76,X_77,X_25);
X_93 := algebra.leftfetchjoin(X_65,X_91);
X_101 := mat.packIncrement(X_92,2);
diff --git a/sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
b/sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
--- a/sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
+++ b/sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
@@ -42,7 +42,7 @@ Ready.
% mal # name
% clob # type
% 98 # length
-function user.s3_1{autoCommit=true}(A0:int):void;
+function user.s3_1(A0:int):void;
X_35:void := querylog.define("explain select * from test where value =
1;","default_pipe",24);
X_19 := bat.new(nil:oid,nil:str);
X_27 := bat.append(X_19,"sys.test");
@@ -54,16 +54,16 @@ function user.s3_1{autoCommit=true}(A0:i
X_32 := bat.append(X_24,32);
X_26 := bat.new(nil:oid,nil:int);
X_34 := bat.append(X_26,0);
- X_3 := sql.mvc();
- X_7:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",0);
- C_4:bat[:oid,:oid] := sql.tid(X_3,"sys","test");
- C_45 := algebra.subselect(X_7,C_4,A0,A0,true,false,false);
- (C_10,r1_10) := sql.bind(X_3,"sys","test","value",2);
- C_46 := algebra.subselect(r1_10,nil:bat[:oid,:oid],A0,A0,true,false,false);
- X_13:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",1);
- C_48 := algebra.subselect(X_13,C_4,A0,A0,true,false,false);
- C_15 := sql.subdelta(C_45,C_4,C_10,C_46,C_48);
- X_17 := sql.projectdelta(C_15,X_7,C_10,r1_10,X_13);
+ X_2 := sql.mvc();
+ X_6:bat[:oid,:int] := sql.bind(X_2,"sys","test","value",0);
+ C_3:bat[:oid,:oid] := sql.tid(X_2,"sys","test");
+ C_45 := algebra.subselect(X_6,C_3,A0,A0,true,false,false);
+ (C_9,r1_9) := sql.bind(X_2,"sys","test","value",2);
+ C_46 := algebra.subselect(r1_9,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ X_12:bat[:oid,:int] := sql.bind(X_2,"sys","test","value",1);
+ C_48 := algebra.subselect(X_12,C_3,A0,A0,true,false,false);
+ C_14 := sql.subdelta(C_45,C_3,C_9,C_46,C_48);
+ X_17 := sql.projectdelta(C_14,X_6,C_9,r1_9,X_12);
sql.resultSet(X_27,X_29,X_30,X_32,X_34,X_17);
end user.s3_1;
# optimizer.mitosis()
@@ -78,285 +78,8 @@ end user.s3_1;
% mal # name
% clob # type
% 98 # length
-function user.s4_1{autoCommit=true}(A0:int):void;
- X_30:void := querylog.define("explain select * from test where value >
1;","default_pipe",57);
-barrier X_83 := language.dataflow();
- X_14 := bat.new(nil:oid,nil:str);
- X_22 := bat.append(X_14,"sys.test");
- X_17 := bat.new(nil:oid,nil:str);
- X_24 := bat.append(X_17,"value");
- X_18 := bat.new(nil:oid,nil:str);
- X_25 := bat.append(X_18,"int");
- X_19 := bat.new(nil:oid,nil:int);
- X_27 := bat.append(X_19,32);
- X_21 := bat.new(nil:oid,nil:int);
- X_29 := bat.append(X_21,0);
- X_3 := sql.mvc();
- X_45:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",0,0,3);
- X_42:bat[:oid,:oid] := sql.tid(X_3,"sys","test",0,3);
- X_54 := algebra.thetasubselect(X_45,X_42,A0,">");
- (X_48:bat[:oid,:oid],X_49:bat[:oid,:int]) :=
sql.bind(X_3,"sys","test","value",2,0,3);
- X_57 := algebra.thetasubselect(X_49,nil:bat[:oid,:oid],A0,">");
- X_60 := sql.subdelta(X_54,X_42,X_48,X_57);
- X_63 := sql.projectdelta(X_60,X_45,X_48,X_49);
- X_46:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",0,1,3);
- X_43:bat[:oid,:oid] := sql.tid(X_3,"sys","test",1,3);
- X_55 := algebra.thetasubselect(X_46,X_43,A0,">");
- (X_50:bat[:oid,:oid],X_51:bat[:oid,:int]) :=
sql.bind(X_3,"sys","test","value",2,1,3);
- X_58 := algebra.thetasubselect(X_51,nil:bat[:oid,:oid],A0,">");
- X_61 := sql.subdelta(X_55,X_43,X_50,X_58);
- X_64 := sql.projectdelta(X_61,X_46,X_50,X_51);
- X_47:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",0,2,3);
- X_44:bat[:oid,:oid] := sql.tid(X_3,"sys","test",2,3);
- X_56 := algebra.thetasubselect(X_47,X_44,A0,">");
- (X_52:bat[:oid,:oid],X_53:bat[:oid,:int]) :=
sql.bind(X_3,"sys","test","value",2,2,3);
- X_59 := algebra.thetasubselect(X_53,nil:bat[:oid,:oid],A0,">");
- X_9:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",1);
- C_40 := algebra.thetasubselect(X_9,X_44,A0,">");
- X_62 := sql.subdelta(X_56,X_44,X_52,X_59,C_40);
- X_65 := sql.projectdelta(X_62,X_47,X_52,X_53,X_9);
- X_66 := mat.packIncrement(X_63,3);
- X_67 := mat.packIncrement(X_66,X_64);
- X_12 := mat.packIncrement(X_67,X_65);
- language.pass(X_42);
- language.pass(X_45);
- language.pass(X_48);
- language.pass(X_49);
- language.pass(X_43);
- language.pass(X_46);
- language.pass(X_50);
- language.pass(X_51);
- language.pass(nil:bat[:oid,:oid]);
- language.pass(X_44);
- language.pass(X_47);
- language.pass(X_52);
- language.pass(X_53);
- language.pass(X_9);
-exit X_83;
- sql.resultSet(X_22,X_24,X_25,X_27,X_29,X_12);
-end user.s4_1;
-#select * from test where value >= 12345678900; # value > INT_MAX
-% sys.test # table_name
-% value # name
-% int # type
-% 1 # length
-#explain select * from test where value >= 1; # value < INT_MAX
-% .explain # table_name
-% mal # name
-% clob # type
-% 99 # length
-function user.s5_1{autoCommit=true}(A0:int):void;
- X_30:void := querylog.define("explain select * from test where value >=
1;","default_pipe",57);
-barrier X_83 := language.dataflow();
- X_14 := bat.new(nil:oid,nil:str);
- X_22 := bat.append(X_14,"sys.test");
- X_17 := bat.new(nil:oid,nil:str);
- X_24 := bat.append(X_17,"value");
- X_18 := bat.new(nil:oid,nil:str);
- X_25 := bat.append(X_18,"int");
- X_19 := bat.new(nil:oid,nil:int);
- X_27 := bat.append(X_19,32);
- X_21 := bat.new(nil:oid,nil:int);
- X_29 := bat.append(X_21,0);
- X_3 := sql.mvc();
- X_45:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",0,0,3);
- X_42:bat[:oid,:oid] := sql.tid(X_3,"sys","test",0,3);
- X_54 := algebra.thetasubselect(X_45,X_42,A0,">=");
- (X_48:bat[:oid,:oid],X_49:bat[:oid,:int]) :=
sql.bind(X_3,"sys","test","value",2,0,3);
- X_57 := algebra.thetasubselect(X_49,nil:bat[:oid,:oid],A0,">=");
- X_60 := sql.subdelta(X_54,X_42,X_48,X_57);
- X_63 := sql.projectdelta(X_60,X_45,X_48,X_49);
- X_46:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",0,1,3);
- X_43:bat[:oid,:oid] := sql.tid(X_3,"sys","test",1,3);
- X_55 := algebra.thetasubselect(X_46,X_43,A0,">=");
- (X_50:bat[:oid,:oid],X_51:bat[:oid,:int]) :=
sql.bind(X_3,"sys","test","value",2,1,3);
- X_58 := algebra.thetasubselect(X_51,nil:bat[:oid,:oid],A0,">=");
- X_61 := sql.subdelta(X_55,X_43,X_50,X_58);
- X_64 := sql.projectdelta(X_61,X_46,X_50,X_51);
- X_47:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",0,2,3);
- X_44:bat[:oid,:oid] := sql.tid(X_3,"sys","test",2,3);
- X_56 := algebra.thetasubselect(X_47,X_44,A0,">=");
- (X_52:bat[:oid,:oid],X_53:bat[:oid,:int]) :=
sql.bind(X_3,"sys","test","value",2,2,3);
- X_59 := algebra.thetasubselect(X_53,nil:bat[:oid,:oid],A0,">=");
- X_9:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",1);
- C_40 := algebra.thetasubselect(X_9,X_44,A0,">=");
- X_62 := sql.subdelta(X_56,X_44,X_52,X_59,C_40);
- X_65 := sql.projectdelta(X_62,X_47,X_52,X_53,X_9);
- X_66 := mat.packIncrement(X_63,3);
- X_67 := mat.packIncrement(X_66,X_64);
- X_12 := mat.packIncrement(X_67,X_65);
- language.pass(X_42);
- language.pass(X_45);
- language.pass(X_48);
- language.pass(X_49);
- language.pass(X_43);
- language.pass(X_46);
- language.pass(X_50);
- language.pass(X_51);
- language.pass(nil:bat[:oid,:oid]);
- language.pass(X_44);
- language.pass(X_47);
- language.pass(X_52);
- language.pass(X_53);
- language.pass(X_9);
-exit X_83;
- sql.resultSet(X_22,X_24,X_25,X_27,X_29,X_12);
-end user.s5_1;
-#select * from test where value < 12345678900; # value > INT_MAX
-% sys.test # table_name
-% value # name
-% int # type
-% 1 # length
-[ 1 ]
-[ 2 ]
-[ 3 ]
-#explain select * from test where value < 1; # value < INT_MAX
-% .explain # table_name
-% mal # name
-% clob # type
-% 98 # length
-function user.s6_1{autoCommit=true}(A0:int):void;
- X_30:void := querylog.define("explain select * from test where value <
1;","default_pipe",57);
-barrier X_83 := language.dataflow();
- X_14 := bat.new(nil:oid,nil:str);
- X_22 := bat.append(X_14,"sys.test");
- X_17 := bat.new(nil:oid,nil:str);
- X_24 := bat.append(X_17,"value");
- X_18 := bat.new(nil:oid,nil:str);
- X_25 := bat.append(X_18,"int");
- X_19 := bat.new(nil:oid,nil:int);
- X_27 := bat.append(X_19,32);
- X_21 := bat.new(nil:oid,nil:int);
- X_29 := bat.append(X_21,0);
- X_3 := sql.mvc();
- X_45:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",0,0,3);
- X_42:bat[:oid,:oid] := sql.tid(X_3,"sys","test",0,3);
- X_54 := algebra.thetasubselect(X_45,X_42,A0,"<");
- (X_48:bat[:oid,:oid],X_49:bat[:oid,:int]) :=
sql.bind(X_3,"sys","test","value",2,0,3);
- X_57 := algebra.thetasubselect(X_49,nil:bat[:oid,:oid],A0,"<");
- X_60 := sql.subdelta(X_54,X_42,X_48,X_57);
- X_63 := sql.projectdelta(X_60,X_45,X_48,X_49);
- X_46:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",0,1,3);
- X_43:bat[:oid,:oid] := sql.tid(X_3,"sys","test",1,3);
- X_55 := algebra.thetasubselect(X_46,X_43,A0,"<");
- (X_50:bat[:oid,:oid],X_51:bat[:oid,:int]) :=
sql.bind(X_3,"sys","test","value",2,1,3);
- X_58 := algebra.thetasubselect(X_51,nil:bat[:oid,:oid],A0,"<");
- X_61 := sql.subdelta(X_55,X_43,X_50,X_58);
- X_64 := sql.projectdelta(X_61,X_46,X_50,X_51);
- X_47:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",0,2,3);
- X_44:bat[:oid,:oid] := sql.tid(X_3,"sys","test",2,3);
- X_56 := algebra.thetasubselect(X_47,X_44,A0,"<");
- (X_52:bat[:oid,:oid],X_53:bat[:oid,:int]) :=
sql.bind(X_3,"sys","test","value",2,2,3);
- X_59 := algebra.thetasubselect(X_53,nil:bat[:oid,:oid],A0,"<");
- X_9:bat[:oid,:int] := sql.bind(X_3,"sys","test","value",1);
- C_40 := algebra.thetasubselect(X_9,X_44,A0,"<");
- X_62 := sql.subdelta(X_56,X_44,X_52,X_59,C_40);
- X_65 := sql.projectdelta(X_62,X_47,X_52,X_53,X_9);
- X_66 := mat.packIncrement(X_63,3);
- X_67 := mat.packIncrement(X_66,X_64);
- X_12 := mat.packIncrement(X_67,X_65);
- language.pass(X_42);
- language.pass(X_45);
- language.pass(X_48);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
