Changeset: f5c9fb68e5ab for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5c9fb68e5ab
Modified Files:
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: Feb2013
Log Message:
jdbc_no_debug.SF-1739356: fixed 32-bit output
diffs (87 lines):
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
@@ -47,53 +47,41 @@ 20 rows
Operation successful
-+---------------------------------------------------------------------+
++------------------------------------------------------------------------+
| mal |
-+=====================================================================+
++========================================================================+
| function user.s1_1{autoCommit=true}():void; |
| X_3:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
| X_2 := sql.mvc(); |
-| 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,""); |
+| X_6:bat[:oid,:oid] := sql.tid(X_2,"sys","_tables"); |
+| X_9 := sql.bind(X_2,"sys","_tables","type",0); |
+| (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
+| X_15 := sql.bind(X_2,"sys","_tables","type",1); |
+| X_17 := sql.delta(X_9,X_12,r1_12,X_15); |
+| X_18 := algebra.leftfetchjoin(X_6,X_17); |
+| X_19 := algebra.thetasubselect(X_18,2:sht,"<"); |
+| X_21 := sql.bind(X_2,"sys","_tables","id",0); |
+| (X_23,r1_29) := sql.bind(X_2,"sys","_tables","id",2); |
+| X_25 := sql.bind(X_2,"sys","_tables","id",1); |
+| X_26 := sql.delta(X_21,X_23,r1_29,X_25); |
+| X_27:bat[:oid,:int] := algebra.leftfetchjoinPath(X_19,X_6,X_26); |
+| X_28 := aggr.count(X_27); |
+| X_29 := sql.single(X_28); |
+| X_30 := bat.append(X_3,X_29,true); |
+| X_32:bat[:oid,:oid] := sql.tid(X_2,"tmp","_tables"); |
+| X_35 := sql.bind(X_2,"tmp","_tables","type",0); |
+| X_38 := algebra.leftfetchjoin(X_32,X_35); |
+| X_39 := algebra.thetasubselect(X_38,2:sht,"<"); |
+| X_41 := sql.bind(X_2,"tmp","_tables","id",0); |
+| X_43:bat[:oid,:int] := algebra.leftfetchjoinPath(X_39,X_32,X_41); |
+| X_44 := aggr.count(X_43); |
+| X_45 := bat.append(X_30,X_44,true); |
+| X_47 := algebra.selectNotNil(X_45); |
+| X_48:wrd := aggr.sum(X_47); |
+| sql.exportValue(1,".tables","L1","wrd",32,0,6,X_48,""); |
| end s1_1; |
-+---------------------------------------------------------------------+
-42 rows
++------------------------------------------------------------------------+
+30 rows
# 19:39:11 >
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
