Changeset: 5536c948c775 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5536c948c775
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
Branch: resultset
Log Message:
approved single-threaded output
diffs (151 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
@@ -61,11 +61,11 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 131 # length
+% 133 # length
function user.s4_1{autoCommit=true}():void;
X_26:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",10);
X_2 := sql.mvc();
- (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0);
+ (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
X_15 := sql.append(X_2,"sys","ttt","a",X_12);
X_19 := sql.append(X_15,"sys","ttt","b",X_13);
X_21 := sql.append(X_19,"sys","ttt","c",X_14);
@@ -93,11 +93,11 @@ end user.s4_1;
% .explain # table_name
% mal # name
% clob # type
-% 131 # length
+% 133 # length
function user.s12_1{autoCommit=true}():void;
X_26:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",10);
X_2 := sql.mvc();
- (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0);
+ (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
X_15 := sql.append(X_2,"sys","ttt","a",X_12);
X_19 := sql.append(X_15,"sys","ttt","b",X_13);
X_23 := aggr.count(X_14);
diff --git
a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
@@ -46,7 +46,22 @@ Ready.
% clob # type
% 192 # length
function user.s2_1():void;
- X_38:void := querylog.define("explain\nselect t1.subject as id1,
t2.subject as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between
t1.pre and t1.pre + t1.size;","default_pipe",22);
+ X_50:void := querylog.define("explain\nselect t1.subject as id1,
t2.subject as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between
t1.pre and t1.pre + t1.size;","default_pipe",33);
+ X_26 := bat.new(nil:oid,nil:str);
+ X_34 := bat.append(X_26,"sys.L");
+ X_44 := bat.append(X_34,"sys.L");
+ X_29 := bat.new(nil:oid,nil:str);
+ X_36 := bat.append(X_29,"id1");
+ X_45 := bat.append(X_36,"id2");
+ X_30 := bat.new(nil:oid,nil:str);
+ X_38 := bat.append(X_30,"int");
+ X_47 := bat.append(X_38,"int");
+ X_31 := bat.new(nil:oid,nil:int);
+ X_40 := bat.append(X_31,32);
+ X_48 := bat.append(X_40,32);
+ X_33 := bat.new(nil:oid,nil:int);
+ X_42 := bat.append(X_33,0);
+ X_49 := bat.append(X_42,0);
X_1 := sql.mvc();
X_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
X_5:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","pre",0);
@@ -61,11 +76,7 @@ function user.s2_1():void;
X_22 := algebra.leftfetchjoin(X_2,X_20);
X_23 := algebra.leftfetchjoin(r1_22,X_22);
X_24 := algebra.leftfetchjoin(X_15,X_22);
- X_25 := sql.resultSet(2,1,X_23);
- sql.rsColumn(X_25,"sys.L","id1","int",32,0,X_23);
- sql.rsColumn(X_25,"sys.L","id2","int",32,0,X_24);
- X_36 := io.stdout();
- sql.exportResult(X_36,X_25);
+ sql.resultSet(X_44,X_45,X_47,X_48,X_49,X_23,X_24);
end user.s2_1;
#ROLLBACK;
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
@@ -46,7 +46,22 @@ Ready.
% clob # type
% 192 # length
function user.s2_1():void;
- X_36:void := querylog.define("explain\nselect t1.subject as id1,
t2.subject as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between
t1.pre and t1.pre + t1.size;","default_pipe",20);
+ X_48:void := querylog.define("explain\nselect t1.subject as id1,
t2.subject as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between
t1.pre and t1.pre + t1.size;","default_pipe",31);
+ X_24 := bat.new(nil:oid,nil:str);
+ X_32 := bat.append(X_24,"sys.L");
+ X_42 := bat.append(X_32,"sys.L");
+ X_27 := bat.new(nil:oid,nil:str);
+ X_34 := bat.append(X_27,"id1");
+ X_43 := bat.append(X_34,"id2");
+ X_28 := bat.new(nil:oid,nil:str);
+ X_36 := bat.append(X_28,"int");
+ X_45 := bat.append(X_36,"int");
+ X_29 := bat.new(nil:oid,nil:int);
+ X_38 := bat.append(X_29,32);
+ X_46 := bat.append(X_38,32);
+ X_31 := bat.new(nil:oid,nil:int);
+ X_40 := bat.append(X_31,0);
+ X_47 := bat.append(X_40,0);
X_1 := sql.mvc();
X_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
X_5:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","pre",0);
@@ -59,11 +74,7 @@ function user.s2_1():void;
X_20 := algebra.leftfetchjoin(X_2,X_18);
X_21 := algebra.leftfetchjoin(r1_18,X_20);
X_22 := algebra.leftfetchjoin(X_13,X_20);
- X_23 := sql.resultSet(2,1,X_21);
- sql.rsColumn(X_23,"sys.L","id1","int",32,0,X_21);
- sql.rsColumn(X_23,"sys.L","id2","int",32,0,X_22);
- X_34 := io.stdout();
- sql.exportResult(X_34,X_23);
+ sql.resultSet(X_42,X_43,X_45,X_46,X_47,X_21,X_22);
end user.s2_1;
#ROLLBACK;
diff --git
a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
--- a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
@@ -44,7 +44,22 @@ Ready.
% clob # type
% 206 # length
function user.s5_1{autoCommit=true}(A0:timestamp,A1:timestamp,A2:void):void;
- X_63:void := querylog.define("explain select (t-(select timestamp
\\'1970-1-1\\')),v from foo_nil_2dec union all select (t-(select timestamp
\\'1970-1-1\\')),null from foo_nil_2dec;","default_pipe",34);
+ X_78:void := querylog.define("explain select (t-(select timestamp
\\'1970-1-1\\')),v from foo_nil_2dec union all select (t-(select timestamp
\\'1970-1-1\\')),null from foo_nil_2dec;","default_pipe",45);
+ X_54 := bat.new(nil:oid,nil:str);
+ X_61 := bat.append(X_54,".L5");
+ X_71 := bat.append(X_61,".L5");
+ X_56 := bat.new(nil:oid,nil:str);
+ X_63 := bat.append(X_56,"L2");
+ X_72 := bat.append(X_63,"v");
+ X_57 := bat.new(nil:oid,nil:str);
+ X_65 := bat.append(X_57,"sec_interval");
+ X_74 := bat.append(X_65,"decimal");
+ X_58 := bat.new(nil:oid,nil:int);
+ X_67 := bat.append(X_58,19);
+ X_76 := bat.append(X_67,18);
+ X_60 := bat.new(nil:oid,nil:int);
+ X_69 := bat.append(X_60,0);
+ X_77 := bat.append(X_69,9);
X_6:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
X_5 := sql.mvc();
X_9:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec");
@@ -71,11 +86,7 @@ function user.s5_1{autoCommit=true}(A0:t
X_48 := sql.single(nil:lng);
X_49:bat[:oid,:lng] := batcalc.lng(X_48,18,9);
X_52 := bat.append(X_47,X_49,true);
- X_53 := sql.resultSet(2,1,X_30);
- sql.rsColumn(X_53,".L5","L2","sec_interval",19,0,X_30);
- sql.rsColumn(X_53,".L5","v","decimal",18,9,X_52);
- X_61 := io.stdout();
- sql.exportResult(X_61,X_53);
+ sql.resultSet(X_71,X_72,X_74,X_76,X_77,X_30,X_52);
end user.s5_1;
# 23:28:04 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
