Changeset: a13e33748e1a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a13e33748e1a
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Approvals.
diffs (truncated from 546 to 300 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -61,11 +61,12 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 126 # length
+% 146 # length
function user.s8_1():void;
- X_41:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",11);
+ X_41:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",11:int);
X_3 := sql.mvc();
- (X_24:bat[:int],X_25:bat[:int],X_26:bat[:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0,nil:str);
+ (X_24:bat[:int],X_25:bat[:int],X_26:bat[:int]) :=
sql.copy_from(nil:ptr,"|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0:int,0:int,nil:str);
+# querylog.define("explain copy into ttt from \\'/tmp/xyz\\';","default_pipe")
X_28 := sql.append(X_3,"sys","ttt","a",X_24);
X_33 := sql.append(X_28,"sys","ttt","b",X_25);
X_36 := sql.append(X_33,"sys","ttt","c",X_26);
@@ -120,11 +121,12 @@ end user.s8_1;
% .explain # table_name
% mal # name
% clob # type
-% 126 # length
+% 146 # length
function user.s24_1():void;
- X_41:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",11);
+ X_41:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",11:int);
X_3 := sql.mvc();
- (X_24:bat[:int],X_25:bat[:int],X_26:bat[:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0,nil:str);
+ (X_24:bat[:int],X_25:bat[:int],X_26:bat[:int]) :=
sql.copy_from(nil:ptr,"|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0:int,0:int,nil:str);
+# querylog.define("explain copy into ttt from \\'/tmp/xyz\\';","user_1")
X_28 := sql.append(X_3,"sys","ttt","a",X_24);
X_33 := sql.append(X_28,"sys","ttt","b",X_25);
X_38 := aggr.count(X_26);
diff --git a/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
b/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
--- a/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
+++ b/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
@@ -27,9 +27,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 100 # length
+% 104 # length
function user.s6_1():void;
- X_38:void := querylog.define("explain select power(x,2) from
sf_2596114;","sequential_pipe",17);
+ X_38:void := querylog.define("explain select power(x,2) from
sf_2596114;","sequential_pipe",17:int);
X_22 := bat.new(nil:str);
X_29 := bat.append(X_22,"sys.L2");
X_24 := bat.new(nil:str);
@@ -37,11 +37,12 @@ function user.s6_1():void;
X_25 := bat.new(nil:str);
X_33 := bat.append(X_25,"double");
X_26 := bat.new(nil:int);
- X_35 := bat.append(X_26,53);
+ X_35 := bat.append(X_26,53:int);
X_28 := bat.new(nil:int);
- X_37 := bat.append(X_28,0);
+ X_37 := bat.append(X_28,0:int);
X_16 := bat.new(nil:dbl);
- X_18:bat[:dbl] := batmmath.pow(X_16,2);
+ X_18:bat[:dbl] := batmmath.pow(X_16,2:dbl);
+# querylog.define("explain select power(x,2) from
sf_2596114;","sequential_pipe")
sql.resultSet(X_29,X_31,X_33,X_35,X_37,X_18);
end user.s6_1;
#inline actions= 0 time=4 usec
@@ -73,9 +74,9 @@ end user.s6_1;
% .explain # table_name
% mal # name
% clob # type
-% 74 # length
+% 80 # length
function user.main():void;
- X_45:void := querylog.define("-- no query","sequential_pipe",16,15);
+ X_45:void := querylog.define("-- no
query","sequential_pipe",16:int,15:int);
X_29 := bat.new(nil:str);
X_36 := bat.append(X_29,"sys.L2");
X_31 := bat.new(nil:str);
@@ -83,11 +84,11 @@ function user.main():void;
X_32 := bat.new(nil:str);
X_40 := bat.append(X_32,"double");
X_33 := bat.new(nil:int);
- X_42 := bat.append(X_33,53);
+ X_42 := bat.append(X_33,53:int);
X_35 := bat.new(nil:int);
- X_44 := bat.append(X_35,0);
+ X_44 := bat.append(X_35,0:int);
X_22 := bat.new(nil:dbl);
- X_25:bat[:dbl] := batmmath.pow(X_22,2);
+ X_25:bat[:dbl] := batmmath.pow(X_22,2:dbl);
# querylog.define("explain select x*x from sf_2596114;","sequential_pipe")
sql.resultSet(X_36,X_38,X_40,X_42,X_44,X_25);
end user.main;
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,7 +21,7 @@ Ready.
# 16:24:01 >
#debug select * from tables;
-mdb>#X_269=0@0:void := querylog.define("debug select * from
tables;","default_pipe",159);
+mdb>#X_269=0@0:void := querylog.define("debug select * from
tables;","default_pipe",159:int);
mdb>#X_194=nil:bat[:str] := bat.new(nil:str);
# 16:24:01 >
diff --git a/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
b/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
--- a/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
+++ b/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
@@ -14,8 +14,8 @@ stderr of test 'bug_in_selection.SF-1892
MAPI = (monetdb) /var/tmp/mtest-9513/.s.monetdb.37125
QUERY = SELECT date, (SELECT date from test_subquery where date >
t1892413a.date limit 1) as dtNext from test_subquery t1892413a;
-
-MAPI = (monetdb) /var/tmp/mtest-18988/.s.monetdb.30890
+ERROR = !syntax error, unexpected LIMIT, expecting UNION or EXCEPT or
INTERSECT or ')' in: "select date, (select date from test_subquery where date >
t1892413a.date limit"
+MAPI = (monetdb) /var/tmp/mtest-9352/.s.monetdb.30593
QUERY = SELECT date, (SELECT date from test_subquery where date >
t1892413a.date) as dtNext from test_subquery t1892413a;
ERROR = !zero_or_one: cardinality violation (2>1)
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,11 +85,11 @@ Ready.
# 11:07:50 >
Operation successful
-+------------------------------------------------------------------------------------------------------+
++----------------------------------------------------------------------------------------------------------+
| mal |
-+======================================================================================================+
++==========================================================================================================+
| function user.s4_1():void;
|
-| X_56:void := querylog.define("explain select \"name\" from
\"tables\"\n;","sequential_pipe",34); |
+| X_56:void := querylog.define("explain select \"name\" from
\"tables\"\n;","sequential_pipe",34:int); |
| X_40 := bat.new(nil:str);
|
| X_46 := bat.append(X_40,".tables");
|
| X_41 := bat.new(nil:str);
|
@@ -97,54 +97,54 @@ Operation successful
| 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);
|
+| X_52 := bat.append(X_43,1024:int);
|
| X_45 := bat.new(nil:int);
|
-| X_54 := bat.append(X_45,0);
|
+| 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);
|
+| X_17:bat[:sht] := sql.bind(X_3,"sys","_tables","type",0:int);
|
| C_4:bat[:oid] := sql.tid(X_3,"sys","_tables");
|
-| C_67 := algebra.subselect(X_17,C_4,2,2,true,true,true);
|
-| (C_20:bat[:oid],X_21:bat[:sht]) :=
sql.bind(X_3,"sys","_tables","type",2); |
-| C_68 := algebra.subselect(X_21,nil:bat[:oid],2,2,true,true,true);
|
-| X_19:bat[:sht] := sql.bind(X_3,"sys","_tables","type",1);
|
-| C_70 := algebra.subselect(X_19,C_4,2,2,true,true,true);
|
+| C_67 := 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_68 :=
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_70 := algebra.subselect(X_19,C_4,2:sht,2:sht,true,true,true);
|
| C_26 := sql.subdelta(C_67,C_4,C_20,C_68,C_70);
|
-| X_7:bat[:str] := sql.bind(X_3,"sys","_tables","name",0);
|
-| (C_12:bat[:oid],X_13:bat[:str]) :=
sql.bind(X_3,"sys","_tables","name",2); |
-| X_10:bat[:str] := sql.bind(X_3,"sys","_tables","name",1);
|
+| 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);
|
+| 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);
|
| # 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=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
|
+| #inline actions= 0 time=1 usec
|
+| #remap actions= 0 time=3 usec
|
+| #costmodel actions= 1 time=2 usec
|
+| #coercion actions= 1 time=6 usec
|
+| #evaluate actions= 0 time=3 usec
|
+| #emptybind actions= 0 time=8 usec
|
+| #pushselect actions= 5 time=29 usec
|
+| #aliases actions= 2 time=8 usec
|
+| #mergetable actions= 0 time=32 usec
|
+| #deadcode actions= 3 time=7 usec
|
+| #aliases actions= 0 time=5 usec
|
+| #constants actions= 5 time=7 usec
|
+| #commonTerms actions= 0 time=6 usec
|
+| #projectionpath actions= 0 time=3 usec
|
+| #reorder actions= 1 time=25 usec
|
+| #deadcode actions= 0 time=6 usec
|
+| #reduce actions=30 time=10 usec
|
+| #matpack actions= 0 time=2 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
|
-+------------------------------------------------------------------------------------------------------+
+| #profiler actions= 1 time=3 usec
|
+| #candidates actions= 1 time=2 usec
|
+| #garbagecollector actions= 1 time=16 usec
|
++----------------------------------------------------------------------------------------------------------+
56 rows
# 15:15:37 >
diff --git
a/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
b/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
---
a/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
+++
b/sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
@@ -18,7 +18,7 @@ QUERY = select count(*)
group by col2
order by row_count desc, col1
) sq;
-
+ERROR = !syntax error, unexpected ORDER, expecting UNION or EXCEPT or
INTERSECT or ')' in: "select count(*)
!from (
!select col2, count(*) as row_count
!from data_1to10
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,60 +43,60 @@ Ready.
+--------------------------------------------------------------------+
18 rows
Operation successful
-+--------------------------------------------------------------------------------------------------+
++------------------------------------------------------------------------------------------------------+
| mal |
-+==================================================================================================+
++======================================================================================================+
| function user.s4_1():void;
|
-| X_50:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",28); |
+| X_50:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",28: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);
|
+| X_17:bat[:sht] := sql.bind(X_3,"sys","_tables","type",0:int);
|
| C_4:bat[:oid] := sql.tid(X_3,"sys","_tables");
|
-| C_61 := algebra.subselect(X_17,C_4,2,2,true,true,true);
|
-| (C_20:bat[:oid],X_21:bat[:sht]) :=
sql.bind(X_3,"sys","_tables","type",2); |
-| C_62 := algebra.subselect(X_21,nil:bat[:oid],2,2,true,true,true);
|
-| X_19:bat[:sht] := sql.bind(X_3,"sys","_tables","type",1);
|
-| C_64 := algebra.subselect(X_19,C_4,2,2,true,true,true);
|
+| C_61 := 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_62 :=
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_64 := algebra.subselect(X_19,C_4,2:sht,2:sht,true,true,true);
|
| C_26 := sql.subdelta(C_61,C_4,C_20,C_62,C_64);
|
-| X_7:bat[:int] := sql.bind(X_3,"sys","_tables","id",0);
|
-| (C_12:bat[:oid],X_13:bat[:int]) := sql.bind(X_3,"sys","_tables","id",2);
|
-| X_10:bat[:int] := sql.bind(X_3,"sys","_tables","id",1);
|
+| 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);
|
+| 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);
|
| # querylog.define("explain select count(*) from
tables\n;","sequential_pipe") |
-| sql.resultSet(".L41","L40","bigint",64,0,7,X_42);
|
+| sql.resultSet(".L41","L40","bigint",64:int,0:int,7:int,X_42);
|
| end user.s4_1;
|
| #inline actions= 0 time=1 usec
|
-| #remap actions= 0 time=3 usec
|
-| #costmodel actions= 1 time=2 usec
|
+| #remap actions= 0 time=2 usec
|
+| #costmodel actions= 1 time=1 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
|
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
