Changeset: 784b70a8d73a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=784b70a8d73a
Modified Files:
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/mosaic/Tests/compression.stable.out
sql/test/mosaic/Tests/compressionRLE.stable.out
sql/test/mosaic/Tests/session_exit.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
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 820 to 300 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
@@ -49,18 +49,18 @@ function user.s2_1(A0:str):void;
X_52 := bat.append(X_45,0);
X_0 := sql.mvc();
X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
- X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
- X_64 := algebra.likesubselect(X_4,X_1,A0,"",false);
- (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
- X_65 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",false);
+ C_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ C_64 := algebra.likesubselect(X_4,C_1,A0,"",false);
+ (C_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ C_65 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",false);
X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
- X_67 := algebra.likesubselect(X_10,X_1,A0,"",false);
- X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67);
- X_20 := sql.projectdelta(X_17,X_4,X_7,r1_9,X_10);
+ C_67 := algebra.likesubselect(X_10,C_1,A0,"",false);
+ C_17 := sql.subdelta(C_64,C_1,C_7,C_65,C_67);
+ X_20 := sql.projectdelta(C_17,X_4,C_7,r1_9,X_10);
X_21:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
- (X_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
+ (C_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
X_25:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
- X_28 := sql.projectdelta(X_17,X_21,X_23,r1_25,X_25);
+ X_28 := sql.projectdelta(C_17,X_21,C_23,r1_25,X_25);
sql.resultSet(X_47,X_48,X_49,X_50,X_52,X_20,X_28);
end user.s2_1;
#explain select name,func from functions where name not like '%optimizers%';
@@ -87,18 +87,18 @@ function user.s3_1(A0:str):void;
X_52 := bat.append(X_45,0);
X_0 := sql.mvc();
X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
- X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
- X_64 := algebra.likesubselect(X_4,X_1,A0,"",true);
- (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
- X_65 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",true);
+ C_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ C_64 := algebra.likesubselect(X_4,C_1,A0,"",true);
+ (C_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ C_65 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",true);
X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
- X_67 := algebra.likesubselect(X_10,X_1,A0,"",true);
- X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67);
- X_20 := sql.projectdelta(X_17,X_4,X_7,r1_9,X_10);
+ C_67 := algebra.likesubselect(X_10,C_1,A0,"",true);
+ C_17 := sql.subdelta(C_64,C_1,C_7,C_65,C_67);
+ X_20 := sql.projectdelta(C_17,X_4,C_7,r1_9,X_10);
X_21:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
- (X_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
+ (C_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
X_25:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
- X_28 := sql.projectdelta(X_17,X_21,X_23,r1_25,X_25);
+ X_28 := sql.projectdelta(C_17,X_21,C_23,r1_25,X_25);
sql.resultSet(X_47,X_48,X_49,X_50,X_52,X_20,X_28);
end user.s3_1;
#explain select name,func from functions where name ilike '%optimizers%';
@@ -125,18 +125,18 @@ function user.s4_1(A0:str):void;
X_52 := bat.append(X_45,0);
X_0 := sql.mvc();
X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
- X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
- X_64 := algebra.ilikesubselect(X_4,X_1,A0,"",false);
- (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
- X_65 := algebra.ilikesubselect(r1_9,nil:bat[:oid],A0,"",false);
+ C_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ C_64 := algebra.ilikesubselect(X_4,C_1,A0,"",false);
+ (C_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ C_65 := algebra.ilikesubselect(r1_9,nil:bat[:oid],A0,"",false);
X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
- X_67 := algebra.ilikesubselect(X_10,X_1,A0,"",false);
- X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67);
- X_20 := sql.projectdelta(X_17,X_4,X_7,r1_9,X_10);
+ C_67 := algebra.ilikesubselect(X_10,C_1,A0,"",false);
+ C_17 := sql.subdelta(C_64,C_1,C_7,C_65,C_67);
+ X_20 := sql.projectdelta(C_17,X_4,C_7,r1_9,X_10);
X_21:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
- (X_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
+ (C_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
X_25:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
- X_28 := sql.projectdelta(X_17,X_21,X_23,r1_25,X_25);
+ X_28 := sql.projectdelta(C_17,X_21,C_23,r1_25,X_25);
sql.resultSet(X_47,X_48,X_49,X_50,X_52,X_20,X_28);
end user.s4_1;
#explain select name,func from functions where name not ilike '%optimizers%';
@@ -163,18 +163,18 @@ function user.s5_1(A0:str):void;
X_52 := bat.append(X_45,0);
X_0 := sql.mvc();
X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
- X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
- X_64 := algebra.ilikesubselect(X_4,X_1,A0,"",true);
- (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
- X_65 := algebra.ilikesubselect(r1_9,nil:bat[:oid],A0,"",true);
+ C_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ C_64 := algebra.ilikesubselect(X_4,C_1,A0,"",true);
+ (C_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ C_65 := algebra.ilikesubselect(r1_9,nil:bat[:oid],A0,"",true);
X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
- X_67 := algebra.ilikesubselect(X_10,X_1,A0,"",true);
- X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67);
- X_20 := sql.projectdelta(X_17,X_4,X_7,r1_9,X_10);
+ C_67 := algebra.ilikesubselect(X_10,C_1,A0,"",true);
+ C_17 := sql.subdelta(C_64,C_1,C_7,C_65,C_67);
+ X_20 := sql.projectdelta(C_17,X_4,C_7,r1_9,X_10);
X_21:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
- (X_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
+ (C_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
X_25:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
- X_28 := sql.projectdelta(X_17,X_21,X_23,r1_25,X_25);
+ X_28 := sql.projectdelta(C_17,X_21,C_23,r1_25,X_25);
sql.resultSet(X_47,X_48,X_49,X_50,X_52,X_20,X_28);
end user.s5_1;
#create function contains(str string, substr string)
@@ -221,20 +221,20 @@ function user.s10_1(A0:str):void;
X_55 := bat.append(X_48,0);
X_0 := sql.mvc();
X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
- X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ C_1:bat[:oid] := sql.tid(X_0,"sys","functions");
X_72:str := calc.+("%",A0);
X_74:str := calc.+(X_72,"%");
- X_111 := algebra.likesubselect(X_4,X_1,X_74,"",false,false);
- (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
- X_112 := algebra.likesubselect(r1_9,nil:bat[:oid],X_74,"",false,false);
+ C_111 := algebra.likesubselect(X_4,C_1,X_74,"",false,false);
+ (C_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ C_112 := algebra.likesubselect(r1_9,nil:bat[:oid],X_74,"",false,false);
X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
- X_114 := algebra.likesubselect(X_10,X_1,X_74,"",false,false);
- X_20 := sql.subdelta(X_111,X_1,X_7,X_112,X_114);
- X_23 := sql.projectdelta(X_20,X_4,X_7,r1_9,X_10);
+ C_114 := algebra.likesubselect(X_10,C_1,X_74,"",false,false);
+ C_20 := sql.subdelta(C_111,C_1,C_7,C_112,C_114);
+ X_23 := sql.projectdelta(C_20,X_4,C_7,r1_9,X_10);
X_24:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
- (X_26,r1_28) := sql.bind(X_0,"sys","functions","func",2);
+ (C_26,r1_28) := sql.bind(X_0,"sys","functions","func",2);
X_28:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
- X_31 := sql.projectdelta(X_20,X_24,X_26,r1_28,X_28);
+ X_31 := sql.projectdelta(C_20,X_24,C_26,r1_28,X_28);
sql.resultSet(X_50,X_51,X_52,X_53,X_55,X_23,X_31);
end user.s10_1;
#explain select name,func from functions where not_contains(name,
'optimizers');
@@ -261,20 +261,20 @@ function user.s11_1(A0:str):void;
X_55 := bat.append(X_48,0);
X_0 := sql.mvc();
X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
- X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ C_1:bat[:oid] := sql.tid(X_0,"sys","functions");
X_72:str := calc.+("%",A0);
X_74:str := calc.+(X_72,"%");
- X_111 := algebra.likesubselect(X_4,X_1,X_74,"",false,true);
- (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
- X_112 := algebra.likesubselect(r1_9,nil:bat[:oid],X_74,"",false,true);
+ C_111 := algebra.likesubselect(X_4,C_1,X_74,"",false,true);
+ (C_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ C_112 := algebra.likesubselect(r1_9,nil:bat[:oid],X_74,"",false,true);
X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
- X_114 := algebra.likesubselect(X_10,X_1,X_74,"",false,true);
- X_20 := sql.subdelta(X_111,X_1,X_7,X_112,X_114);
- X_23 := sql.projectdelta(X_20,X_4,X_7,r1_9,X_10);
+ C_114 := algebra.likesubselect(X_10,C_1,X_74,"",false,true);
+ C_20 := sql.subdelta(C_111,C_1,C_7,C_112,C_114);
+ X_23 := sql.projectdelta(C_20,X_4,C_7,r1_9,X_10);
X_24:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
- (X_26,r1_28) := sql.bind(X_0,"sys","functions","func",2);
+ (C_26,r1_28) := sql.bind(X_0,"sys","functions","func",2);
X_28:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
- X_31 := sql.projectdelta(X_20,X_24,X_26,r1_28,X_28);
+ X_31 := sql.projectdelta(C_20,X_24,C_26,r1_28,X_28);
sql.resultSet(X_50,X_51,X_52,X_53,X_55,X_23,X_31);
end user.s11_1;
#explain select name,func from functions where icontains(name, 'optimizers');
@@ -301,20 +301,20 @@ function user.s12_1(A0:str):void;
X_55 := bat.append(X_48,0);
X_0 := sql.mvc();
X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
- X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ C_1:bat[:oid] := sql.tid(X_0,"sys","functions");
X_72:str := calc.+("%",A0);
X_74:str := calc.+(X_72,"%");
- X_111 := algebra.likesubselect(X_4,X_1,X_74,"",true,false);
- (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
- X_112 := algebra.likesubselect(r1_9,nil:bat[:oid],X_74,"",true,false);
+ C_111 := algebra.likesubselect(X_4,C_1,X_74,"",true,false);
+ (C_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ C_112 := algebra.likesubselect(r1_9,nil:bat[:oid],X_74,"",true,false);
X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
- X_114 := algebra.likesubselect(X_10,X_1,X_74,"",true,false);
- X_20 := sql.subdelta(X_111,X_1,X_7,X_112,X_114);
- X_23 := sql.projectdelta(X_20,X_4,X_7,r1_9,X_10);
+ C_114 := algebra.likesubselect(X_10,C_1,X_74,"",true,false);
+ C_20 := sql.subdelta(C_111,C_1,C_7,C_112,C_114);
+ X_23 := sql.projectdelta(C_20,X_4,C_7,r1_9,X_10);
X_24:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
- (X_26,r1_28) := sql.bind(X_0,"sys","functions","func",2);
+ (C_26,r1_28) := sql.bind(X_0,"sys","functions","func",2);
X_28:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
- X_31 := sql.projectdelta(X_20,X_24,X_26,r1_28,X_28);
+ X_31 := sql.projectdelta(C_20,X_24,C_26,r1_28,X_28);
sql.resultSet(X_50,X_51,X_52,X_53,X_55,X_23,X_31);
end user.s12_1;
#explain select name,func from functions where not_icontains(name,
'optimizers');
@@ -341,20 +341,20 @@ function user.s13_1(A0:str):void;
X_55 := bat.append(X_48,0);
X_0 := sql.mvc();
X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
- X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ C_1:bat[:oid] := sql.tid(X_0,"sys","functions");
X_72:str := calc.+("%",A0);
X_74:str := calc.+(X_72,"%");
- X_111 := algebra.likesubselect(X_4,X_1,X_74,"",true,true);
- (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
- X_112 := algebra.likesubselect(r1_9,nil:bat[:oid],X_74,"",true,true);
+ C_111 := algebra.likesubselect(X_4,C_1,X_74,"",true,true);
+ (C_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ C_112 := algebra.likesubselect(r1_9,nil:bat[:oid],X_74,"",true,true);
X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
- X_114 := algebra.likesubselect(X_10,X_1,X_74,"",true,true);
- X_20 := sql.subdelta(X_111,X_1,X_7,X_112,X_114);
- X_23 := sql.projectdelta(X_20,X_4,X_7,r1_9,X_10);
+ C_114 := algebra.likesubselect(X_10,C_1,X_74,"",true,true);
+ C_20 := sql.subdelta(C_111,C_1,C_7,C_112,C_114);
+ X_23 := sql.projectdelta(C_20,X_4,C_7,r1_9,X_10);
X_24:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
- (X_26,r1_28) := sql.bind(X_0,"sys","functions","func",2);
+ (C_26,r1_28) := sql.bind(X_0,"sys","functions","func",2);
X_28:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
- X_31 := sql.projectdelta(X_20,X_24,X_26,r1_28,X_28);
+ X_31 := sql.projectdelta(C_20,X_24,C_26,r1_28,X_28);
sql.resultSet(X_50,X_51,X_52,X_53,X_55,X_23,X_31);
end user.s13_1;
#rollback;
diff --git a/sql/test/mosaic/Tests/compression.stable.out
b/sql/test/mosaic/Tests/compression.stable.out
--- a/sql/test/mosaic/Tests/compression.stable.out
+++ b/sql/test/mosaic/Tests/compression.stable.out
@@ -73,15 +73,15 @@ function user.s5_1():void;
X_47 := bat.append(X_39,0);
X_55 := bat.append(X_47,0);
X_0 := sql.mvc();
- X_1:bat[:oid] := sql.tid(X_0,"sys","tmp3");
+ C_1:bat[:oid] := sql.tid(X_0,"sys","tmp3");
X_4:bat[:int] := sql.bind(X_0,"sys","tmp3","i",0);
- X_7 := mosaic.projection(X_1,X_4);
+ X_7 := mosaic.projection(C_1,X_4);
X_8:bat[:bit] := sql.bind(X_0,"sys","tmp3","b",0);
- X_10 := mosaic.projection(X_1,X_8);
+ X_10 := mosaic.projection(C_1,X_8);
X_11:bat[:flt] := sql.bind(X_0,"sys","tmp3","f",0);
- X_13 := mosaic.projection(X_1,X_11);
+ X_13 := mosaic.projection(C_1,X_11);
X_14:bat[:timestamp] := sql.bind(X_0,"sys","tmp3","t",0);
- X_16 := mosaic.projection(X_1,X_14);
+ X_16 := mosaic.projection(C_1,X_14);
sql.resultSet(X_48,X_49,X_51,X_53,X_55,X_7,X_10,X_13,X_16);
end user.s5_1;
#select * from tmp3;
@@ -223,15 +223,15 @@ function user.s11_1():void;
X_47 := bat.append(X_39,0);
X_55 := bat.append(X_47,0);
X_0 := sql.mvc();
- X_1:bat[:oid] := sql.tid(X_0,"sys","tmp3");
+ C_1:bat[:oid] := sql.tid(X_0,"sys","tmp3");
X_4:bat[:int] := sql.bind(X_0,"sys","tmp3","i",0);
- X_7 := mosaic.projection(X_1,X_4);
+ X_7 := mosaic.projection(C_1,X_4);
X_8:bat[:bit] := sql.bind(X_0,"sys","tmp3","b",0);
- X_10 := mosaic.projection(X_1,X_8);
+ X_10 := mosaic.projection(C_1,X_8);
X_11:bat[:flt] := sql.bind(X_0,"sys","tmp3","f",0);
- X_13 := mosaic.projection(X_1,X_11);
+ X_13 := mosaic.projection(C_1,X_11);
X_14:bat[:timestamp] := sql.bind(X_0,"sys","tmp3","t",0);
- X_16 := mosaic.projection(X_1,X_14);
+ X_16 := mosaic.projection(C_1,X_14);
sql.resultSet(X_48,X_49,X_51,X_53,X_55,X_7,X_10,X_13,X_16);
end user.s11_1;
#inline actions= 0 time=1 usec
@@ -400,15 +400,15 @@ function user.s18_1():void;
X_47 := bat.append(X_39,0);
X_55 := bat.append(X_47,0);
X_0 := sql.mvc();
- X_1:bat[:oid] := sql.tid(X_0,"sys","tmp3");
+ C_1:bat[:oid] := sql.tid(X_0,"sys","tmp3");
X_4:bat[:int] := sql.bind(X_0,"sys","tmp3","i",0);
- X_7 := mosaic.projection(X_1,X_4);
+ X_7 := mosaic.projection(C_1,X_4);
X_8:bat[:bit] := sql.bind(X_0,"sys","tmp3","b",0);
- X_10 := mosaic.projection(X_1,X_8);
+ X_10 := mosaic.projection(C_1,X_8);
X_11:bat[:flt] := sql.bind(X_0,"sys","tmp3","f",0);
- X_13 := mosaic.projection(X_1,X_11);
+ X_13 := mosaic.projection(C_1,X_11);
X_14:bat[:timestamp] := sql.bind(X_0,"sys","tmp3","t",0);
- X_16 := mosaic.projection(X_1,X_14);
+ X_16 := mosaic.projection(C_1,X_14);
sql.resultSet(X_48,X_49,X_51,X_53,X_55,X_7,X_10,X_13,X_16);
end user.s18_1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
