Changeset: 6fef0450251e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6fef0450251e
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: default
Log Message:
Approvals.
diffs (truncated from 357 to 300 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
@@ -85,65 +85,65 @@ Ready.
# 11:07:50 >
Operation successful
-+---------------------------------------------------------------------------------------------------------+
++-----------------------------------------------------------------------------------------------------------+
| mal |
-+=========================================================================================================+
++===========================================================================================================+
| function user.s4_1():void;
|
-| X_0:void := querylog.define("explain select \"name\" from
\"tables\"\n;","sequential_pipe",36:int); |
+| X_0:void := querylog.define("explain select \"name\" from
\"tables\"\n;", "sequential_pipe", 36:int); |
| X_40 := bat.new(nil:str);
|
-| X_46 := bat.append(X_40,".tables");
|
+| X_46 := bat.append(X_40, ".tables");
|
| X_41 := bat.new(nil:str);
|
-| X_48 := bat.append(X_41,"name");
|
+| X_48 := bat.append(X_41, "name");
|
| X_42 := bat.new(nil:str);
|
-| X_50 := bat.append(X_42,"varchar");
|
+| X_50 := bat.append(X_42, "varchar");
|
| X_43 := bat.new(nil:int);
|
-| X_52 := bat.append(X_43,1024:int);
|
+| X_52 := bat.append(X_43, 1024:int);
|
| X_45 := bat.new(nil:int);
|
-| X_54 := bat.append(X_45,0:int);
|
+| X_54 := bat.append(X_45, 0:int);
|
| X_35:bat[:str] := bat.new(nil:str);
|
| X_3 := sql.mvc();
|
-| X_17:bat[:sht] := sql.bind(X_3,"sys","_tables","type",0:int);
|
-| C_4:bat[:oid] := sql.tid(X_3,"sys","_tables");
|
-| C_65 := algebra.subselect(X_17,C_4,2:sht,2:sht,true,true,true);
|
-| (C_20:bat[:oid],X_21:bat[:sht]) :=
sql.bind(X_3,"sys","_tables","type",2:int); |
-| C_66 :=
algebra.subselect(X_21,nil:bat[:oid],2:sht,2:sht,true,true,true);
|
-| X_19:bat[:sht] := sql.bind(X_3,"sys","_tables","type",1:int);
|
-| C_68 := algebra.subselect(X_19,C_4,2:sht,2:sht,true,true,true);
|
-| C_26 := sql.subdelta(C_65,C_4,C_20,C_66,C_68);
|
-| X_7:bat[:str] := sql.bind(X_3,"sys","_tables","name",0:int);
|
-| (C_12:bat[:oid],X_13:bat[:str]) :=
sql.bind(X_3,"sys","_tables","name",2:int); |
-| X_10:bat[:str] := sql.bind(X_3,"sys","_tables","name",1:int);
|
-| X_29 := sql.projectdelta(C_26,X_7,C_12,X_13,X_10);
|
-| X_37 := bat.append(X_35,X_29,true);
|
-| C_31:bat[:oid] := sql.tid(X_3,"tmp","_tables");
|
-| X_33:bat[:str] := sql.bind(X_3,"tmp","_tables","name",0:int);
|
-| X_34 := algebra.projection(C_31,X_33);
|
-| X_38 := bat.append(X_37,X_34,true);
|
-| sql.resultSet(X_46,X_48,X_50,X_52,X_54,X_38);
|
+| X_17:bat[:sht] := sql.bind(X_3, "sys", "_tables", "type", 0:int);
|
+| C_4:bat[:oid] := sql.tid(X_3, "sys", "_tables");
|
+| C_65 := algebra.select(X_17, C_4, 2:sht, 2:sht, true, true, true);
|
+| (C_20:bat[:oid], X_21:bat[:sht]) := sql.bind(X_3, "sys", "_tables",
"type", 2:int); |
+| C_66 := algebra.select(X_21, nil:bat[:oid], 2:sht, 2:sht, true, true,
true); |
+| X_19:bat[:sht] := sql.bind(X_3, "sys", "_tables", "type", 1:int);
|
+| C_68 := algebra.select(X_19, C_4, 2:sht, 2:sht, true, true, true);
|
+| C_26 := sql.subdelta(C_65, C_4, C_20, C_66, C_68);
|
+| X_7:bat[:str] := sql.bind(X_3, "sys", "_tables", "name", 0:int);
|
+| (C_12:bat[:oid], X_13:bat[:str]) := sql.bind(X_3, "sys", "_tables",
"name", 2:int); |
+| X_10:bat[:str] := sql.bind(X_3, "sys", "_tables", "name", 1:int);
|
+| X_29 := sql.projectdelta(C_26, X_7, C_12, X_13, X_10);
|
+| X_37 := bat.append(X_35, X_29, true);
|
+| C_31:bat[:oid] := sql.tid(X_3, "tmp", "_tables");
|
+| X_33:bat[:str] := sql.bind(X_3, "tmp", "_tables", "name", 0:int);
|
+| X_34 := algebra.projection(C_31, X_33);
|
+| X_38 := bat.append(X_37, X_34, true);
|
+| sql.resultSet(X_46, X_48, X_50, X_52, X_54, X_38);
|
| end user.s4_1;
|
-| #inline actions= 0 time=1 usec
|
-| #remap actions= 0 time=4 usec
|
-| #costmodel actions= 1 time=3 usec
|
-| #coercion actions= 1 time=11 usec
|
-| #evaluate actions= 0 time=5 usec
|
-| #emptybind actions= 0 time=1 usec
|
-| #pushselect actions= 5 time=47 usec
|
-| #aliases actions= 2 time=14 usec
|
-| #mergetable actions= 0 time=54 usec
|
-| #deadcode actions= 3 time=13 usec
|
-| #aliases actions= 0 time=1 usec
|
-| #constants actions= 3 time=12 usec
|
-| #commonTerms actions= 0 time=10 usec
|
-| #projectionpath actions= 0 time=6 usec
|
-| #reorder actions= 1 time=43 usec
|
-| #deadcode actions= 0 time=9 usec
|
-| #matpack actions= 0 time=1 usec
|
-| #multiplex actions= 0 time=3 usec
|
-| #profiler actions= 1 time=6 usec
|
-| #candidates actions= 1 time=2 usec
|
-| #garbagecollector actions= 1 time=26 usec
|
-| #total actions=23 time=423 usec
|
-+---------------------------------------------------------------------------------------------------------+
+| #inline actions= 0 time=0 usec
|
+| #remap actions= 0 time=2 usec
|
+| #costmodel actions= 1 time=1 usec
|
+| #coercion actions= 1 time=2 usec
|
+| #evaluate actions= 0 time=2 usec
|
+| #emptybind actions= 0 time=0 usec
|
+| #pushselect actions= 5 time=19 usec
|
+| #aliases actions= 2 time=4 usec
|
+| #mergetable actions= 0 time=15 usec
|
+| #deadcode actions= 3 time=4 usec
|
+| #aliases actions= 0 time=0 usec
|
+| #constants actions= 3 time=4 usec
|
+| #commonTerms actions= 0 time=3 usec
|
+| #projectionpath actions= 0 time=2 usec
|
+| #reorder actions= 1 time=13 usec
|
+| #deadcode actions= 0 time=3 usec
|
+| #matpack actions= 0 time=0 usec
|
+| #multiplex actions= 0 time=1 usec
|
+| #profiler actions= 1 time=1 usec
|
+| #candidates actions= 1 time=0 usec
|
+| #garbagecollector actions= 1 time=6 usec
|
+| #total actions=23 time=137 usec
|
++-----------------------------------------------------------------------------------------------------------+
55 rows
# 09:07:58 >
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
@@ -43,59 +43,59 @@ Ready.
+--------------------------------------------------------------------+
18 rows
Operation successful
-+-----------------------------------------------------------------------------------------------------+
++-------------------------------------------------------------------------------------------------------+
| mal |
-+=====================================================================================================+
++=======================================================================================================+
| function user.s4_1():void;
|
-| X_0:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",30:int); |
+| X_0:void := querylog.define("explain select count(*) from tables\n;",
"sequential_pipe", 30:int); |
| X_38:bat[:lng] := bat.new(nil:lng);
|
| X_3 := sql.mvc();
|
-| X_17:bat[:sht] := sql.bind(X_3,"sys","_tables","type",0:int);
|
-| C_4:bat[:oid] := sql.tid(X_3,"sys","_tables");
|
-| C_59 := algebra.subselect(X_17,C_4,2:sht,2:sht,true,true,true);
|
-| (C_20:bat[:oid],X_21:bat[:sht]) :=
sql.bind(X_3,"sys","_tables","type",2:int); |
-| C_60 :=
algebra.subselect(X_21,nil:bat[:oid],2:sht,2:sht,true,true,true);
|
-| X_19:bat[:sht] := sql.bind(X_3,"sys","_tables","type",1:int);
|
-| C_62 := algebra.subselect(X_19,C_4,2:sht,2:sht,true,true,true);
|
-| C_26 := sql.subdelta(C_59,C_4,C_20,C_60,C_62);
|
-| X_7:bat[:int] := sql.bind(X_3,"sys","_tables","id",0:int);
|
-| (C_12:bat[:oid],X_13:bat[:int]) :=
sql.bind(X_3,"sys","_tables","id",2:int); |
-| X_10:bat[:int] := sql.bind(X_3,"sys","_tables","id",1:int);
|
-| X_29 := sql.projectdelta(C_26,X_7,C_12,X_13,X_10);
|
+| X_17:bat[:sht] := sql.bind(X_3, "sys", "_tables", "type", 0:int);
|
+| C_4:bat[:oid] := sql.tid(X_3, "sys", "_tables");
|
+| C_59 := algebra.select(X_17, C_4, 2:sht, 2:sht, true, true, true);
|
+| (C_20:bat[:oid], X_21:bat[:sht]) := sql.bind(X_3, "sys", "_tables",
"type", 2:int); |
+| C_60 := algebra.select(X_21, nil:bat[:oid], 2:sht, 2:sht, true, true,
true); |
+| X_19:bat[:sht] := sql.bind(X_3, "sys", "_tables", "type", 1:int);
|
+| C_62 := algebra.select(X_19, C_4, 2:sht, 2:sht, true, true, true);
|
+| C_26 := sql.subdelta(C_59, C_4, C_20, C_60, C_62);
|
+| X_7:bat[:int] := sql.bind(X_3, "sys", "_tables", "id", 0:int);
|
+| (C_12:bat[:oid], X_13:bat[:int]) := sql.bind(X_3, "sys", "_tables",
"id", 2:int); |
+| X_10:bat[:int] := sql.bind(X_3, "sys", "_tables", "id", 1:int);
|
+| X_29 := sql.projectdelta(C_26, X_7, C_12, X_13, X_10);
|
| X_31 := aggr.count(X_29);
|
| X_37 := sql.single(X_31);
|
-| X_40 := bat.append(X_38,X_37,true);
|
-| C_32:bat[:oid] := sql.tid(X_3,"tmp","_tables");
|
-| X_34:bat[:int] := sql.bind(X_3,"tmp","_tables","id",0:int);
|
-| X_35 := algebra.projection(C_32,X_34);
|
+| X_40 := bat.append(X_38, X_37, true);
|
+| C_32:bat[:oid] := sql.tid(X_3, "tmp", "_tables");
|
+| X_34:bat[:int] := sql.bind(X_3, "tmp", "_tables", "id", 0:int);
|
+| X_35 := algebra.projection(C_32, X_34);
|
| X_36 := aggr.count(X_35);
|
-| X_41 := bat.append(X_40,X_36,true);
|
+| X_41 := bat.append(X_40, X_36, true);
|
| X_42:lng := aggr.sum(X_41);
|
-| sql.resultSet(".L41","L40","bigint",64:int,0:int,7:int,X_42);
|
+| sql.resultSet(".L41", "L40", "bigint", 64:int, 0:int, 7:int, X_42);
|
| end user.s4_1;
|
-| #inline actions= 0 time=2 usec
|
-| #remap actions= 0 time=4 usec
|
-| #costmodel actions= 1 time=3 usec
|
-| #coercion actions= 1 time=10 usec
|
-| #evaluate actions= 0 time=5 usec
|
-| #emptybind actions= 0 time=1 usec
|
-| #pushselect actions= 5 time=46 usec
|
-| #aliases actions= 2 time=14 usec
|
-| #mergetable actions= 0 time=52 usec
|
-| #deadcode actions= 3 time=12 usec
|
+| #inline actions= 0 time=0 usec
|
+| #remap actions= 0 time=1 usec
|
+| #costmodel actions= 1 time=1 usec
|
+| #coercion actions= 1 time=2 usec
|
+| #evaluate actions= 0 time=1 usec
|
+| #emptybind actions= 0 time=0 usec
|
+| #pushselect actions= 5 time=17 usec
|
+| #aliases actions= 2 time=3 usec
|
+| #mergetable actions= 0 time=14 usec
|
+| #deadcode actions= 3 time=4 usec
|
| #aliases actions= 0 time=0 usec
|
-| #constants actions= 2 time=11 usec
|
-| #commonTerms actions= 0 time=9 usec
|
-| #projectionpath actions= 0 time=6 usec
|
-| #reorder actions= 1 time=39 usec
|
-| #deadcode actions= 0 time=9 usec
|
+| #constants actions= 2 time=3 usec
|
+| #commonTerms actions= 0 time=3 usec
|
+| #projectionpath actions= 0 time=2 usec
|
+| #reorder actions= 1 time=11 usec
|
+| #deadcode actions= 0 time=3 usec
|
| #matpack actions= 0 time=0 usec
|
-| #multiplex actions= 0 time=3 usec
|
-| #profiler actions= 1 time=6 usec
|
-| #candidates actions= 1 time=2 usec
|
-| #garbagecollector actions= 1 time=25 usec
|
-| #total actions=23 time=405 usec
|
-+-----------------------------------------------------------------------------------------------------+
+| #multiplex actions= 0 time=1 usec
|
+| #profiler actions= 1 time=0 usec
|
+| #candidates actions= 1 time=0 usec
|
+| #garbagecollector actions= 1 time=7 usec
|
+| #total actions=23 time=129 usec
|
++-------------------------------------------------------------------------------------------------------+
49 rows
# 09:08:01 >
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
@@ -31,76 +31,74 @@ Ready.
| | | | | | | table(sys._tables) [ _tables.id, _tables.type ] COUNT |
| | | | | | ) [ _tables.type != smallint "2" ] |
| | | | | ) [ _tables.id as tables.id ] |
-| | | | ) [ ] [ sys.count() NOT NULL as L7.L7 ], |
+| | | | ) [ ] [ sys.count() NOT NULL as L40.L40 ], |
| | | | group by (
|
| | | | | project (
|
| | | | | | table(tmp._tables) [ _tables.id ] COUNT |
| | | | | ) [ _tables.id as tables.id ] |
-| | | | ) [ ] [ sys.count() NOT NULL as L7.L7 ] |
-| | | ) [ L7.L7 ] |
-| | ) [ ] [ sys.sum no nil (L7.L7) as L7.L7 ] |
-| ) [ L7 NOT NULL as L10.L7 ] |
+| | | | ) [ ] [ sys.count() NOT NULL as L40.L40 ] |
+| | | ) [ L40.L40 ] |
+| | ) [ ] [ sys.sum no nil (L40.L40) as L40.L40 ] |
+| ) [ L40 NOT NULL as L41.L40 ] |
+--------------------------------------------------------------------+
18 rows
Operation successful
-
-+--------------------------------------------------------------------------------------------------+
++-------------------------------------------------------------------------------------------------------+
| mal
|
-+==================================================================================================+
++=======================================================================================================+
| function user.s4_1():void;
|
-| X_46:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",27); |
-| X_1:bat[:lng] := bat.new(nil:lng);
|
-| X_0 := sql.mvc();
|
-| X_6:bat[:sht] := sql.bind(X_0,"sys","_tables","type",0);
|
-| C_3:bat[:oid] := sql.tid(X_0,"sys","_tables");
|
-| C_57 := algebra.subselect(X_6,C_3,2,2,true,true,true);
|
-| (C_9:bat[:oid],r1_10:bat[:sht]) :=
sql.bind(X_0,"sys","_tables","type",2); |
-| C_58 := algebra.subselect(r1_10,nil:bat[:oid],2,2,true,true,true);
|
-| X_12:bat[:sht] := sql.bind(X_0,"sys","_tables","type",1);
|
-| C_60 := algebra.subselect(X_12,C_3,2,2,true,true,true);
|
-| C_18 := sql.subdelta(C_57,C_3,C_9,C_58,C_60);
|
-| X_21:bat[:int] := sql.bind(X_0,"sys","_tables","id",0);
|
-| (C_23:bat[:oid],r1_24:bat[:int]) :=
sql.bind(X_0,"sys","_tables","id",2); |
-| X_25:bat[:int] := sql.bind(X_0,"sys","_tables","id",1);
|
-| X_28 := sql.projectdelta(C_18,X_21,C_23,r1_24,X_25);
|
-| X_29 := aggr.count(X_28);
|
-| X_30 := sql.single(X_29);
|
-| X_31 := bat.append(X_1,X_30,true);
|
-| C_32:bat[:oid] := sql.tid(X_0,"tmp","_tables");
|
-| X_34:bat[:int] := sql.bind(X_0,"tmp","_tables","id",0);
|
-| X_35 := algebra.projection(C_32,X_34);
|
+| X_0:void := querylog.define("explain select count(*) from tables\n;",
"sequential_pipe", 30:int); |
+| X_38:bat[:lng] := bat.new(nil:lng);
|
+| X_3 := sql.mvc();
|
+| X_17:bat[:sht] := sql.bind(X_3, "sys", "_tables", "type", 0:int);
|
+| C_4:bat[:oid] := sql.tid(X_3, "sys", "_tables");
|
+| C_59 := algebra.select(X_17, C_4, 2:sht, 2:sht, true, true, true);
|
+| (C_20:bat[:oid], X_21:bat[:sht]) := sql.bind(X_3, "sys", "_tables",
"type", 2:int); |
+| C_60 := algebra.select(X_21, nil:bat[:oid], 2:sht, 2:sht, true, true,
true); |
+| X_19:bat[:sht] := sql.bind(X_3, "sys", "_tables", "type", 1:int);
|
+| C_62 := algebra.select(X_19, C_4, 2:sht, 2:sht, true, true, true);
|
+| C_26 := sql.subdelta(C_59, C_4, C_20, C_60, C_62);
|
+| X_7:bat[:int] := sql.bind(X_3, "sys", "_tables", "id", 0:int);
|
+| (C_12:bat[:oid], X_13:bat[:int]) := sql.bind(X_3, "sys", "_tables",
"id", 2:int); |
+| X_10:bat[:int] := sql.bind(X_3, "sys", "_tables", "id", 1:int);
|
+| X_29 := sql.projectdelta(C_26, X_7, C_12, X_13, X_10);
|
+| X_31 := aggr.count(X_29);
|
+| X_37 := sql.single(X_31);
|
+| X_40 := bat.append(X_38, X_37, true);
|
+| C_32:bat[:oid] := sql.tid(X_3, "tmp", "_tables");
|
+| X_34:bat[:int] := sql.bind(X_3, "tmp", "_tables", "id", 0:int);
|
+| X_35 := algebra.projection(C_32, X_34);
|
| X_36 := aggr.count(X_35);
|
-| X_37 := bat.append(X_31,X_36,true);
|
-| X_38:lng := aggr.sum(X_37);
|
-| sql.resultSet(".L3","L3","bigint",64,0,7,X_38);
|
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
