Changeset: ab290f65ad5d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab290f65ad5d 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/subquery_orderby.SF-1688915.stable.out Branch: default Log Message:
approved output (include bam when running tests)
diffs (236 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
@@ -89,60 +89,60 @@ Operation successful
| mal |
+===========================================================================================================+
| function user.s4_1():void;
|
-| 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_1:void := querylog.define("explain select \"name\" from
\"tables\"\n;", "sequential_pipe", 36:int); |
| X_41 := bat.new(nil:str);
|
-| X_48 := bat.append(X_41, "name");
|
+| X_47 := bat.append(X_41, ".tables");
|
| X_42 := bat.new(nil:str);
|
-| X_50 := bat.append(X_42, "varchar");
|
-| X_43 := bat.new(nil:int);
|
-| X_52 := bat.append(X_43, 1024:int);
|
-| X_45 := bat.new(nil: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.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);
|
+| X_49 := bat.append(X_42, "name");
|
+| X_43 := bat.new(nil:str);
|
+| X_51 := bat.append(X_43, "varchar");
|
+| X_44 := bat.new(nil:int);
|
+| X_53 := bat.append(X_44, 1024:int);
|
+| X_46 := bat.new(nil:int);
|
+| X_55 := bat.append(X_46, 0:int);
|
+| X_36:bat[:str] := bat.new(nil:str);
|
+| X_4 := sql.mvc();
|
+| X_18:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 0:int);
|
+| C_5:bat[:oid] := sql.tid(X_4, "sys", "_tables");
|
+| C_89 := algebra.select(X_18, C_5, 2:sht, 2:sht, true, true, true);
|
+| (C_21:bat[:oid], X_22:bat[:sht]) := sql.bind(X_4, "sys", "_tables",
"type", 2:int); |
+| C_90 := algebra.select(X_22, nil:bat[:oid], 2:sht, 2:sht, true, true,
true); |
+| X_20:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 1:int);
|
+| C_92 := algebra.select(X_20, C_5, 2:sht, 2:sht, true, true, true);
|
+| C_27 := sql.subdelta(C_89, C_5, C_21, C_90, C_92);
|
+| X_8:bat[:str] := sql.bind(X_4, "sys", "_tables", "name", 0:int);
|
+| (C_13:bat[:oid], X_14:bat[:str]) := sql.bind(X_4, "sys", "_tables",
"name", 2:int); |
+| X_11:bat[:str] := sql.bind(X_4, "sys", "_tables", "name", 1:int);
|
+| X_30 := sql.projectdelta(C_27, X_8, C_13, X_14, X_11);
|
+| X_38 := bat.append(X_36, X_30, true);
|
+| C_32:bat[:oid] := sql.tid(X_4, "tmp", "_tables");
|
+| X_34:bat[:str] := sql.bind(X_4, "tmp", "_tables", "name", 0:int);
|
+| X_35 := algebra.projection(C_32, X_34);
|
+| X_39 := bat.append(X_38, X_35, true);
|
+| sql.resultSet(X_47, X_49, X_51, X_53, X_55, X_39);
|
| end user.s4_1;
|
| #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
|
+| #costmodel actions= 1 time=2 usec
|
+| #coercion actions= 1 time=6 usec
|
+| #evaluate actions= 0 time=3 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
|
+| #pushselect actions= 5 time=29 usec
|
+| #aliases actions= 2 time=9 usec
|
+| #mergetable actions= 0 time=30 usec
|
+| #deadcode actions= 3 time=7 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
|
+| #constants actions= 3 time=7 usec
|
+| #commonTerms actions= 0 time=6 usec
|
+| #projectionpath actions= 0 time=4 usec
|
+| #reorder actions= 1 time=25 usec
|
+| #deadcode actions= 0 time=6 usec
|
| #matpack actions= 0 time=0 usec
|
-| #multiplex actions= 0 time=1 usec
|
+| #multiplex actions= 0 time=2 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
|
+| #candidates actions= 1 time=1 usec
|
+| #garbagecollector actions= 1 time=43 usec
|
+| #total actions=23 time=270 usec
|
+-----------------------------------------------------------------------------------------------------------+
55 rows
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
@@ -47,54 +47,54 @@ Operation successful
| mal |
+=======================================================================================================+
| function user.s4_1():void;
|
-| 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_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);
|
+| X_1:void := querylog.define("explain select count(*) from tables\n;",
"sequential_pipe", 30:int); |
+| X_39:bat[:lng] := bat.new(nil:lng);
|
+| X_4 := sql.mvc();
|
+| X_18:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 0:int);
|
+| C_5:bat[:oid] := sql.tid(X_4, "sys", "_tables");
|
+| C_83 := algebra.select(X_18, C_5, 2:sht, 2:sht, true, true, true);
|
+| (C_21:bat[:oid], X_22:bat[:sht]) := sql.bind(X_4, "sys", "_tables",
"type", 2:int); |
+| C_84 := algebra.select(X_22, nil:bat[:oid], 2:sht, 2:sht, true, true,
true); |
+| X_20:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 1:int);
|
+| C_86 := algebra.select(X_20, C_5, 2:sht, 2:sht, true, true, true);
|
+| C_27 := sql.subdelta(C_83, C_5, C_21, C_84, C_86);
|
+| X_8:bat[:int] := sql.bind(X_4, "sys", "_tables", "id", 0:int);
|
+| (C_13:bat[:oid], X_14:bat[:int]) := sql.bind(X_4, "sys", "_tables",
"id", 2:int); |
+| X_11:bat[:int] := sql.bind(X_4, "sys", "_tables", "id", 1:int);
|
+| X_30 := sql.projectdelta(C_27, X_8, C_13, X_14, X_11);
|
+| X_32 := aggr.count(X_30);
|
+| X_38 := sql.single(X_32);
|
+| X_41 := bat.append(X_39, X_38, true);
|
+| C_33:bat[:oid] := sql.tid(X_4, "tmp", "_tables");
|
+| X_35:bat[:int] := sql.bind(X_4, "tmp", "_tables", "id", 0:int);
|
+| X_36 := algebra.projection(C_33, X_35);
|
+| X_37 := aggr.count(X_36);
|
+| X_42 := bat.append(X_41, X_37, true);
|
+| X_43:lng := aggr.sum(X_42);
|
+| sql.resultSet(".L41", "L40", "bigint", 64:int, 0:int, 7:int, X_43);
|
| end user.s4_1;
|
-| #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=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
|
+| #inline actions= 0 time=1 usec
|
+| #remap actions= 0 time=2 usec
|
+| #costmodel actions= 1 time=3 usec
|
+| #coercion actions= 1 time=6 usec
|
+| #evaluate actions= 0 time=3 usec
|
+| #emptybind actions= 0 time=1 usec
|
+| #pushselect actions= 5 time=30 usec
|
+| #aliases actions= 2 time=8 usec
|
+| #mergetable actions= 0 time=29 usec
|
+| #deadcode actions= 3 time=7 usec
|
+| #aliases actions= 0 time=1 usec
|
+| #constants actions= 2 time=6 usec
|
+| #commonTerms actions= 0 time=6 usec
|
+| #projectionpath actions= 0 time=3 usec
|
+| #reorder actions= 1 time=22 usec
|
+| #deadcode actions= 0 time=5 usec
|
| #matpack actions= 0 time=0 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
|
+| #profiler actions= 1 time=2 usec
|
+| #candidates actions= 1 time=1 usec
|
+| #garbagecollector actions= 1 time=40 usec
|
+| #total actions=23 time=265 usec
|
+-------------------------------------------------------------------------------------------------------+
49 rows
diff --git a/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.out
b/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.out
--- a/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.out
+++ b/sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.out
@@ -94,6 +94,8 @@ Ready.
[ "environment" ]
[ "queue" ]
[ "rejects" ]
+[ "spatial_ref_sys" ]
+[ "geometry_columns" ]
[ "keywords" ]
[ "table_types" ]
[ "dependency_types" ]
@@ -107,6 +109,11 @@ Ready.
[ "storagemodel" ]
[ "tablestoragemodel" ]
[ "statistics" ]
+[ "files" ]
+[ "sq" ]
+[ "rg" ]
+[ "pg" ]
+[ "export" ]
[ "systemfunctions" ]
# 14:49:17 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
