Changeset: 2bb73b0f666b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2bb73b0f666b
Modified Files:
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: default
Log Message:
Merge with Jul2012 branch.
diffs (158 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
@@ -41,36 +41,36 @@ Ready.
% 63 # length
function user.s4_1{autoCommit=true}():void;
X_2 := sql.mvc();
- X_30:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c2",0);
- X_29:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c2",2);
- X_32 := algebra.kdifference(X_30,X_29);
- X_33 := algebra.kunion(X_32,X_29);
- X_28:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c2",1);
- X_34 := algebra.kunion(X_33,X_28);
- X_5:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","t2564",1);
- X_8 := bat.reverse(X_5);
- X_35 := algebra.kdifference(X_34,X_8);
- X_21:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c3",0);
+ 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_22 := algebra.kdifference(X_21,X_20);
- X_23 := algebra.kunion(X_22,X_20);
- X_19:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c3",1);
- X_24 := algebra.kunion(X_23,X_19);
- X_25 := algebra.kdifference(X_24,X_8);
- X_12:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c1",0);
- X_10:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c1",2);
- X_14 := algebra.kdifference(X_12,X_10);
- X_15 := algebra.kunion(X_14,X_10);
- X_9:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c1",1);
- X_16 := algebra.kunion(X_15,X_9);
- X_17 := algebra.kdifference(X_16,X_8);
- (ext59,grp57) := group.multicolumns(X_35,X_25,X_17);
- X_38 := bat.mirror(ext59);
- X_39:bat[:oid,:wrd] := aggr.count(grp57,grp57,X_38);
- X_40 := sql.resultSet(1,1,X_39);
- sql.rsColumn(X_40,"sys.t2564","L1":str,"wrd",32,0,X_39);
- X_48 := io.stdout();
- sql.exportResult(X_48,X_40);
+ 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_49 := io.stdout();
+ sql.exportResult(X_49,X_44);
end s4_1;
#select count(*) from t2564 group by c1, c2, c3;
% sys.t2564 # table_name
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -77,46 +77,46 @@ Operation successful
| mal |
+=====================================================================+
| function user.s2_1{autoCommit=true}():void; |
-| X_51:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
+| X_3:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
| X_2 := sql.mvc(); |
-| X_40:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
-| X_41 := algebra.thetauselect(X_40,2:sht,"<"); |
-| X_38:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",2); |
-| X_42 := algebra.kdifference(X_41,X_38); |
-| X_39 := algebra.thetauselect(X_38,2:sht,"<"); |
-| X_43 := algebra.kunion(X_42,X_39); |
-| X_35:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
-| X_36 := algebra.thetauselect(X_35,2:sht,"<"); |
-| X_44 := algebra.kunion(X_43,X_36); |
-| X_32:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","_tables",1); |
-| X_34 := bat.reverse(X_32); |
-| X_45 := algebra.kdifference(X_44,X_34); |
-| X_46 := algebra.markT(X_45,0@0:oid); |
-| X_47 := bat.reverse(X_46); |
-| X_25:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0); |
-| X_23:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",2); |
-| X_28 := algebra.kdifference(X_25,X_23); |
-| X_29 := algebra.kunion(X_28,X_23); |
-| X_20:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1); |
-| X_30 := algebra.kunion(X_29,X_20); |
-| X_48 := algebra.leftjoin(X_47,X_30); |
-| X_49 := aggr.count(X_48); |
-| X_50 := sql.single(X_49); |
-| X_54 := bat.append(X_51,X_50,true); |
-| X_12:bat[:oid,:sht] := sql.bind(X_2,"tmp","_tables","type",0); |
-| X_13 := algebra.thetauselect(X_12,2:sht,"<"); |
-| X_9:bat[:oid,:oid] := sql.bind_dbat(X_2,"tmp","_tables",1); |
-| X_11 := bat.reverse(X_9); |
-| X_15 := algebra.kdifference(X_13,X_11); |
-| X_16 := algebra.markT(X_15,0@0:oid); |
-| X_17 := bat.reverse(X_16); |
-| X_4:bat[:oid,:int] := sql.bind(X_2,"tmp","_tables","id",0); |
-| X_18 := algebra.leftjoin(X_17,X_4); |
-| X_19 := aggr.count(X_18); |
-| X_56 := bat.append(X_54,X_19,true); |
-| X_57 := algebra.selectNotNil(X_56); |
-| X_58:wrd := aggr.sum(X_57); |
-| sql.exportValue(1,".tables","L1":str,"wrd",32,0,6,X_58,""); |
+| X_6:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
+| X_11 := algebra.thetauselect(X_6,2:sht,"<"); |
+| X_13:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",2); |
+| X_15 := algebra.kdifference(X_11,X_13); |
+| X_16 := algebra.thetauselect(X_13,2:sht,"<"); |
+| X_17 := algebra.kunion(X_15,X_16); |
+| X_18:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
+| X_20 := algebra.thetauselect(X_18,2:sht,"<"); |
+| X_21 := algebra.kunion(X_17,X_20); |
+| X_22:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","_tables",1); |
+| X_23 := bat.reverse(X_22); |
+| X_24 := algebra.kdifference(X_21,X_23); |
+| X_25 := algebra.markT(X_24,0@0:oid); |
+| X_26 := bat.reverse(X_25); |
+| X_27:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0); |
+| X_29:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",2); |
+| X_30 := algebra.kdifference(X_27,X_29); |
+| X_31 := algebra.kunion(X_30,X_29); |
+| X_32:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1); |
+| X_35 := algebra.kunion(X_31,X_32); |
+| X_36 := algebra.leftjoin(X_26,X_35); |
+| X_37 := aggr.count(X_36); |
+| X_38 := sql.single(X_37); |
+| X_39 := bat.append(X_3,X_38,true); |
+| X_41:bat[:oid,:sht] := sql.bind(X_2,"tmp","_tables","type",0); |
+| X_45 := algebra.thetauselect(X_41,2:sht,"<"); |
+| X_47:bat[:oid,:oid] := sql.bind_dbat(X_2,"tmp","_tables",1); |
+| X_49 := bat.reverse(X_47); |
+| X_50 := algebra.kdifference(X_45,X_49); |
+| X_51 := algebra.markT(X_50,0@0:oid); |
+| X_52 := bat.reverse(X_51); |
+| X_53:bat[:oid,:int] := sql.bind(X_2,"tmp","_tables","id",0); |
+| X_56 := algebra.leftjoin(X_52,X_53); |
+| X_57 := aggr.count(X_56); |
+| X_59 := bat.append(X_39,X_57,true); |
+| X_61 := algebra.selectNotNil(X_59); |
+| X_62:wrd := aggr.sum(X_61); |
+| sql.exportValue(1,".tables","L1","wrd",32,0,6,X_62,""); |
| end s2_1; |
+---------------------------------------------------------------------+
42 rows
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
