Changeset: 2522e00678cd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2522e00678cd
Modified Files:
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
Branch: Dec2016
Log Message:
Approvals after changeset 1ba49a99910f.
diffs (273 lines):
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
@@ -300,36 +300,36 @@ end user.s10_1;
% 140 # length
function user.s20_1():void;
X_0:void := querylog.define("explain select name,func from functions where
contains(name, \\'optimizers\\');","sequential_pipe",31:int);
- X_36 := bat.new(nil:str);
- X_43 := bat.append(X_36,"sys.functions");
- X_53 := bat.append(X_43,"sys.functions");
+ X_35 := bat.new(nil:str);
+ X_42 := bat.append(X_35,"sys.functions");
+ X_52 := bat.append(X_42,"sys.functions");
+ X_37 := bat.new(nil:str);
+ X_44 := bat.append(X_37,"name");
+ X_53 := bat.append(X_44,"func");
X_38 := bat.new(nil:str);
- X_45 := bat.append(X_38,"name");
- X_54 := bat.append(X_45,"func");
- X_39 := bat.new(nil:str);
- X_47 := bat.append(X_39,"varchar");
- X_55 := bat.append(X_47,"varchar");
- X_40 := bat.new(nil:int);
- X_49 := bat.append(X_40,256:int);
- X_56 := bat.append(X_49,8196:int);
- X_42 := bat.new(nil:int);
- X_51 := bat.append(X_42,0:int);
- X_58 := bat.append(X_51,0:int);
+ X_46 := bat.append(X_38,"varchar");
+ X_54 := bat.append(X_46,"varchar");
+ X_39 := bat.new(nil:int);
+ X_48 := bat.append(X_39,256:int);
+ X_55 := bat.append(X_48,8196:int);
+ X_41 := bat.new(nil:int);
+ X_50 := bat.append(X_41,0:int);
+ X_57 := bat.append(X_50,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","functions");
X_7:bat[:str] := sql.bind(X_3,"sys","functions","name",0:int);
(C_10:bat[:oid],r1_12:bat[:str]) :=
sql.bind(X_3,"sys","functions","name",2:int);
X_13:bat[:str] := sql.bind(X_3,"sys","functions","name",1:int);
X_16 := sql.projectdelta(C_4,X_7,C_10,r1_12,X_13);
- X_75:bat[:bit] := batalgebra.like(X_16,"%optimizers%":str);
- C_23 := algebra.subselect(X_75,true,true,true,false,false);
- X_26 := algebra.projection(C_23,X_16);
- X_27:bat[:str] := sql.bind(X_3,"sys","functions","func",0:int);
- (C_29:bat[:oid],r1_31:bat[:str]) :=
sql.bind(X_3,"sys","functions","func",2:int);
- X_31:bat[:str] := sql.bind(X_3,"sys","functions","func",1:int);
- X_33 := sql.projectdelta(C_4,X_27,C_29,r1_31,X_31);
- X_34 := algebra.projection(C_23,X_33);
- sql.resultSet(X_53,X_54,X_55,X_56,X_58,X_26,X_34);
+ X_74:bat[:bit] := batalgebra.like(X_16,"%optimizers%":str);
+ C_23 := algebra.subselect(X_74,true,true,true,true,false);
+ X_25 := algebra.projection(C_23,X_16);
+ X_26:bat[:str] := sql.bind(X_3,"sys","functions","func",0:int);
+ (C_28:bat[:oid],r1_30:bat[:str]) :=
sql.bind(X_3,"sys","functions","func",2:int);
+ X_30:bat[:str] := sql.bind(X_3,"sys","functions","func",1:int);
+ X_32 := sql.projectdelta(C_4,X_26,C_28,r1_30,X_30);
+ X_33 := algebra.projection(C_23,X_32);
+ sql.resultSet(X_52,X_53,X_54,X_55,X_57,X_25,X_33);
end user.s20_1;
#inline actions= 0 time=12 usec
#remap actions= 1 time=100 usec
@@ -361,36 +361,36 @@ end user.s20_1;
% 144 # length
function user.s22_1():void;
X_0:void := querylog.define("explain select name,func from functions where
not_contains(name, \\'optimizers\\');","sequential_pipe",31:int);
- X_36 := bat.new(nil:str);
- X_43 := bat.append(X_36,"sys.functions");
- X_53 := bat.append(X_43,"sys.functions");
+ X_35 := bat.new(nil:str);
+ X_42 := bat.append(X_35,"sys.functions");
+ X_52 := bat.append(X_42,"sys.functions");
+ X_37 := bat.new(nil:str);
+ X_44 := bat.append(X_37,"name");
+ X_53 := bat.append(X_44,"func");
X_38 := bat.new(nil:str);
- X_45 := bat.append(X_38,"name");
- X_54 := bat.append(X_45,"func");
- X_39 := bat.new(nil:str);
- X_47 := bat.append(X_39,"varchar");
- X_55 := bat.append(X_47,"varchar");
- X_40 := bat.new(nil:int);
- X_49 := bat.append(X_40,256:int);
- X_56 := bat.append(X_49,8196:int);
- X_42 := bat.new(nil:int);
- X_51 := bat.append(X_42,0:int);
- X_58 := bat.append(X_51,0:int);
+ X_46 := bat.append(X_38,"varchar");
+ X_54 := bat.append(X_46,"varchar");
+ X_39 := bat.new(nil:int);
+ X_48 := bat.append(X_39,256:int);
+ X_55 := bat.append(X_48,8196:int);
+ X_41 := bat.new(nil:int);
+ X_50 := bat.append(X_41,0:int);
+ X_57 := bat.append(X_50,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","functions");
X_7:bat[:str] := sql.bind(X_3,"sys","functions","name",0:int);
(C_10:bat[:oid],r1_12:bat[:str]) :=
sql.bind(X_3,"sys","functions","name",2:int);
X_13:bat[:str] := sql.bind(X_3,"sys","functions","name",1:int);
X_16 := sql.projectdelta(C_4,X_7,C_10,r1_12,X_13);
- X_75:bat[:bit] := batalgebra.not_like(X_16,"%optimizers%":str);
- C_23 := algebra.subselect(X_75,true,true,true,false,false);
- X_26 := algebra.projection(C_23,X_16);
- X_27:bat[:str] := sql.bind(X_3,"sys","functions","func",0:int);
- (C_29:bat[:oid],r1_31:bat[:str]) :=
sql.bind(X_3,"sys","functions","func",2:int);
- X_31:bat[:str] := sql.bind(X_3,"sys","functions","func",1:int);
- X_33 := sql.projectdelta(C_4,X_27,C_29,r1_31,X_31);
- X_34 := algebra.projection(C_23,X_33);
- sql.resultSet(X_53,X_54,X_55,X_56,X_58,X_26,X_34);
+ X_74:bat[:bit] := batalgebra.not_like(X_16,"%optimizers%":str);
+ C_23 := algebra.subselect(X_74,true,true,true,true,false);
+ X_25 := algebra.projection(C_23,X_16);
+ X_26:bat[:str] := sql.bind(X_3,"sys","functions","func",0:int);
+ (C_28:bat[:oid],r1_30:bat[:str]) :=
sql.bind(X_3,"sys","functions","func",2:int);
+ X_30:bat[:str] := sql.bind(X_3,"sys","functions","func",1:int);
+ X_32 := sql.projectdelta(C_4,X_26,C_28,r1_30,X_30);
+ X_33 := algebra.projection(C_23,X_32);
+ sql.resultSet(X_52,X_53,X_54,X_55,X_57,X_25,X_33);
end user.s22_1;
#inline actions= 0 time=7 usec
#remap actions= 1 time=92 usec
@@ -422,36 +422,36 @@ end user.s22_1;
% 141 # length
function user.s24_1():void;
X_0:void := querylog.define("explain select name,func from functions where
icontains(name, \\'optimizers\\');","sequential_pipe",31:int);
- X_36 := bat.new(nil:str);
- X_43 := bat.append(X_36,"sys.functions");
- X_53 := bat.append(X_43,"sys.functions");
+ X_35 := bat.new(nil:str);
+ X_42 := bat.append(X_35,"sys.functions");
+ X_52 := bat.append(X_42,"sys.functions");
+ X_37 := bat.new(nil:str);
+ X_44 := bat.append(X_37,"name");
+ X_53 := bat.append(X_44,"func");
X_38 := bat.new(nil:str);
- X_45 := bat.append(X_38,"name");
- X_54 := bat.append(X_45,"func");
- X_39 := bat.new(nil:str);
- X_47 := bat.append(X_39,"varchar");
- X_55 := bat.append(X_47,"varchar");
- X_40 := bat.new(nil:int);
- X_49 := bat.append(X_40,256:int);
- X_56 := bat.append(X_49,8196:int);
- X_42 := bat.new(nil:int);
- X_51 := bat.append(X_42,0:int);
- X_58 := bat.append(X_51,0:int);
+ X_46 := bat.append(X_38,"varchar");
+ X_54 := bat.append(X_46,"varchar");
+ X_39 := bat.new(nil:int);
+ X_48 := bat.append(X_39,256:int);
+ X_55 := bat.append(X_48,8196:int);
+ X_41 := bat.new(nil:int);
+ X_50 := bat.append(X_41,0:int);
+ X_57 := bat.append(X_50,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","functions");
X_7:bat[:str] := sql.bind(X_3,"sys","functions","name",0:int);
(C_10:bat[:oid],r1_12:bat[:str]) :=
sql.bind(X_3,"sys","functions","name",2:int);
X_13:bat[:str] := sql.bind(X_3,"sys","functions","name",1:int);
X_16 := sql.projectdelta(C_4,X_7,C_10,r1_12,X_13);
- X_75:bat[:bit] := batalgebra.ilike(X_16,"%optimizers%":str);
- C_23 := algebra.subselect(X_75,true,true,true,false,false);
- X_26 := algebra.projection(C_23,X_16);
- X_27:bat[:str] := sql.bind(X_3,"sys","functions","func",0:int);
- (C_29:bat[:oid],r1_31:bat[:str]) :=
sql.bind(X_3,"sys","functions","func",2:int);
- X_31:bat[:str] := sql.bind(X_3,"sys","functions","func",1:int);
- X_33 := sql.projectdelta(C_4,X_27,C_29,r1_31,X_31);
- X_34 := algebra.projection(C_23,X_33);
- sql.resultSet(X_53,X_54,X_55,X_56,X_58,X_26,X_34);
+ X_74:bat[:bit] := batalgebra.ilike(X_16,"%optimizers%":str);
+ C_23 := algebra.subselect(X_74,true,true,true,true,false);
+ X_25 := algebra.projection(C_23,X_16);
+ X_26:bat[:str] := sql.bind(X_3,"sys","functions","func",0:int);
+ (C_28:bat[:oid],r1_30:bat[:str]) :=
sql.bind(X_3,"sys","functions","func",2:int);
+ X_30:bat[:str] := sql.bind(X_3,"sys","functions","func",1:int);
+ X_32 := sql.projectdelta(C_4,X_26,C_28,r1_30,X_30);
+ X_33 := algebra.projection(C_23,X_32);
+ sql.resultSet(X_52,X_53,X_54,X_55,X_57,X_25,X_33);
end user.s24_1;
#inline actions= 0 time=7 usec
#remap actions= 1 time=91 usec
@@ -483,36 +483,36 @@ end user.s24_1;
% 145 # length
function user.s26_1():void;
X_0:void := querylog.define("explain select name,func from functions where
not_icontains(name, \\'optimizers\\');","sequential_pipe",31:int);
- X_36 := bat.new(nil:str);
- X_43 := bat.append(X_36,"sys.functions");
- X_53 := bat.append(X_43,"sys.functions");
+ X_35 := bat.new(nil:str);
+ X_42 := bat.append(X_35,"sys.functions");
+ X_52 := bat.append(X_42,"sys.functions");
+ X_37 := bat.new(nil:str);
+ X_44 := bat.append(X_37,"name");
+ X_53 := bat.append(X_44,"func");
X_38 := bat.new(nil:str);
- X_45 := bat.append(X_38,"name");
- X_54 := bat.append(X_45,"func");
- X_39 := bat.new(nil:str);
- X_47 := bat.append(X_39,"varchar");
- X_55 := bat.append(X_47,"varchar");
- X_40 := bat.new(nil:int);
- X_49 := bat.append(X_40,256:int);
- X_56 := bat.append(X_49,8196:int);
- X_42 := bat.new(nil:int);
- X_51 := bat.append(X_42,0:int);
- X_58 := bat.append(X_51,0:int);
+ X_46 := bat.append(X_38,"varchar");
+ X_54 := bat.append(X_46,"varchar");
+ X_39 := bat.new(nil:int);
+ X_48 := bat.append(X_39,256:int);
+ X_55 := bat.append(X_48,8196:int);
+ X_41 := bat.new(nil:int);
+ X_50 := bat.append(X_41,0:int);
+ X_57 := bat.append(X_50,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","functions");
X_7:bat[:str] := sql.bind(X_3,"sys","functions","name",0:int);
(C_10:bat[:oid],r1_12:bat[:str]) :=
sql.bind(X_3,"sys","functions","name",2:int);
X_13:bat[:str] := sql.bind(X_3,"sys","functions","name",1:int);
X_16 := sql.projectdelta(C_4,X_7,C_10,r1_12,X_13);
- X_75:bat[:bit] := batalgebra.not_ilike(X_16,"%optimizers%":str);
- C_23 := algebra.subselect(X_75,true,true,true,false,false);
- X_26 := algebra.projection(C_23,X_16);
- X_27:bat[:str] := sql.bind(X_3,"sys","functions","func",0:int);
- (C_29:bat[:oid],r1_31:bat[:str]) :=
sql.bind(X_3,"sys","functions","func",2:int);
- X_31:bat[:str] := sql.bind(X_3,"sys","functions","func",1:int);
- X_33 := sql.projectdelta(C_4,X_27,C_29,r1_31,X_31);
- X_34 := algebra.projection(C_23,X_33);
- sql.resultSet(X_53,X_54,X_55,X_56,X_58,X_26,X_34);
+ X_74:bat[:bit] := batalgebra.not_ilike(X_16,"%optimizers%":str);
+ C_23 := algebra.subselect(X_74,true,true,true,true,false);
+ X_25 := algebra.projection(C_23,X_16);
+ X_26:bat[:str] := sql.bind(X_3,"sys","functions","func",0:int);
+ (C_28:bat[:oid],r1_30:bat[:str]) :=
sql.bind(X_3,"sys","functions","func",2:int);
+ X_30:bat[:str] := sql.bind(X_3,"sys","functions","func",1:int);
+ X_32 := sql.projectdelta(C_4,X_26,C_28,r1_30,X_30);
+ X_33 := algebra.projection(C_23,X_32);
+ sql.resultSet(X_52,X_53,X_54,X_55,X_57,X_25,X_33);
end user.s26_1;
#inline actions= 0 time=7 usec
#remap actions= 1 time=117 usec
diff --git
a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
--- a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
+++ b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
@@ -39,7 +39,7 @@ Ready.
function user.s4_1():void;
X_0:void := querylog.define("explain select count(*) from tmp where i =
20160222;","default_pipe",6:int);
X_10 := bat.new(nil:int);
- C_12 := algebra.subselect(X_10,20160222:int,20160222:int,true,false,false);
+ C_12 := algebra.subselect(X_10,20160222:int,20160222:int,true,true,false);
X_16 := algebra.projection(C_12,X_10);
X_17 := aggr.count(X_16);
sql.resultSet("sys.L4","L3","bigint",64:int,0:int,7:int,X_17);
@@ -54,7 +54,7 @@ end user.s4_1;
function user.s6_1():void;
X_0:void := querylog.define("explain select count(*) from tmp where i =
\\'20160222\\';","default_pipe",6:int);
X_10 := bat.new(nil:int);
- C_14 := algebra.subselect(X_10,20160222:int,20160222:int,true,false,false);
+ C_14 := algebra.subselect(X_10,20160222:int,20160222:int,true,true,false);
X_18 := algebra.projection(C_14,X_10);
X_19 := aggr.count(X_18);
sql.resultSet("sys.L4","L3","bigint",64:int,0:int,7:int,X_19);
@@ -70,7 +70,7 @@ function user.s8_1():void;
X_0:void := querylog.define("explain select count(*) from tmp where i =
201602221;","default_pipe",7:int);
X_10 := bat.new(nil:int);
X_11:bat[:int] := batcalc.int(0:int,X_10,9:int,0:int);
- C_16 :=
algebra.subselect(X_11,201602221:int,201602221:int,true,false,false);
+ C_16 :=
algebra.subselect(X_11,201602221:int,201602221:int,true,true,false);
X_20 := algebra.projection(C_16,X_10);
X_21 := aggr.count(X_20);
sql.resultSet("sys.L4","L3","bigint",64:int,0:int,7:int,X_21);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
