Changeset: 7d1c376e995f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d1c376e995f
Modified Files:
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: default
Log Message:
merge
diffs (88 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
@@ -29,14 +29,14 @@ Ready.
| | | | | project (
|
| | | | | | select (
|
| | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.type as p.type
] COUNT |
-| | | | | | ) [ p.type < smallint[tinyint "2"] ]
|
+| | | | | | ) [ p.type != smallint[tinyint "2"] ]
|
| | | | | ) [ p.id as tables.id ]
|
| | | | ) [ ] [ sys.count() NOT NULL as L1 ],
|
| | | | group by (
|
| | | | | project (
|
| | | | | | select (
|
| | | | | | | table(tmp._tables) [ _tables.id as t.id, _tables.type as t.type
] COUNT |
-| | | | | | ) [ t.type < smallint[tinyint "2"] ]
|
+| | | | | | ) [ t.type != smallint[tinyint "2"] ]
|
| | | | | ) [ t.id as tables.id ]
|
| | | | ) [ ] [ sys.count() NOT NULL as L1 ]
|
| | | ) [ L1 ]
|
@@ -47,41 +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_9 := sql.bind(X_2,"sys","_tables","type",0); |
| X_6:bat[:oid,:oid] := sql.tid(X_2,"sys","_tables"); |
-| X_65 := algebra.thetasubselect(X_9,X_6,2:sht,"<"); |
+| X_64 := 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_66 := algebra.thetasubselect(r1_12,2:sht,"<"); |
+| X_65 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true); |
| X_15 := sql.bind(X_2,"sys","_tables","type",1); |
-| X_67 := algebra.thetasubselect(X_15,X_6,2:sht,"<"); |
-| X_17 := sql.subdelta(X_65,X_12,X_66,X_67); |
-| X_19 := sql.bind(X_2,"sys","_tables","id",0); |
-| (X_21,r1_29) := sql.bind(X_2,"sys","_tables","id",2); |
-| X_23 := sql.bind(X_2,"sys","_tables","id",1); |
-| X_24 := sql.projectdelta(X_17,X_19,X_21,r1_29,X_23); |
-| X_25 := aggr.count(X_24); |
-| X_26 := sql.single(X_25); |
-| X_27 := bat.append(X_3,X_26,true); |
-| X_32 := sql.bind(X_2,"tmp","_tables","type",0); |
-| X_35 := X_32; |
-| X_29:bat[:oid,:oid] := sql.tid(X_2,"tmp","_tables"); |
-| X_36 := algebra.thetasubselect(X_35,X_29,2:sht,"<"); |
-| X_38 := sql.bind(X_2,"tmp","_tables","id",0); |
-| X_40 := X_38; |
-| X_41 := algebra.leftfetchjoin(X_36,X_40); |
-| X_42 := aggr.count(X_41); |
-| X_43 := bat.append(X_27,X_42,true); |
-| X_45 := algebra.selectNotNil(X_43); |
-| X_46:wrd := aggr.sum(X_45); |
-| sql.exportValue(1,".tables","L1","wrd",32,0,6,X_46,""); |
+| X_66 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true); |
+| X_17 := sql.subdelta(X_64,X_12,X_65,X_66); |
+| X_18 := sql.bind(X_2,"sys","_tables","id",0); |
+| (X_20,r1_28) := sql.bind(X_2,"sys","_tables","id",2); |
+| X_22 := sql.bind(X_2,"sys","_tables","id",1); |
+| X_23 := sql.projectdelta(X_17,X_18,X_20,r1_28,X_22); |
+| X_24 := aggr.count(X_23); |
+| X_25 := sql.single(X_24); |
+| X_26 := bat.append(X_3,X_25,true); |
+| X_31 := sql.bind(X_2,"tmp","_tables","type",0); |
+| X_34 := X_31; |
+| X_28:bat[:oid,:oid] := sql.tid(X_2,"tmp","_tables"); |
+| X_35 := algebra.subselect(X_34,X_28,2:sht,2:sht,true,true,true); |
+| X_36 := sql.bind(X_2,"tmp","_tables","id",0); |
+| X_38 := X_36; |
+| X_39 := algebra.leftfetchjoin(X_35,X_38); |
+| X_40 := aggr.count(X_39); |
+| X_41 := bat.append(X_26,X_40,true); |
+| X_43 := algebra.selectNotNil(X_41); |
+| X_44:wrd := aggr.sum(X_43); |
+| sql.exportValue(1,".tables","L1","wrd",32,0,6,X_44,""); |
| end s1_1; |
-+-------------------------------------------------------------+
++----------------------------------------------------------------------+
31 rows
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
