Changeset: 991ef6feaf17 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=991ef6feaf17
Modified Files:
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
Branch: default
Log Message:

Merge with Jan2014 branch.


diffs (45 lines):

diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single 
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
@@ -48,28 +48,21 @@ Ready.
 function user.s2_1():void;
     X_1 := sql.mvc();
     X_2:bat[:oid,:oid]  := sql.tid(X_1,"sys","treeitems");
-    X_5 := sql.bind(X_1,"sys","treeitems","subject",0);
+    X_5 := sql.bind(X_1,"sys","treeitems","pre",0);
     X_8 := algebra.leftfetchjoin(X_2,X_5);
-    (X_9,r1_12) := algebra.crossproduct(X_8,X_8);
-    X_11 := sql.bind(X_1,"sys","treeitems","pre",0);
-    X_13 := algebra.leftfetchjoin(X_2,X_11);
-    X_14 := algebra.leftfetchjoin(r1_12,X_13);
-    X_15 := algebra.leftfetchjoin(X_9,X_13);
-    X_25:bat[:oid,:bit]  := batcalc.>=(X_14,X_15);
-    X_16 := sql.bind(X_1,"sys","treeitems","size",0);
+    X_9 := sql.bind(X_1,"sys","treeitems","size",0);
+    X_11 := algebra.leftfetchjoin(X_2,X_9);
+    X_12:bat[:oid,:lng]  := batcalc.+(X_8,X_11);
+    (X_13,r1_18) := algebra.join(X_8,X_8,X_12,true,true);
+    X_16 := sql.bind(X_1,"sys","treeitems","subject",0);
     X_18 := algebra.leftfetchjoin(X_2,X_16);
-    X_19:bat[:oid,:lng]  := batcalc.+(X_13,X_18);
-    X_20 := algebra.leftfetchjoin(X_9,X_19);
-    X_21:bat[:oid,:bit]  := batcalc.<=(X_14,X_20);
-    X_22 := algebra.subselect(X_21,true,true,true,true,false);
-    X_26 := algebra.subselect(X_25,X_22,true,true,true,true,false);
-    X_27:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_26,X_9,X_8);
-    X_28:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_26,r1_12,X_8);
-    X_29 := sql.resultSet(2,1,X_27);
-    sql.rsColumn(X_29,"sys.L","id1","int",32,0,X_27);
-    sql.rsColumn(X_29,"sys.L","id2","int",32,0,X_28);
-    X_40 := io.stdout();
-    sql.exportResult(X_40,X_29);
+    X_19 := algebra.leftfetchjoin(r1_18,X_18);
+    X_20 := algebra.leftfetchjoin(X_13,X_18);
+    X_21 := sql.resultSet(2,1,X_19);
+    sql.rsColumn(X_21,"sys.L","id1","int",32,0,X_19);
+    sql.rsColumn(X_21,"sys.L","id2","int",32,0,X_20);
+    X_31 := io.stdout();
+    sql.exportResult(X_31,X_21);
 end s2_1;
 # querylog.define("explain\nselect t1.subject as id1, t2.subject as id2\nfrom  
treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre + 
t1.size;","default_pipe")
 #ROLLBACK;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to