Changeset: 88dce87e9491 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88dce87e9491
Modified Files:
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/mapi/Tests/sql_int128.stable.out
Branch: default
Log Message:
approved output
diffs (257 lines):
diff --git a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql
b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql
--- a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql
+++ b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql
@@ -1,12 +1,12 @@
-- disable parallelism (mitosis & dataflow) to avoid ambiguous results
set optimizer='sequential_pipe';
create table blabla(id integer);
--- use "ProfilingOutput" since we're only interested in crashes
-select '~BeginProfilingOutput~';
+-- use "VariableOutput" since we're only interested in crashes
+select '~BeginVariableOutput~';
explain alter table blabla add constraint dada unique (id);
explain alter table blabla add constraint dada unique (id);
-select '~EndProfilingOutput~';
+select '~EndVariableOutput~';
alter table blabla drop constraint dada;
-select '~BeginProfilingOutput~';
+select '~BeginVariableOutput~';
explain alter table blabla add constraint dada unique (id);
-select '~EndProfilingOutput~';
+select '~EndVariableOutput~';
diff --git
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
---
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
+++
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
@@ -21,8 +21,8 @@ Ready.
# 16:24:01 >
#debug select * from tables;
-mdb>#X_259=0@0:void := querylog.define("debug select * from
tables;","default_pipe",159);
-mdb>#X_184=nil:bat[:str] := bat.new(nil:str);
+mdb>#X_269=0@0:void := querylog.define("debug select * from
tables;","default_pipe",159);
+mdb>#X_194=nil:bat[:str] := bat.new(nil:str);
# 16:24:01 >
# 16:24:01 > "Done."
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
@@ -122,28 +122,28 @@ Operation successful
| # querylog.define("explain select \"name\" from
\"tables\"\n;","sequential_pipe") |
| 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=1 usec
|
-| #costmodel actions= 1 time=1 usec
|
-| #coercion actions= 1 time=3 usec
|
-| #evaluate actions= 0 time=1 usec
|
-| #emptybind actions= 0 time=4 usec
|
-| #pushselect actions= 5 time=19 usec
|
-| #aliases actions= 2 time=4 usec
|
-| #mergetable actions= 0 time=31 usec
|
-| #deadcode actions= 3 time=4 usec
|
-| #aliases actions= 0 time=2 usec
|
-| #constants actions= 5 time=4 usec
|
-| #commonTerms actions= 0 time=4 usec
|
-| #projectionpath actions= 0 time=2 usec
|
-| #reorder actions= 1 time=13 usec
|
-| #deadcode actions= 0 time=3 usec
|
-| #reduce actions=30 time=5 usec
|
-| #matpack actions= 0 time=2 usec
|
-| #multiplex actions= 0 time=2 usec
|
-| #profiler actions= 1 time=3 usec
|
-| #candidates actions= 1 time=0 usec
|
-| #garbagecollector actions= 1 time=7 usec
|
+| #inline actions= 0 time=2 usec
|
+| #remap actions= 0 time=4 usec
|
+| #costmodel actions= 1 time=4 usec
|
+| #coercion actions= 1 time=11 usec
|
+| #evaluate actions= 0 time=5 usec
|
+| #emptybind actions= 0 time=13 usec
|
+| #pushselect actions= 5 time=50 usec
|
+| #aliases actions= 2 time=15 usec
|
+| #mergetable actions= 0 time=56 usec
|
+| #deadcode actions= 3 time=12 usec
|
+| #aliases actions= 0 time=9 usec
|
+| #constants actions= 5 time=13 usec
|
+| #commonTerms actions= 0 time=11 usec
|
+| #projectionpath actions= 0 time=6 usec
|
+| #reorder actions= 1 time=49 usec
|
+| #deadcode actions= 0 time=9 usec
|
+| #reduce actions=30 time=16 usec
|
+| #matpack actions= 0 time=3 usec
|
+| #multiplex actions= 0 time=3 usec
|
+| #profiler actions= 1 time=8 usec
|
+| #candidates actions= 1 time=1 usec
|
+| #garbagecollector actions= 1 time=23 usec
|
+------------------------------------------------------------------------------------------------------+
56 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
@@ -75,27 +75,27 @@ Operation successful
| sql.resultSet(".L41","L40","bigint",64,0,7,X_42);
|
| end user.s4_1;
|
| #inline actions= 0 time=1 usec
|
-| #remap actions= 0 time=2 usec
|
-| #costmodel actions= 1 time=0 usec
|
-| #coercion actions= 1 time=3 usec
|
-| #evaluate actions= 0 time=1 usec
|
-| #emptybind actions= 0 time=3 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=1 usec
|
-| #constants actions= 4 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=2 usec
|
-| #reduce actions=29 time=5 usec
|
-| #matpack actions= 0 time=1 usec
|
-| #multiplex actions= 0 time=1 usec
|
-| #profiler actions= 1 time=3 usec
|
+| #remap actions= 0 time=3 usec
|
+| #costmodel actions= 1 time=2 usec
|
+| #coercion actions= 1 time=7 usec
|
+| #evaluate actions= 0 time=4 usec
|
+| #emptybind actions= 0 time=8 usec
|
+| #pushselect actions= 5 time=35 usec
|
+| #aliases actions= 2 time=10 usec
|
+| #mergetable actions= 0 time=36 usec
|
+| #deadcode actions= 3 time=9 usec
|
+| #aliases actions= 0 time=6 usec
|
+| #constants actions= 4 time=10 usec
|
+| #commonTerms actions= 0 time=7 usec
|
+| #projectionpath actions= 0 time=4 usec
|
+| #reorder actions= 1 time=28 usec
|
+| #deadcode actions= 0 time=6 usec
|
+| #reduce actions=29 time=14 usec
|
+| #matpack actions= 0 time=5 usec
|
+| #multiplex actions= 0 time=3 usec
|
+| #profiler actions= 1 time=5 usec
|
| #candidates actions= 1 time=1 usec
|
-| #garbagecollector actions= 1 time=6 usec
|
+| #garbagecollector actions= 1 time=19 usec
|
+--------------------------------------------------------------------------------------------------+
50 rows
diff --git a/sql/test/mapi/Tests/sql_int128.stable.out
b/sql/test/mapi/Tests/sql_int128.stable.out
--- a/sql/test/mapi/Tests/sql_int128.stable.out
+++ b/sql/test/mapi/Tests/sql_int128.stable.out
@@ -58,11 +58,12 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 72 # length
+% 89 # length
function user.s4_1():void;
- X_6:void := querylog.define("explain set a =
1234567890987654321;","default_pipe",6);
- X_0 := sql.mvc();
- sql.setVariable(X_0,"a",1234567890987654321);
+ X_9:void := querylog.define("explain set a =
1234567890987654321;","default_pipe",7);
+ X_3 := sql.mvc();
+# querylog.define("explain set a = 1234567890987654321;","default_pipe")
+ sql.setVariable(X_3,"a",1234567890987654321);
sql.exportOperation();
end user.s4_1;
#inline actions= 0 time=3 usec
@@ -96,11 +97,12 @@ end user.s4_1;
% .explain # table_name
% mal # name
% clob # type
-% 64 # length
+% 81 # length
function user.s6_1():void;
- X_6:void := querylog.define("explain set b =
10000000000;","default_pipe",6);
- X_0 := sql.mvc();
- sql.setVariable(X_0,"b",10000000000);
+ X_9:void := querylog.define("explain set b =
10000000000;","default_pipe",7);
+ X_3 := sql.mvc();
+# querylog.define("explain set b = 10000000000;","default_pipe")
+ sql.setVariable(X_3,"b",10000000000);
sql.exportOperation();
end user.s6_1;
#inline actions= 0 time=3 usec
@@ -134,14 +136,15 @@ end user.s6_1;
% .explain # table_name
% mal # name
% clob # type
-% 58 # length
+% 77 # length
function user.s8_1():void;
- X_10:void := querylog.define("explain set c = a * b;","default_pipe",9);
- X_0 := sql.mvc();
- X_1:hge := sql.getVariable(X_0,"a");
- X_3:hge := sql.getVariable(X_0,"b");
- X_5:hge := calc.*(X_1,X_3);
- sql.setVariable(X_0,"c",X_5);
+ X_13:void := querylog.define("explain set c = a * b;","default_pipe",10);
+ X_3 := sql.mvc();
+# querylog.define("explain set c = a * b;","default_pipe")
+ X_4:hge := sql.getVariable(X_3,"a");
+ X_6:hge := sql.getVariable(X_3,"b");
+ X_8:hge := calc.*(X_4,X_6);
+ sql.setVariable(X_3,"c",X_8);
sql.exportOperation();
end user.s8_1;
#inline actions= 0 time=3 usec
@@ -175,14 +178,15 @@ end user.s8_1;
% .explain # table_name
% mal # name
% clob # type
-% 58 # length
+% 77 # length
function user.s10_1():void;
- X_10:void := querylog.define("explain set d = c * b;","default_pipe",9);
- X_0 := sql.mvc();
- X_1:hge := sql.getVariable(X_0,"c");
- X_3:hge := sql.getVariable(X_0,"b");
- X_5:hge := calc.*(X_1,X_3);
- sql.setVariable(X_0,"d",X_5);
+ X_13:void := querylog.define("explain set d = c * b;","default_pipe",10);
+ X_3 := sql.mvc();
+# querylog.define("explain set d = c * b;","default_pipe")
+ X_4:hge := sql.getVariable(X_3,"c");
+ X_6:hge := sql.getVariable(X_3,"b");
+ X_8:hge := calc.*(X_4,X_6);
+ sql.setVariable(X_3,"d",X_8);
sql.exportOperation();
end user.s10_1;
#inline actions= 0 time=3 usec
@@ -216,14 +220,15 @@ end user.s10_1;
% .explain # table_name
% mal # name
% clob # type
-% 58 # length
+% 77 # length
function user.s12_1():void;
- X_10:void := querylog.define("explain set e = d + a;","default_pipe",9);
- X_0 := sql.mvc();
- X_1:hge := sql.getVariable(X_0,"d");
- X_3:hge := sql.getVariable(X_0,"a");
- X_5:hge := calc.+(X_1,X_3);
- sql.setVariable(X_0,"e",X_5);
+ X_13:void := querylog.define("explain set e = d + a;","default_pipe",10);
+ X_3 := sql.mvc();
+# querylog.define("explain set e = d + a;","default_pipe")
+ X_4:hge := sql.getVariable(X_3,"d");
+ X_6:hge := sql.getVariable(X_3,"a");
+ X_8:hge := calc.+(X_4,X_6);
+ sql.setVariable(X_3,"e",X_8);
sql.exportOperation();
end user.s12_1;
#inline actions= 0 time=3 usec
@@ -275,8 +280,9 @@ end user.s12_1;
% .explain # table_name
% mal # name
% clob # type
-% 116 # length
+% 134 # length
function user.s30_1():void;
+ X_14:void := querylog.define("explain insert into sql_int128 values
(123456789098765432101234567890987654321);","default_pipe",7);
X_3 := sql.mvc();
# querylog.define("explain insert into sql_int128 values
(123456789098765432101234567890987654321);","default_pipe")
X_6 :=
sql.append(X_3,"sys","sql_int128","i",123456789098765432101234567890987654321);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
