Changeset: 7a27566f1dda for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a27566f1dda
Modified Files:
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: Jul2015
Log Message:
Approvals.
diffs (264 lines):
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -27,44 +27,40 @@ Operation successful
| mal |
+======================================================================================================+
| function user.s2_1{autoCommit=true}():void;
|
-| X_54:void := querylog.define("explain select \"name\" from
\"tables\"\n;","sequential_pipe",37); |
+| X_50:void := querylog.define("explain select \"name\" from
\"tables\"\n;","sequential_pipe",33); |
+| X_33 := bat.new(nil:oid,nil:str);
|
+| X_41 := bat.append(X_33,".tables");
|
+| X_36 := bat.new(nil:oid,nil:str);
|
+| X_43 := bat.append(X_36,"name");
|
| X_37 := bat.new(nil:oid,nil:str);
|
-| X_45 := bat.append(X_37,".tables");
|
-| X_40 := bat.new(nil:oid,nil:str);
|
-| X_47 := bat.append(X_40,"name");
|
-| X_41 := bat.new(nil:oid,nil:str);
|
-| X_48 := bat.append(X_41,"varchar");
|
-| X_42 := bat.new(nil:oid,nil:int);
|
-| X_50 := bat.append(X_42,1024);
|
-| X_44 := bat.new(nil:oid,nil:int);
|
-| X_52 := bat.append(X_44,0);
|
+| X_44 := bat.append(X_37,"varchar");
|
+| X_38 := bat.new(nil:oid,nil:int);
|
+| X_46 := bat.append(X_38,1024);
|
+| X_40 := bat.new(nil:oid,nil:int);
|
+| X_48 := bat.append(X_40,0);
|
| X_3:bat[:oid,:str] := bat.new(nil:oid,nil:str); |
| X_2 := sql.mvc(); |
| 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_68 := algebra.subselect(X_9,X_6,2,2,true,true,true);
|
+| X_64 := algebra.subselect(X_9,X_6,2,2,true,true,true);
|
| (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-| X_69 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);
|
+| X_65 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);
|
| X_15:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1);
|
-| X_71 := algebra.subselect(X_15,X_6,2,2,true,true,true);
|
-| X_18 := sql.subdelta(X_68,X_6,X_12,X_69,X_71);
|
+| X_67 := algebra.subselect(X_15,X_6,2,2,true,true,true);
|
+| X_18 := sql.subdelta(X_64,X_6,X_12,X_65,X_67);
|
| X_19:bat[:oid,:str] := sql.bind(X_2,"sys","_tables","name",0);
|
| (X_21,r1_24) := sql.bind(X_2,"sys","_tables","name",2);
|
| X_23:bat[:oid,:str] := sql.bind(X_2,"sys","_tables","name",1);
|
| X_24 := sql.projectdelta(X_18,X_19,X_21,r1_24,X_23);
|
| X_25 := bat.append(X_3,X_24,true);
|
-| X_28:bat[:oid,:sht] := sql.bind(X_2,"tmp","_tables","type",0);
|
-| X_29 := X_28;
|
| X_26:bat[:oid,:oid] := sql.tid(X_2,"tmp","_tables");
|
-| X_30 := algebra.subselect(X_29,X_26,2,2,true,true,true);
|
-| X_32:bat[:oid,:str] := sql.bind(X_2,"tmp","_tables","name",0);
|
-| X_33 := X_32;
|
-| X_34 := algebra.leftfetchjoin(X_30,X_33);
|
-| X_35 := bat.append(X_25,X_34,true);
|
-| sql.resultSet(X_45,X_47,X_48,X_50,X_52,X_35);
|
+| X_28:bat[:oid,:str] := sql.bind(X_2,"tmp","_tables","name",0);
|
+| X_29 := algebra.leftfetchjoin(X_26,X_28);
|
+| X_30 := bat.append(X_25,X_29,true);
|
+| sql.resultSet(X_41,X_43,X_44,X_46,X_48,X_30);
|
| end user.s2_1;
|
+------------------------------------------------------------------------------------------------------+
-37 rows
+33 rows
# 15:15:37 >
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -19,31 +19,29 @@ Ready.
-+--------------------------------------------------------------------------------------+
++--------------------------------------------------------------------+
| rel
|
-+======================================================================================+
++====================================================================+
| project (
|
| | group by (
|
| | | union (
|
| | | | group by (
|
| | | | | project (
|
| | | | | | select (
|
-| | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.type as p.type
] COUNT |
-| | | | | | ) [ p.type != smallint "2" ]
|
-| | | | | ) [ p.id as tables.id ]
|
+| | | | | | | table(sys._tables) [ _tables.id, _tables.type ] COUNT |
+| | | | | | ) [ _tables.type != smallint "2" ] |
+| | | | | ) [ _tables.id as tables.id ] |
| | | | ) [ ] [ sys.count() NOT NULL as L3.L3 ],
|
| | | | group by (
|
| | | | | project (
|
-| | | | | | select (
|
-| | | | | | | table(tmp._tables) [ _tables.id as t.id, _tables.type as t.type
] COUNT |
-| | | | | | ) [ t.type != smallint "2" ]
|
-| | | | | ) [ t.id as tables.id ]
|
+| | | | | | table(tmp._tables) [ _tables.id ] COUNT |
+| | | | | ) [ _tables.id as tables.id ] |
| | | | ) [ ] [ sys.count() NOT NULL as L3.L3 ]
|
| | | ) [ L3.L3 ]
|
| | ) [ ] [ sys.sum no nil (L3.L3) as L3.L3 ]
|
| ) [ L3 NOT NULL as L3.L3 ]
|
-+--------------------------------------------------------------------------------------+
-20 rows
++--------------------------------------------------------------------+
+18 rows
Operation successful
@@ -51,17 +49,17 @@ Operation successful
| mal |
+==================================================================================================+
| function user.s3_1{autoCommit=true}():void; |
-| X_48:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",31); |
+| X_43:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",27); |
| X_3:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
| X_2 := sql.mvc(); |
| 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_62 := algebra.subselect(X_9,X_6,2,2,true,true,true);
|
+| X_57 := algebra.subselect(X_9,X_6,2,2,true,true,true);
|
| (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-| X_63 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);
|
+| X_58 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);
|
| X_15:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1);
|
-| X_65 := algebra.subselect(X_15,X_6,2,2,true,true,true);
|
-| X_18 := sql.subdelta(X_62,X_6,X_12,X_63,X_65);
|
+| X_60 := algebra.subselect(X_15,X_6,2,2,true,true,true);
|
+| X_18 := sql.subdelta(X_57,X_6,X_12,X_58,X_60);
|
| X_19:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0);
|
| (X_21,r1_24) := sql.bind(X_2,"sys","_tables","id",2);
|
| X_23:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1);
|
@@ -69,20 +67,16 @@ Operation successful
| X_25 := aggr.count(X_24);
|
| X_26 := sql.single(X_25);
|
| X_27 := bat.append(X_3,X_26,true);
|
-| 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,2,true,true,true);
|
-| X_34:bat[:oid,:int] := sql.bind(X_2,"tmp","_tables","id",0);
|
-| X_36 := X_34;
|
-| X_37 := algebra.leftfetchjoin(X_32,X_36); |
-| X_38 := aggr.count(X_37); |
-| X_39 := bat.append(X_27,X_38,true);
|
-| X_40:wrd := aggr.sum(X_39); |
-| sql.resultSet(".L3","L3","wrd",64,0,7,X_40);
|
+| X_30:bat[:oid,:int] := sql.bind(X_2,"tmp","_tables","id",0);
|
+| X_31 := algebra.leftfetchjoin(X_28,X_30);
|
+| X_32 := aggr.count(X_31);
|
+| X_33 := bat.append(X_27,X_32,true);
|
+| X_35:wrd := aggr.sum(X_33);
|
+| sql.resultSet(".L3","L3","wrd",64,0,7,X_35);
|
| end user.s3_1;
|
+--------------------------------------------------------------------------------------------------+
-31 rows
+27 rows
# 19:39:11 >
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
@@ -19,31 +19,29 @@ Ready.
-+--------------------------------------------------------------------------------------+
++--------------------------------------------------------------------+
| rel
|
-+======================================================================================+
++====================================================================+
| project (
|
| | group by (
|
| | | union (
|
| | | | group by (
|
| | | | | project (
|
| | | | | | select (
|
-| | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.type as p.type
] COUNT |
-| | | | | | ) [ p.type != smallint "2" ]
|
-| | | | | ) [ p.id as tables.id ]
|
+| | | | | | | table(sys._tables) [ _tables.id, _tables.type ] COUNT |
+| | | | | | ) [ _tables.type != smallint "2" ] |
+| | | | | ) [ _tables.id as tables.id ] |
| | | | ) [ ] [ sys.count() NOT NULL as L3.L3 ],
|
| | | | group by (
|
| | | | | project (
|
-| | | | | | select (
|
-| | | | | | | table(tmp._tables) [ _tables.id as t.id, _tables.type as t.type
] COUNT |
-| | | | | | ) [ t.type != smallint "2" ]
|
-| | | | | ) [ t.id as tables.id ]
|
+| | | | | | table(tmp._tables) [ _tables.id ] COUNT |
+| | | | | ) [ _tables.id as tables.id ] |
| | | | ) [ ] [ sys.count() NOT NULL as L3.L3 ]
|
| | | ) [ L3.L3 ]
|
| | ) [ ] [ sys.sum no nil (L3.L3) as L3.L3 ]
|
| ) [ L3 NOT NULL as L3.L3 ]
|
-+--------------------------------------------------------------------------------------+
-20 rows
++--------------------------------------------------------------------+
+18 rows
Operation successful
@@ -51,38 +49,34 @@ Operation successful
| mal |
+==================================================================================================+
| function user.s3_1{autoCommit=true}():void; |
-| X_47:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",31); |
+| X_43:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",27); |
| X_3:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
| X_2 := sql.mvc(); |
| 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_62 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true);
|
+| X_57 := algebra.subselect(X_9,X_6,2,2,true,true,true);
|
| (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-| X_63 :=
algebra.subselect(r1_12,nil:bat[:oid,:oid],2:sht,2:sht,true,true,true);
|
+| X_58 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);
|
| X_15:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
-| X_65 := 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_65);
|
-| 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: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:bat[:oid,:sht] := sql.bind(X_2,"tmp","_tables","type",0); |
-| X_31 := X_30; |
+| X_60 := algebra.subselect(X_15,X_6,2,2,true,true,true);
|
+| X_18 := sql.subdelta(X_57,X_6,X_12,X_58,X_60);
|
+| X_19:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0);
|
+| (X_21,r1_24) := sql.bind(X_2,"sys","_tables","id",2);
|
+| X_23:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1);
|
+| X_24 := sql.projectdelta(X_18,X_19,X_21,r1_24,X_23);
|
+| X_25 := aggr.count(X_24);
|
+| X_26 := sql.single(X_25);
|
+| X_27 := bat.append(X_3,X_26,true);
|
| 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: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); |
-| X_39 := bat.append(X_26,X_38,true); |
-| X_40:wrd := aggr.sum(X_39); |
-| sql.resultSet(".L1","L1","wrd",32,0,7,X_40);
|
+| X_30:bat[:oid,:int] := sql.bind(X_2,"tmp","_tables","id",0);
|
+| X_31 := algebra.leftfetchjoin(X_28,X_30);
|
+| X_32 := aggr.count(X_31);
|
+| X_33 := bat.append(X_27,X_32,true);
|
+| X_35:wrd := aggr.sum(X_33);
|
+| sql.resultSet(".L3","L3","wrd",32,0,7,X_35);
|
| end user.s3_1;
|
+--------------------------------------------------------------------------------------------------+
-31 rows
+27 rows
# 19:39:11 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
