Changeset: 7e191303bef7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7e191303bef7
Modified Files:
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: resultset
Log Message:
approved output
diffs (truncated from 730 to 300 lines):
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
-% 98 # length
+% 100 # length
function user.s3_1{autoCommit=true}(A0:dbl):void;
- X_36:void := querylog.define("explain select power(x,2) from
sf_2596114;","sequential_pipe");
+ X_36:void := querylog.define("explain select power(x,2) from
sf_2596114;","sequential_pipe",22);
X_19 := bat.new(nil:oid,nil:str);
X_27 := bat.append(X_19,"sys.L");
X_22 := bat.new(nil:oid,nil:str);
@@ -54,9 +54,9 @@ end user.s3_1;
% .explain # table_name
% mal # name
% clob # type
-% 91 # length
+% 93 # length
function user.s4_1{autoCommit=true}():void;
- X_35:void := querylog.define("explain select x*x from
sf_2596114;","sequential_pipe");
+ X_35:void := querylog.define("explain select x*x from
sf_2596114;","sequential_pipe",22);
X_18 := bat.new(nil:oid,nil:str);
X_26 := bat.append(X_18,"sys.L");
X_21 := bat.new(nil:oid,nil:str);
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
@@ -28,13 +28,13 @@ Ready.
% .plan # table_name
% rel # name
% clob # type
-% 198 # length
+% 180 # length
insert(
| table(sys.cm_tmp) [ cm_tmp.i, cm_tmp.%TID% NOT NULL ]
| union (
-| | table sys.copyfrom(varchar "sys", varchar "cm_tmp", varchar "|", varchar
"\n", varchar "NULL", varchar "null", varchar "/file1", bigint "-1", bigint
"0", int "0", int "0"), [ cm_tmp.i ] COUNT ,
-| | table sys.copyfrom(varchar "sys", varchar "cm_tmp", varchar "|", varchar
"\n", varchar "NULL", varchar "null", varchar "/file2", bigint "-1", bigint
"0", int "0", int "0"), [ cm_tmp.i ] COUNT
-| ) [ ]
+| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "/file1", bigint "-1", bigint "0", int "0", int
"0"), [ cm_tmp.i ] COUNT ,
+| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "/file2", bigint "-1", bigint "0", int "0", int
"0"), [ cm_tmp.i ] COUNT
+| ) [ int "NULL" ]
)
# 08:59:53 >
diff --git
a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
--- a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
+++ b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
@@ -128,9 +128,9 @@ top N (
% .explain # table_name
% mal # name
% clob # type
-% 80 # length
+% 82 # length
function user.s4_1{autoCommit=true}():void;
- X_33:void := querylog.define("explain select * from
oblo;","minimal_pipe");
+ X_33:void := querylog.define("explain select * from
oblo;","minimal_pipe",21);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
@@ -154,9 +154,9 @@ end user.s4_1;
% .explain # table_name
% mal # name
% clob # type
-% 89 # length
+% 91 # length
function user.s5_1{autoCommit=true}():void;
- X_42:void := querylog.define("explain select * from oblo offset
2;","minimal_pipe");
+ X_42:void := querylog.define("explain select * from oblo offset
2;","minimal_pipe",27);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
@@ -164,7 +164,7 @@ function user.s5_1{autoCommit=true}():vo
X_12:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",1);
X_14 := sql.delta(X_6,X_9,r1_9,X_12);
X_15 := algebra.leftfetchjoin(X_3,X_14);
- X_16 := calc.wrd(2:wrd);
+ X_16 := calc.wrd(2);
X_18 := calc.wrd(nil:wrd);
X_20 := calc.+(X_16,X_18);
X_21 := calc.-(X_20,1);
@@ -186,9 +186,9 @@ end user.s5_1;
% .explain # table_name
% mal # name
% clob # type
-% 88 # length
+% 90 # length
function user.s6_1{autoCommit=true}():void;
- X_42:void := querylog.define("explain select * from oblo limit
2;","minimal_pipe");
+ X_42:void := querylog.define("explain select * from oblo limit
2;","minimal_pipe",27);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
@@ -196,8 +196,8 @@ function user.s6_1{autoCommit=true}():vo
X_12:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",1);
X_14 := sql.delta(X_6,X_9,r1_9,X_12);
X_15 := algebra.leftfetchjoin(X_3,X_14);
- X_16 := calc.wrd(0:wrd);
- X_18 := calc.wrd(2:wrd);
+ X_16 := calc.wrd(0);
+ X_18 := calc.wrd(2);
X_20 := calc.+(X_16,X_18);
X_21 := calc.-(X_20,1);
X_22 := algebra.subslice(X_15,X_16,X_21);
@@ -218,9 +218,9 @@ end user.s6_1;
% .explain # table_name
% mal # name
% clob # type
-% 97 # length
+% 99 # length
function user.s7_1{autoCommit=true}():void;
- X_42:void := querylog.define("explain select * from oblo limit 1 offset
2;","minimal_pipe");
+ X_42:void := querylog.define("explain select * from oblo limit 1 offset
2;","minimal_pipe",27);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
@@ -228,8 +228,8 @@ function user.s7_1{autoCommit=true}():vo
X_12:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",1);
X_14 := sql.delta(X_6,X_9,r1_9,X_12);
X_15 := algebra.leftfetchjoin(X_3,X_14);
- X_16 := calc.wrd(2:wrd);
- X_18 := calc.wrd(1:wrd);
+ X_16 := calc.wrd(2);
+ X_18 := calc.wrd(1);
X_20 := calc.+(X_16,X_18);
X_21 := calc.-(X_20,1);
X_22 := algebra.subslice(X_15,X_16,X_21);
@@ -250,9 +250,9 @@ end user.s7_1;
% .explain # table_name
% mal # name
% clob # type
-% 97 # length
+% 99 # length
function user.s8_1{autoCommit=true}():void;
- X_42:void := querylog.define("explain select * from oblo limit 2 offset
1;","minimal_pipe");
+ X_42:void := querylog.define("explain select * from oblo limit 2 offset
1;","minimal_pipe",27);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
@@ -260,8 +260,8 @@ function user.s8_1{autoCommit=true}():vo
X_12:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",1);
X_14 := sql.delta(X_6,X_9,r1_9,X_12);
X_15 := algebra.leftfetchjoin(X_3,X_14);
- X_16 := calc.wrd(1:wrd);
- X_18 := calc.wrd(2:wrd);
+ X_16 := calc.wrd(1);
+ X_18 := calc.wrd(2);
X_20 := calc.+(X_16,X_18);
X_21 := calc.-(X_20,1);
X_22 := algebra.subslice(X_15,X_16,X_21);
@@ -282,9 +282,9 @@ end user.s8_1;
% .explain # table_name
% mal # name
% clob # type
-% 91 # length
+% 93 # length
function user.s9_1{autoCommit=true}():void;
- X_38:void := querylog.define("explain select * from oblo order by
a;","minimal_pipe");
+ X_38:void := querylog.define("explain select * from oblo order by
a;","minimal_pipe",23);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
@@ -310,9 +310,9 @@ end user.s9_1;
% .explain # table_name
% mal # name
% clob # type
-% 100 # length
+% 102 # length
function user.s10_1{autoCommit=true}():void;
- X_48:void := querylog.define("explain select * from oblo order by a
offset 2;","minimal_pipe");
+ X_48:void := querylog.define("explain select * from oblo order by a offset
2;","minimal_pipe",29);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
@@ -322,7 +322,7 @@ function user.s10_1{autoCommit=true}():v
X_15 := algebra.leftfetchjoin(X_3,X_14);
(X_16,r1_16,r2_16) := algebra.subsort(X_15,false,false);
X_20 := algebra.leftfetchjoin(r1_16,X_15);
- X_21 := calc.wrd(2:wrd);
+ X_21 := calc.wrd(2);
X_23 := calc.wrd(nil:wrd);
X_25 := calc.+(X_21,X_23);
X_26 := calc.-(X_25,1);
@@ -344,9 +344,9 @@ end user.s10_1;
% .explain # table_name
% mal # name
% clob # type
-% 99 # length
+% 101 # length
function user.s11_1{autoCommit=true}():void;
- X_53:void := querylog.define("explain select * from oblo order by a limit
2;","minimal_pipe");
+ X_53:void := querylog.define("explain select * from oblo order by a limit
2;","minimal_pipe",34);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
@@ -354,15 +354,15 @@ function user.s11_1{autoCommit=true}():v
X_12:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",1);
X_14 := sql.delta(X_6,X_9,r1_9,X_12);
X_15 := algebra.leftfetchjoin(X_3,X_14);
- X_16 := calc.wrd(0:wrd);
- X_18 := calc.wrd(2:wrd);
+ X_16 := calc.wrd(0);
+ X_18 := calc.wrd(2);
X_20 := calc.+(X_16,X_18);
X_21 := algebra.firstn(X_15,X_20,true,false);
X_23 := algebra.leftfetchjoin(X_21,X_15);
(X_24,r1_24,r2_24) := algebra.subsort(X_23,false,false);
X_27 := algebra.leftfetchjoin(r1_24,X_23);
- X_28 := calc.wrd(0:wrd);
- X_29 := calc.wrd(2:wrd);
+ X_28 := calc.wrd(0);
+ X_29 := calc.wrd(2);
X_30 := calc.+(X_28,X_29);
X_31 := calc.-(X_30,1);
X_32 := algebra.subslice(X_27,X_28,X_31);
@@ -383,9 +383,9 @@ end user.s11_1;
% .explain # table_name
% mal # name
% clob # type
-% 108 # length
+% 110 # length
function user.s12_1{autoCommit=true}():void;
- X_56:void := querylog.define("explain select * from oblo order by a limit
2 offset 1;","minimal_pipe");
+ X_56:void := querylog.define("explain select * from oblo order by a limit
2 offset 1;","minimal_pipe",36);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
@@ -393,17 +393,17 @@ function user.s12_1{autoCommit=true}():v
X_12:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",1);
X_14 := sql.delta(X_6,X_9,r1_9,X_12);
X_15 := algebra.leftfetchjoin(X_3,X_14);
- X_16 := calc.wrd(0:wrd);
- X_18 := calc.wrd(2:wrd);
- X_20 := calc.wrd(1:wrd);
+ X_16 := calc.wrd(0);
+ X_18 := calc.wrd(2);
+ X_20 := calc.wrd(1);
X_22 := calc.+(X_18,X_20);
X_23 := calc.+(X_16,X_22);
X_24 := algebra.firstn(X_15,X_23,true,false);
X_26 := algebra.leftfetchjoin(X_24,X_15);
(X_27,r1_27,r2_27) := algebra.subsort(X_26,false,false);
X_30 := algebra.leftfetchjoin(r1_27,X_26);
- X_31 := calc.wrd(1:wrd);
- X_32 := calc.wrd(2:wrd);
+ X_31 := calc.wrd(1);
+ X_32 := calc.wrd(2);
X_33 := calc.+(X_31,X_32);
X_34 := calc.-(X_33,1);
X_35 := algebra.subslice(X_30,X_31,X_34);
@@ -424,9 +424,9 @@ end user.s12_1;
% .explain # table_name
% mal # name
% clob # type
-% 108 # length
+% 110 # length
function user.s13_1{autoCommit=true}():void;
- X_56:void := querylog.define("explain select * from oblo order by a limit
1 offset 2;","minimal_pipe");
+ X_56:void := querylog.define("explain select * from oblo order by a limit
1 offset 2;","minimal_pipe",36);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
@@ -434,17 +434,17 @@ function user.s13_1{autoCommit=true}():v
X_12:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",1);
X_14 := sql.delta(X_6,X_9,r1_9,X_12);
X_15 := algebra.leftfetchjoin(X_3,X_14);
- X_16 := calc.wrd(0:wrd);
- X_18 := calc.wrd(1:wrd);
- X_20 := calc.wrd(2:wrd);
+ X_16 := calc.wrd(0);
+ X_18 := calc.wrd(1);
+ X_20 := calc.wrd(2);
X_22 := calc.+(X_18,X_20);
X_23 := calc.+(X_16,X_22);
X_24 := algebra.firstn(X_15,X_23,true,false);
X_26 := algebra.leftfetchjoin(X_24,X_15);
(X_27,r1_27,r2_27) := algebra.subsort(X_26,false,false);
X_30 := algebra.leftfetchjoin(r1_27,X_26);
- X_31 := calc.wrd(2:wrd);
- X_32 := calc.wrd(1:wrd);
+ X_31 := calc.wrd(2);
+ X_32 := calc.wrd(1);
X_33 := calc.+(X_31,X_32);
X_34 := calc.-(X_33,1);
X_35 := algebra.subslice(X_30,X_31,X_34);
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
--- a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
+++ b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
@@ -38,9 +38,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 111 # length
+% 113 # length
function user.s5_1{autoCommit=true}():void;
- X_60:void := querylog.define("explain select count(*) from t2564 group by
c1, c2, c3;","sequential_pipe");
+ X_60:void := querylog.define("explain select count(*) from t2564 group by
c1, c2, c3;","sequential_pipe",35);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
