Changeset: 6703e467393a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6703e467393a
Modified Files:
sql/benchmarks/ATIS/Tests/select_group.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
Branch: resultset
Log Message:
approved 64-bit integer output
diffs (145 lines):
diff --git a/sql/benchmarks/ATIS/Tests/select_group.stable.out
b/sql/benchmarks/ATIS/Tests/select_group.stable.out
--- a/sql/benchmarks/ATIS/Tests/select_group.stable.out
+++ b/sql/benchmarks/ATIS/Tests/select_group.stable.out
@@ -67,7 +67,7 @@ Ready.
% sys.L1 # table_name
% L1 # name
% decimal # type
-% 40 # length
+% 20 # length
[ 278 ]
#select avg(engines) from aircraft;
% sys.L1 # table_name
diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
@@ -46,7 +46,27 @@ project (
% clob # type
% 142 # length
function user.s4_1(A0:lng,A1:bte):void;
- X_44:void := querylog.define("explain select a as d, sum(b), (2 * (sum(b)
/ (select 2))) as f from dbg group by d;","sequential_pipe",23);
+ X_60:void := querylog.define("explain select a as d, sum(b), (2 * (sum(b)
/ (select 2))) as f from dbg group by d;","sequential_pipe",38);
+ X_26 := bat.new(nil:oid,nil:str);
+ X_34 := bat.append(X_26,"sys.dbg");
+ X_44 := bat.append(X_34,"sys.L1");
+ X_53 := bat.append(X_44,".L3");
+ X_29 := bat.new(nil:oid,nil:str);
+ X_36 := bat.append(X_29,"d");
+ X_46 := bat.append(X_36,"L1");
+ X_55 := bat.append(X_46,"f");
+ X_30 := bat.new(nil:oid,nil:str);
+ X_38 := bat.append(X_30,"int");
+ X_48 := bat.append(X_38,"bigint");
+ X_57 := bat.append(X_48,"bigint");
+ X_31 := bat.new(nil:oid,nil:int);
+ X_40 := bat.append(X_31,32);
+ X_50 := bat.append(X_40,64);
+ X_58 := bat.append(X_50,64);
+ X_33 := bat.new(nil:oid,nil:int);
+ X_42 := bat.append(X_33,0);
+ X_52 := bat.append(X_42,0);
+ X_59 := bat.append(X_52,0);
X_3 := sql.mvc();
X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","dbg");
X_7:bat[:oid,:int] := sql.bind(X_3,"sys","dbg","a",0);
@@ -61,12 +81,7 @@ function user.s4_1(A0:lng,A1:bte):void;
X_22 := batcalc.lng(X_21);
X_23:bat[:oid,:lng] := batcalc./(X_18,X_22);
X_24:bat[:oid,:lng] := batcalc.*(A0,X_23);
- X_25 := sql.resultSet(3,1,X_14);
- sql.rsColumn(X_25,"sys.dbg","d","int",32,0,X_14);
- sql.rsColumn(X_25,"sys.L1","L1","bigint",64,0,X_18);
- sql.rsColumn(X_25,".L3","f","bigint",64,0,X_24);
- X_42 := io.stdout();
- sql.exportResult(X_42,X_25);
+ sql.resultSet(X_53,X_55,X_57,X_58,X_59,X_14,X_18,X_24);
end user.s4_1;
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
@@ -99,7 +114,27 @@ project (
% clob # type
% 147 # length
function user.s10_1(A0:lng,A1:bte):void;
- X_44:void := querylog.define("explain select a as d, sum(b) as e, (2 *
(sum(b) / (select 2))) as f from dbg group by d;","sequential_pipe",23);
+ X_60:void := querylog.define("explain select a as d, sum(b) as e, (2 *
(sum(b) / (select 2))) as f from dbg group by d;","sequential_pipe",38);
+ X_26 := bat.new(nil:oid,nil:str);
+ X_34 := bat.append(X_26,"sys.dbg");
+ X_44 := bat.append(X_34,"sys.L1");
+ X_53 := bat.append(X_44,".L3");
+ X_29 := bat.new(nil:oid,nil:str);
+ X_36 := bat.append(X_29,"d");
+ X_46 := bat.append(X_36,"e");
+ X_55 := bat.append(X_46,"f");
+ X_30 := bat.new(nil:oid,nil:str);
+ X_38 := bat.append(X_30,"int");
+ X_48 := bat.append(X_38,"bigint");
+ X_57 := bat.append(X_48,"bigint");
+ X_31 := bat.new(nil:oid,nil:int);
+ X_40 := bat.append(X_31,32);
+ X_50 := bat.append(X_40,64);
+ X_58 := bat.append(X_50,64);
+ X_33 := bat.new(nil:oid,nil:int);
+ X_42 := bat.append(X_33,0);
+ X_52 := bat.append(X_42,0);
+ X_59 := bat.append(X_52,0);
X_3 := sql.mvc();
X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","dbg");
X_7:bat[:oid,:int] := sql.bind(X_3,"sys","dbg","a",0);
@@ -114,12 +149,7 @@ function user.s10_1(A0:lng,A1:bte):void;
X_22 := batcalc.lng(X_21);
X_23:bat[:oid,:lng] := batcalc./(X_18,X_22);
X_24:bat[:oid,:lng] := batcalc.*(A0,X_23);
- X_25 := sql.resultSet(3,1,X_14);
- sql.rsColumn(X_25,"sys.dbg","d","int",32,0,X_14);
- sql.rsColumn(X_25,"sys.L1","e","bigint",64,0,X_18);
- sql.rsColumn(X_25,".L3","f","bigint",64,0,X_24);
- X_42 := io.stdout();
- sql.exportResult(X_42,X_25);
+ sql.resultSet(X_53,X_55,X_57,X_58,X_59,X_14,X_18,X_24);
end user.s10_1;
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b) as e, (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
@@ -46,8 +46,23 @@ 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",26);
-barrier X_50 := language.dataflow();
+ 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",37);
+barrier X_62 := language.dataflow();
+ 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);
@@ -64,12 +79,8 @@ barrier X_50 := language.dataflow();
language.pass(X_8);
language.pass(X_2);
language.pass(X_20);
-exit X_50;
- 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);
+exit X_62;
+ sql.resultSet(X_42,X_43,X_45,X_46,X_47,X_21,X_22);
end user.s2_1;
#ROLLBACK;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
