Changeset: 7be96362112a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7be96362112a
Modified Files:
        
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
Branch: default
Log Message:

Merge from Feb2013 branch.


diffs (67 lines):

diff --git 
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
 
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
--- 
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
+++ 
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
@@ -38,39 +38,33 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 63 # length
+% 65 # length
 function user.s2_1{autoCommit=true}():void;
     X_2 := sql.mvc();
-    X_3:bat[:oid,:int]  := sql.bind(X_2,"sys","t2564","c2",0);
-    X_8:bat[:oid,:int]  := sql.bind(X_2,"sys","t2564","c2",2);
-    X_10 := algebra.kdifference(X_3,X_8);
-    X_11 := algebra.kunion(X_10,X_8);
-    X_12:bat[:oid,:int]  := sql.bind(X_2,"sys","t2564","c2",1);
-    X_14 := algebra.kunion(X_11,X_12);
-    X_15:bat[:oid,:oid]  := sql.bind_dbat(X_2,"sys","t2564",1);
-    X_16 := bat.reverse(X_15);
-    X_17 := algebra.kdifference(X_14,X_16);
-    X_18:bat[:oid,:int]  := sql.bind(X_2,"sys","t2564","c3",0);
-    X_20:bat[:oid,:int]  := sql.bind(X_2,"sys","t2564","c3",2);
-    X_21 := algebra.kdifference(X_18,X_20);
-    X_22 := algebra.kunion(X_21,X_20);
-    X_23:bat[:oid,:int]  := sql.bind(X_2,"sys","t2564","c3",1);
-    X_24 := algebra.kunion(X_22,X_23);
-    X_25 := algebra.kdifference(X_24,X_16);
-    X_26:bat[:oid,:int]  := sql.bind(X_2,"sys","t2564","c1",0);
-    X_31:bat[:oid,:int]  := sql.bind(X_2,"sys","t2564","c1",2);
-    X_33 := algebra.kdifference(X_26,X_31);
-    X_34 := algebra.kunion(X_33,X_31);
-    X_35:bat[:oid,:int]  := sql.bind(X_2,"sys","t2564","c1",1);
-    X_37 := algebra.kunion(X_34,X_35);
-    X_38 := algebra.kdifference(X_37,X_16);
-    (ext57,grp55) := group.multicolumns(X_17,X_25,X_38);
-    X_41 := bat.mirror(ext57);
-    X_42:bat[:oid,:wrd]  := aggr.count(grp55,grp55,X_41);
-    X_44 := sql.resultSet(1,1,X_42);
-    sql.rsColumn(X_44,"sys.t2564","L1","wrd",32,0,X_42);
+    X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","t2564");
+    X_6 := sql.bind(X_2,"sys","t2564","c1",0);
+    (X_9,r1_9) := sql.bind(X_2,"sys","t2564","c1",2);
+    X_12 := sql.bind(X_2,"sys","t2564","c1",1);
+    X_14 := sql.delta(X_6,X_9,r1_9,X_12);
+    X_15 := algebra.leftfetchjoin(X_3,X_14);
+    X_16 := sql.bind(X_2,"sys","t2564","c3",0);
+    (X_18,r1_20) := sql.bind(X_2,"sys","t2564","c3",2);
+    X_20 := sql.bind(X_2,"sys","t2564","c3",1);
+    X_21 := sql.delta(X_16,X_18,r1_20,X_20);
+    X_22 := algebra.leftfetchjoin(X_3,X_21);
+    X_23 := sql.bind(X_2,"sys","t2564","c2",0);
+    (X_25,r1_29) := sql.bind(X_2,"sys","t2564","c2",2);
+    X_27 := sql.bind(X_2,"sys","t2564","c2",1);
+    X_28 := sql.delta(X_23,X_25,r1_29,X_27);
+    X_29 := algebra.leftfetchjoin(X_3,X_28);
+    (X_30,r1_36,r2_36) := group.subgroup(X_29);
+    (X_33,r1_39,r2_39) := group.subgroup(X_22,X_30);
+    (X_36,r1_42,r2_42) := group.subgroupdone(X_15,X_33);
+    X_39:bat[:oid,:wrd]  := aggr.subcount(X_36,X_36,r1_42,false);
+    X_42 := sql.resultSet(1,1,X_39);
+    sql.rsColumn(X_42,"sys.t2564","L1","wrd",32,0,X_39);
     X_49 := io.stdout();
-    sql.exportResult(X_49,X_44);
+    sql.exportResult(X_49,X_42);
 end s2_1;
 #select count(*) from t2564 group by c1, c2, c3;
 % sys.t2564 # table_name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to