Changeset: 91d31a41c28e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91d31a41c28e
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: Oct2014
Log Message:
Approved 32 bit output.
diffs (69 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
@@ -42,19 +42,19 @@ Ready.
function user.s5_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","t2564");
- X_6 := sql.bind(X_2,"sys","t2564","c3",0);
+ X_6:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c3",0);
(X_9,r1_9) := sql.bind(X_2,"sys","t2564","c3",2);
- X_12 := sql.bind(X_2,"sys","t2564","c3",1);
+ X_12:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c3",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","c1",0);
+ X_16:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c1",0);
(X_18,r1_18) := sql.bind(X_2,"sys","t2564","c1",2);
- X_20 := sql.bind(X_2,"sys","t2564","c1",1);
+ X_20:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c1",1);
X_21 := sql.delta(X_16,X_18,r1_18,X_20);
X_22 := algebra.leftfetchjoin(X_3,X_21);
- X_23 := sql.bind(X_2,"sys","t2564","c2",0);
+ X_23:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c2",0);
(X_25,r1_25) := sql.bind(X_2,"sys","t2564","c2",2);
- X_27 := sql.bind(X_2,"sys","t2564","c2",1);
+ X_27:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c2",1);
X_28 := sql.delta(X_23,X_25,r1_25,X_27);
X_29 := algebra.leftfetchjoin(X_3,X_28);
(X_30,r1_30,r2_30) := group.subgroup(X_29);
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
@@ -53,26 +53,26 @@ Operation successful
| function user.s3_1{autoCommit=true}():void; |
| X_3:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
| X_2 := sql.mvc(); |
-| X_9 := sql.bind(X_2,"sys","_tables","type",0); |
+| X_9:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
| X_6:bat[:oid,:oid] := sql.tid(X_2,"sys","_tables"); |
-| X_64 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true); |
+| X_62 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true); |
| (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-| X_65 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true); |
-| X_15 := sql.bind(X_2,"sys","_tables","type",1); |
-| X_66 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true); |
-| X_17 := sql.subdelta(X_64,X_6,X_12,X_65,X_66); |
-| X_18 := sql.bind(X_2,"sys","_tables","id",0); |
+| X_63 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true); |
+| X_15:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
+| X_64 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true); |
+| X_17 := sql.subdelta(X_62,X_6,X_12,X_63,X_64); |
+| X_18:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0); |
| (X_20,r1_25) := sql.bind(X_2,"sys","_tables","id",2); |
-| X_22 := sql.bind(X_2,"sys","_tables","id",1); |
+| X_22:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1); |
| X_23 := sql.projectdelta(X_17,X_18,X_20,r1_25,X_22); |
| X_24 := aggr.count(X_23); |
| X_25 := sql.single(X_24); |
| X_26 := bat.append(X_3,X_25,true); |
-| X_30 := sql.bind(X_2,"tmp","_tables","type",0); |
+| X_30:bat[:oid,:sht] := sql.bind(X_2,"tmp","_tables","type",0); |
| X_31 := X_30; |
| X_28:bat[:oid,:oid] := sql.tid(X_2,"tmp","_tables"); |
| X_32 := algebra.subselect(X_31,X_28,2:sht,2:sht,true,true,true); |
-| X_33 := sql.bind(X_2,"tmp","_tables","id",0); |
+| X_33:bat[:oid,:int] := sql.bind(X_2,"tmp","_tables","id",0); |
| X_36 := X_33; |
| X_37 := algebra.leftfetchjoin(X_32,X_36); |
| X_38 := aggr.count(X_37); |
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
