Changeset: 034f684eacfe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=034f684eacfe
Modified Files:
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: geo
Log Message:
Merge with default branch.
diffs (147 lines):
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
@@ -44,29 +44,29 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 173 # length
+% 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_1 := sql.mvc();
X_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
- X_5 := sql.bind(X_1,"sys","treeitems","pre",0);
+ X_5:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","pre",0);
X_8 := algebra.leftfetchjoin(X_2,X_5);
X_9 := batcalc.hge(X_8);
- X_10 := sql.bind(X_1,"sys","treeitems","size",0);
+ X_10:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","size",0);
X_12 := algebra.leftfetchjoin(X_2,X_10);
X_13 := batcalc.hge(X_12);
X_14:bat[:oid,:hge] := batcalc.+(X_9,X_13);
- (X_15,r1_22) := algebra.join(X_9,X_9,X_14,true,true);
- X_18 := sql.bind(X_1,"sys","treeitems","subject",0);
- X_20 := algebra.leftfetchjoin(X_2,X_18);
- X_21 := algebra.leftfetchjoin(r1_22,X_20);
- X_22 := algebra.leftfetchjoin(X_15,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);
-end s2_1;
-# 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")
+ (X_15,r1_22) :=
algebra.subrangejoin(X_9,X_9,X_14,nil:BAT,nil:BAT,true,true,nil:lng);
+ X_20:bat[:oid,:int] := sql.bind(X_1,"sys","treeitems","subject",0);
+ 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);
+end user.s2_1;
#ROLLBACK;
# 20:18:31 >
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
@@ -44,8 +44,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 173 # length
+% 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_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);
@@ -53,18 +54,17 @@ function user.s2_1():void;
X_9:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","size",0);
X_11 := algebra.leftfetchjoin(X_2,X_9);
X_12:bat[:oid,:lng] := batcalc.+(X_8,X_11);
- (X_13,r1_18) := algebra.join(X_8,X_8,X_12,true,true);
- X_16:bat[:oid,:int] := sql.bind(X_1,"sys","treeitems","subject",0);
- X_18 := algebra.leftfetchjoin(X_2,X_16);
- X_19 := algebra.leftfetchjoin(r1_18,X_18);
- X_20 := algebra.leftfetchjoin(X_13,X_18);
- X_21 := sql.resultSet(2,1,X_19);
- sql.rsColumn(X_21,"sys.L","id1","int",32,0,X_19);
- sql.rsColumn(X_21,"sys.L","id2","int",32,0,X_20);
- X_31 := io.stdout();
- sql.exportResult(X_31,X_21);
-end s2_1;
-# 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")
+ (X_13,r1_18) :=
algebra.subrangejoin(X_8,X_8,X_12,nil:BAT,nil:BAT,true,true,nil:lng);
+ X_18:bat[:oid,:int] := sql.bind(X_1,"sys","treeitems","subject",0);
+ 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);
+end user.s2_1;
#ROLLBACK;
# 20:18:31 >
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
@@ -33,18 +33,18 @@ Ready.
#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;
% .L5, .L5 # table_name
% L2, v # name
-% bigint, decimal # type
-% 13, 20 # length
-[ 1412467200000, 42.000000000 ]
-[ 1412467200000, 43.000000000 ]
-[ 1412467200000, NULL ]
-[ 1412467200000, NULL ]
+% sec_interval, decimal # type
+% 0, 20 # length
+[ 1412467200.000, 42.000000000 ]
+[ 1412467200.000, 43.000000000 ]
+[ 1412467200.000, NULL ]
#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;
% .explain # table_name
% mal # name
% clob # type
-% 187 # length
+% 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_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");
@@ -68,16 +68,15 @@ function user.s5_1{autoCommit=true}(A0:t
X_45 := sql.delta(X_35,X_40,r1_51,X_43);
X_46 := algebra.leftfetchjoin(X_9,X_45);
X_47 := bat.append(X_32,X_46,true);
- X_48 := algebra.project(X_21,A2);
- X_49:bat[:oid,:lng] := mal.manifold("calc","lng",X_48,18,9);
- X_54 := bat.append(X_47,X_49,true);
- X_55 := sql.resultSet(2,1,X_30);
- sql.rsColumn(X_55,".L5","L2","bigint",64,0,X_30);
- sql.rsColumn(X_55,".L5","v","decimal",18,9,X_54);
- X_63 := io.stdout();
- sql.exportResult(X_63,X_55);
-end s5_1;
-# 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")
+ 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);
+end user.s5_1;
# 23:28:04 >
# 23:28:04 > "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
