date:20150322

MonetDB: resultset - partial update got lost (??)

2015-03-22 Thread Niels Nes

Changeset: 57005faf057d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57005faf057d
Modified Files:
gdk/gdk.h
Branch: resultset
Log Message:

partial update got lost (??)
ie removed BUNdelHead interface from gdk.h


diffs (20 lines):

diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1314,7 +1314,6 @@ gdk_export gdk_return BUNdel(BAT *b, con
 gdk_export gdk_return BUNdelHead(BAT *b, const void *left, bit force);
 gdk_export BUN BUNdelete(BAT *b, BUN p, bit force);
 gdk_export gdk_return BATdel(BAT *b, BAT *c, bit force);
-gdk_export BAT *BATdelHead(BAT *b, BAT *c, bit force);
 
 gdk_export gdk_return BUNreplace(BAT *b, const void *left, const void *right, 
bit force);
 gdk_export gdk_return BUNinplace(BAT *b, BUN p, const void *left, const void 
*right, bit force);
@@ -1575,7 +1574,7 @@ gdk_export size_t BATmemsize(BAT *b, int
 #define NOFARM (-1) /* indicate to GDKfilepath to create relative path */
 
 gdk_export char *GDKfilepath(int farmid, const char *dir, const char *nme, 
const char *ext);
-gdk_export gdk_return  GDKcreatedir(const char *nme);
+gdk_export gdk_return GDKcreatedir(const char *nme);
 
 /*
  * @- Printing
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: notepad - Merge from default branch.

2015-03-22 Thread Stefan Manegold

Changeset: a057726e40b5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a057726e40b5
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit

sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32
Branch: notepad
Log Message:

Merge from default branch.


diffs (294 lines):

diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit 
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
@@ -52,90 +52,89 @@ Ready.
 % clob # type
 % 622 # length
 function user.s2_1{autoCommit=true}(A0:bte,A1:bte,A2:bte,A3:date,A4:lng):void;
-X_165:void := querylog.define(explain 
select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as 
sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1 
- l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) * 
(1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as 
avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as 
avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate = 
date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup 
by\n\tl_returnflag,\n\tl_linestatus\norder 
by\n\tl_returnflag,\n\tl_linestatus;,sequential_pipe,86);
+X_165:void := querylog.define(explain 
select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as 
sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1 
- l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) * 
(1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as 
avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as 
avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate = 
date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup 
by\n\tl_returnflag,\n\tl_linestatus\norder 
by\n\tl_returnflag,\n\tl_linestatus;,sequential_pipe,85);
 X_7 := sql.mvc();
-X_11:bat[:oid,:date]  := sql.bind(X_7,sys,lineitem,l_shipdate,0);
-X_8:bat[:oid,:oid]  := sql.tid(X_7,sys,lineitem);
+X_11:bat[:oid,:date] := sql.bind(X_7,sys,lineitem,l_shipdate,0);
+X_8:bat[:oid,:oid] := sql.tid(X_7,sys,lineitem);
 X_19 := mtime.date_sub_msec_interval(A3,A4);
 X_184 := algebra.thetasubselect(X_11,X_8,X_19,=);
 (X_14,r1_14) := sql.bind(X_7,sys,lineitem,l_shipdate,2);
 X_185 := algebra.thetasubselect(r1_14,nil:bat[:oid,:oid],X_19,=);
-X_17:bat[:oid,:date]  := sql.bind(X_7,sys,lineitem,l_shipdate,1);
+X_17:bat[:oid,:date] := sql.bind(X_7,sys,lineitem,l_shipdate,1);
 X_187 := algebra.thetasubselect(X_17,X_8,X_19,=);
 X_20 := sql.subdelta(X_184,X_8,X_14,X_185,X_187);
-X_22:bat[:oid,:str]  := sql.bind(X_7,sys,lineitem,l_linestatus,0);
+X_22:bat[:oid,:str] := sql.bind(X_7,sys,lineitem,l_linestatus,0);
 (X_24,r1_28) := sql.bind(X_7,sys,lineitem,l_linestatus,2);
-X_26:bat[:oid,:str]  := sql.bind(X_7,sys,lineitem,l_linestatus,1);
+X_26:bat[:oid,:str] := sql.bind(X_7,sys,lineitem,l_linestatus,1);
 X_27 := sql.projectdelta(X_20,X_22,X_24,r1_28,X_26);
-X_28:bat[:oid,:str]  := sql.bind(X_7,sys,lineitem,l_returnflag,0);
+X_28:bat[:oid,:str] := sql.bind(X_7,sys,lineitem,l_returnflag,0);
 (X_30,r1_36) := sql.bind(X_7,sys,lineitem,l_returnflag,2);
-X_32:bat[:oid,:str]  := sql.bind(X_7,sys,lineitem,l_returnflag,1);
+X_32:bat[:oid,:str] := sql.bind(X_7,sys,lineitem,l_returnflag,1);
 X_33 := sql.projectdelta(X_20,X_28,X_30,r1_36,X_32);
 (X_34,r1_42,r2_42) := group.subgroup(X_33);
 (X_37,r1_45,r2_45) := group.subgroupdone(X_27,X_34);
 X_40 := algebra.leftfetchjoin(r1_45,X_27);
 X_41 := algebra.leftfetchjoin(r1_45,X_33);
-X_51:bat[:oid,:int]  := sql.bind(X_7,sys,lineitem,l_quantity,0);
+X_51:bat[:oid,:int] := sql.bind(X_7,sys,lineitem,l_quantity,0);
 (X_56,r1_64) := sql.bind(X_7,sys,lineitem,l_quantity,2);
-X_59:bat[:oid,:int]  := sql.bind(X_7,sys,lineitem,l_quantity,1);
+X_59:bat[:oid,:int] := sql.bind(X_7,sys,lineitem,l_quantity,1);
 X_61 := sql.projectdelta(X_20,X_51,X_56,r1_64,X_59);
-X_62:bat[:oid,:lng]  := aggr.subsum(X_61,X_37,r1_45,true,true);
-X_65:bat[:oid,:lng]  := sql.bind(X_7,sys,lineitem,l_extendedprice,0);
+X_62:bat[:oid,:lng] := aggr.subsum(X_61,X_37,r1_45,true,true);
+X_65:bat[:oid,:lng] := sql.bind(X_7,sys,lineitem,l_extendedprice,0);
 (X_67,r1_77) := sql.bind(X_7,sys,lineitem,l_extendedprice,2);
-X_69:bat[:oid,:lng]  := sql.bind(X_7,sys,lineitem,l_extendedprice,1);
+X_69:bat[:oid,:lng] := sql.bind(X_7,sys,lineitem,l_extendedprice,1);
 X_70 := sql.projectdelta(X_20,X_65,X_67,r1_77,X_69);
-X_71:bat[:oid,:lng]  := aggr.subsum(X_70,X_37,r1_45,true,true);
+X_71:bat[:oid,:lng] := aggr.subsum(X_70,X_37,r1_45,true,true);
 X_73 := calc.lng(A0,15,2);
-X_75:bat[:oid,:lng]  :=

MonetDB: Oct2014 - TPCH: approved 32-bit MAL plans

2015-03-22 Thread Stefan Manegold

Changeset: 35dd891a5d01 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=35dd891a5d01
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
Branch: Oct2014
Log Message:

TPCH: approved 32-bit MAL plans


diffs (65 lines):

diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit 
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
@@ -56,12 +56,12 @@ function user.s2_1{autoCommit=true}(A0:b
 X_11:bat[:oid,:date]  := sql.bind(X_7,sys,lineitem,l_shipdate,0);
 X_8:bat[:oid,:oid]  := sql.tid(X_7,sys,lineitem);
 X_19 := mtime.date_sub_msec_interval(A3,A4);
-X_184 := algebra.thetasubselect(X_11,X_8,X_19,=);
+X_185 := algebra.thetasubselect(X_11,X_8,X_19,=);
 (X_14,r1_14) := sql.bind(X_7,sys,lineitem,l_shipdate,2);
-X_185 := algebra.thetasubselect(r1_14,X_19,=);
+X_186 := algebra.thetasubselect(r1_14,X_19,=);
 X_17:bat[:oid,:date]  := sql.bind(X_7,sys,lineitem,l_shipdate,1);
-X_186 := algebra.thetasubselect(X_17,X_8,X_19,=);
-X_20 := sql.subdelta(X_184,X_8,X_14,X_185,X_186);
+X_187 := algebra.thetasubselect(X_17,X_8,X_19,=);
+X_20 := sql.subdelta(X_185,X_8,X_14,X_186,X_187);
 X_22:bat[:oid,:str]  := sql.bind(X_7,sys,lineitem,l_linestatus,0);
 (X_24,r1_28) := sql.bind(X_7,sys,lineitem,l_linestatus,2);
 X_26:bat[:oid,:str]  := sql.bind(X_7,sys,lineitem,l_linestatus,1);
@@ -125,7 +125,7 @@ function user.s2_1{autoCommit=true}(A0:b
 X_117 := sql.resultSet(10,1,X_49);
 sql.rsColumn(X_117,sys.lineitem,l_returnflag,varchar,1,0,X_49);
 sql.rsColumn(X_117,sys.lineitem,l_linestatus,varchar,1,0,X_50);
-sql.rsColumn(X_117,sys.L1,sum_qty,bigint,32,0,X_64);
+sql.rsColumn(X_117,sys.L1,sum_qty,bigint,64,0,X_64);
 sql.rsColumn(X_117,sys.L2,sum_base_price,decimal,15,2,X_72);
 sql.rsColumn(X_117,sys.L3,sum_disc_price,decimal,19,4,X_86);
 sql.rsColumn(X_117,sys.L4,sum_charge,decimal,19,6,X_104);
@@ -133,8 +133,8 @@ function user.s2_1{autoCommit=true}(A0:b
 sql.rsColumn(X_117,sys.L6,avg_price,double,53,0,X_110);
 sql.rsColumn(X_117,sys.L7,avg_disc,double,53,0,X_113);
 sql.rsColumn(X_117,sys.L10,count_order,wrd,32,0,X_116);
-X_163 := io.stdout();
-sql.exportResult(X_163,X_117);
+X_164 := io.stdout();
+sql.exportResult(X_164,X_117);
 end s2_1;
 # querylog.define(explain 
select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as 
sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1 
- l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) * 
(1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as 
avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as 
avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate = 
date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup 
by\n\tl_returnflag,\n\tl_linestatus\norder 
by\n\tl_returnflag,\n\tl_linestatus;,sequential_pipe)
 
diff --git a/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit 
b/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
@@ -108,18 +108,18 @@ function user.s2_1{autoCommit=true}(A0:s
 X_75 := algebra.leftfetchjoin(X_67,X_74);
 X_76 := mtime.addmonths(A3,A4);
 X_77 := algebra.subselect(X_75,A2,X_76,true,false,false);
-X_275 := algebra.leftfetchjoin(X_77,X_67);
+X_274 := algebra.leftfetchjoin(X_77,X_67);
 X_80:bat[:oid,:int]  := sql.bind(X_8,sys,lineitem,l_partkey,0);
 (X_84,r1_91) := sql.bind(X_8,sys,lineitem,l_partkey,2);
 X_87:bat[:oid,:int]  := sql.bind(X_8,sys,lineitem,l_partkey,1);
 X_89 := sql.delta(X_80,X_84,r1_91,X_87);
-X_90:bat[:oid,:int]  := algebra.leftfetchjoin(X_275,X_89);
+X_90:bat[:oid,:int]  := algebra.leftfetchjoin(X_274,X_89);
 X_91:bat[:oid,:wrd]  := batmkey.hash(X_90);
 X_93:bat[:oid,:int]  := sql.bind(X_8,sys,lineitem,l_suppkey,0);
 (X_96,r1_107) := sql.bind(X_8,sys,lineitem,l_suppkey,2);
 X_98:bat[:oid,:int]  := sql.bind(X_8,sys,lineitem,l_suppkey,1);
 X_99 := sql.delta(X_93,X_96,r1_107,X_98);
-X_100:bat[:oid,:int]  := algebra.leftfetchjoin(X_275,X_99);
+X_100:bat[:oid,:int]  := algebra.leftfetchjoin(X_274,X_99);
 X_101:bat[:oid,:wrd]  := mkey.bulk_rotate_xor_hash(X_91,11,X_100);
 (X_102,r1_114) := algebra.join(X_66,X_101);
 X_104 := algebra.leftfetchjoin(X_58,X_31);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Oct2014 branch.

2015-03-22 Thread Stefan Manegold

Changeset: 1de74fea5cd8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1de74fea5cd8
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
Branch: default
Log Message:

Merge with Oct2014 branch.


diffs (273 lines):

diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit 
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
@@ -52,90 +52,89 @@ Ready.
 % clob # type
 % 622 # length
 function user.s2_1{autoCommit=true}(A0:bte,A1:bte,A2:bte,A3:date,A4:lng):void;
-X_165:void := querylog.define(explain 
select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as 
sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1 
- l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) * 
(1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as 
avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as 
avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate = 
date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup 
by\n\tl_returnflag,\n\tl_linestatus\norder 
by\n\tl_returnflag,\n\tl_linestatus;,sequential_pipe,86);
+X_165:void := querylog.define(explain 
select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as 
sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1 
- l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) * 
(1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as 
avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as 
avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate = 
date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup 
by\n\tl_returnflag,\n\tl_linestatus\norder 
by\n\tl_returnflag,\n\tl_linestatus;,sequential_pipe,85);
 X_7 := sql.mvc();
-X_11:bat[:oid,:date]  := sql.bind(X_7,sys,lineitem,l_shipdate,0);
-X_8:bat[:oid,:oid]  := sql.tid(X_7,sys,lineitem);
+X_11:bat[:oid,:date] := sql.bind(X_7,sys,lineitem,l_shipdate,0);
+X_8:bat[:oid,:oid] := sql.tid(X_7,sys,lineitem);
 X_19 := mtime.date_sub_msec_interval(A3,A4);
 X_184 := algebra.thetasubselect(X_11,X_8,X_19,=);
 (X_14,r1_14) := sql.bind(X_7,sys,lineitem,l_shipdate,2);
 X_185 := algebra.thetasubselect(r1_14,nil:bat[:oid,:oid],X_19,=);
-X_17:bat[:oid,:date]  := sql.bind(X_7,sys,lineitem,l_shipdate,1);
+X_17:bat[:oid,:date] := sql.bind(X_7,sys,lineitem,l_shipdate,1);
 X_187 := algebra.thetasubselect(X_17,X_8,X_19,=);
 X_20 := sql.subdelta(X_184,X_8,X_14,X_185,X_187);
-X_22:bat[:oid,:str]  := sql.bind(X_7,sys,lineitem,l_linestatus,0);
+X_22:bat[:oid,:str] := sql.bind(X_7,sys,lineitem,l_linestatus,0);
 (X_24,r1_28) := sql.bind(X_7,sys,lineitem,l_linestatus,2);
-X_26:bat[:oid,:str]  := sql.bind(X_7,sys,lineitem,l_linestatus,1);
+X_26:bat[:oid,:str] := sql.bind(X_7,sys,lineitem,l_linestatus,1);
 X_27 := sql.projectdelta(X_20,X_22,X_24,r1_28,X_26);
-X_28:bat[:oid,:str]  := sql.bind(X_7,sys,lineitem,l_returnflag,0);
+X_28:bat[:oid,:str] := sql.bind(X_7,sys,lineitem,l_returnflag,0);
 (X_30,r1_36) := sql.bind(X_7,sys,lineitem,l_returnflag,2);
-X_32:bat[:oid,:str]  := sql.bind(X_7,sys,lineitem,l_returnflag,1);
+X_32:bat[:oid,:str] := sql.bind(X_7,sys,lineitem,l_returnflag,1);
 X_33 := sql.projectdelta(X_20,X_28,X_30,r1_36,X_32);
 (X_34,r1_42,r2_42) := group.subgroup(X_33);
 (X_37,r1_45,r2_45) := group.subgroupdone(X_27,X_34);
 X_40 := algebra.leftfetchjoin(r1_45,X_27);
 X_41 := algebra.leftfetchjoin(r1_45,X_33);
-X_51:bat[:oid,:int]  := sql.bind(X_7,sys,lineitem,l_quantity,0);
+X_51:bat[:oid,:int] := sql.bind(X_7,sys,lineitem,l_quantity,0);
 (X_56,r1_64) := sql.bind(X_7,sys,lineitem,l_quantity,2);
-X_59:bat[:oid,:int]  := sql.bind(X_7,sys,lineitem,l_quantity,1);
+X_59:bat[:oid,:int] := sql.bind(X_7,sys,lineitem,l_quantity,1);
 X_61 := sql.projectdelta(X_20,X_51,X_56,r1_64,X_59);
-X_62:bat[:oid,:lng]  := aggr.subsum(X_61,X_37,r1_45,true,true);
-X_65:bat[:oid,:lng]  := sql.bind(X_7,sys,lineitem,l_extendedprice,0);
+X_62:bat[:oid,:lng] := aggr.subsum(X_61,X_37,r1_45,true,true);
+X_65:bat[:oid,:lng] := sql.bind(X_7,sys,lineitem,l_extendedprice,0);
 (X_67,r1_77) := sql.bind(X_7,sys,lineitem,l_extendedprice,2);
-X_69:bat[:oid,:lng]  := sql.bind(X_7,sys,lineitem,l_extendedprice,1);
+X_69:bat[:oid,:lng] := sql.bind(X_7,sys,lineitem,l_extendedprice,1);
 X_70 := sql.projectdelta(X_20,X_65,X_67,r1_77,X_69);
-X_71:bat[:oid,:lng]  := aggr.subsum(X_70,X_37,r1_45,true,true);
+X_71:bat[:oid,:lng] := aggr.subsum(X_70,X_37,r1_45,true,true);
 X_73 := calc.lng(A0,15,2);
-X_75:bat[:oid,:lng]  := sql.bind(X_7,sys,lineitem,l_discount,0);
+X_75:bat[:oid,:lng] :=

MonetDB: resultset - fixes to make resultset work with the merge...

2015-03-22 Thread Niels Nes

Changeset: 6d7ad4b2da0c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d7ad4b2da0c
Modified Files:
monetdb5/modules/mal/tablet.c
sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/benchmarks/ATIS/Tests/select_group.stable.out
sql/common/sql_types.c
sql/server/rel_updates.c
Branch: resultset
Log Message:

fixes to make resultset work with the merges from default (ie copy from
with header info)


diffs (276 lines):

diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -240,6 +240,7 @@ TABLETcollect(BAT **bats, Tablet *as)
 
if (cnt != BATcount(fmt[i].c)) 
throw(SQL,copy, Count  BUNFMT  differs from  
BUNFMT \n, BATcount(fmt[i].c), cnt);
+   j++;
}
return MAL_SUCCEED;
 }
@@ -254,7 +255,6 @@ TABLETcollect_parts(BAT **bats, Tablet *
for (i = 0; i  as-nr_attrs  !cnt; i++) 
if (!fmt[i].skip)
cnt = BATcount(fmt[i].c);
-
for (i = 0, j = 0; i  as-nr_attrs; i++) {
BAT *b, *bv = NULL;
if (fmt[i].skip)
@@ -280,9 +280,9 @@ TABLETcollect_parts(BAT **bats, Tablet *
BBPunfix(bv-batCacheid);
bats[j] = BATslice(b, offset, BATcount(b));
}
-   j++;
if (cnt != BATcount(b)) 
throw(SQL,copy, Count  BUNFMT  differs from  
BUNFMT \n,  BATcount(b), cnt);
+   j++;
}
return MAL_SUCCEED;
 }
@@ -292,21 +292,21 @@ TABLETcollect_parts(BAT **bats, Tablet *
 static char *
 tablet_skip_string(char *s, char quote)
 {
-while (*s) {
-if (*s == '\\'  s[1] != '\0')
-s++;
-else if (*s == quote) {
-if (s[1] == quote)
-*s++ = '\\';/* sneakily replace  with \ */
-else
-break;
-}
-s++;
-}
-assert(*s == quote || *s == '\0');
-if (*s == 0)
-return NULL;
-return s;
+   while (*s) {
+   if (*s == '\\'  s[1] != '\0')
+   s++;
+   else if (*s == quote) {
+   if (s[1] == quote)
+   *s++ = '\\';/* sneakily replace  with \ 
*/
+   else
+   break;
+   }
+   s++;
+   }
+   assert(*s == quote || *s == '\0');
+   if (*s == 0)
+   return NULL;
+   return s;
 }
 
 static int
diff --git a/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out 
b/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out
--- a/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out
+++ b/sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out
@@ -62,18 +62,18 @@ Ready.
 % 3,   3 # length
 [ 100, 100 ]
 [ 100, 101 ]
+[ 100, 102 ]
+[ 100, 103 ]
 [ 101, 100 ]
 [ 101, 101 ]
-[ 100, 102 ]
-[ 100, 103 ]
 [ 101, 102 ]
 [ 101, 103 ]
 [ 102, 100 ]
 [ 102, 101 ]
+[ 102, 102 ]
+[ 102, 103 ]
 [ 103, 100 ]
 [ 103, 101 ]
-[ 102, 102 ]
-[ 102, 103 ]
 [ 103, 102 ]
 [ 103, 103 ]
 [ 110, 110 ]
@@ -86,18 +86,18 @@ Ready.
 [ 113, 113 ]
 [ 120, 120 ]
 [ 120, 121 ]
+[ 120, 122 ]
+[ 120, 123 ]
 [ 121, 120 ]
 [ 121, 121 ]
-[ 120, 122 ]
-[ 120, 123 ]
 [ 121, 122 ]
 [ 121, 123 ]
 [ 122, 120 ]
 [ 122, 121 ]
+[ 122, 122 ]
+[ 122, 123 ]
 [ 123, 120 ]
 [ 123, 121 ]
-[ 122, 122 ]
-[ 122, 123 ]
 [ 123, 122 ]
 [ 123, 123 ]
 [ 130, 130 ]
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -3111,17 +3111,16 @@ mvc_import_table_wrap(Client cntxt, MalB
unsigned char *tsep = NULL, *rsep = NULL, *ssep = NULL, *ns = NULL;
ssize_t len = 0;
str filename = NULL, cs;
-   str *sname = getArgReference_str(stk, pci, pci-retc + 0);
-   str *tname = getArgReference_str(stk, pci, pci-retc + 1);
-   unsigned char **T = (unsigned char **) getArgReference(stk, pci, 
pci-retc + 2);
-   unsigned char **R = (unsigned char **) getArgReference(stk, pci, 
pci-retc + 3);
-   unsigned char **S = (unsigned char **) getArgReference(stk, pci, 
pci-retc + 4);
-   unsigned char **N = (unsigned char **) getArgReference(stk, pci, 
pci-retc + 5);
-   str *fname = getArgReference_str(stk, pci, pci-retc + 6);
-   lng *sz = getArgReference_lng(stk, pci, pci-retc + 7);
-   lng *offset = getArgReference_lng(stk, pci, pci-retc + 8);
-   int *locked = getArgReference_int(stk, pci, pci-retc + 9);
-   int

MonetDB: default - offset_limited_32bit.SF-2950579: propagated c...

2015-03-22 Thread Stefan Manegold

Changeset: 5e04f5cc8df2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e04f5cc8df2
Modified Files:

sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32
Branch: default
Log Message:

offset_limited_32bit.SF-2950579: propagated changeset 5bf226626dc2 to oid32 
output


diffs (21 lines):

diff --git 
a/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32
 
b/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32
--- 
a/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32
+++ 
b/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32
@@ -27,11 +27,11 @@ Ready.
 
 #SELECT * from tables OFFSET 2147483646; -- returns instantly
 % .tables, .tables,.tables,.tables,.tables,
.tables,.tables,.tables,.tables # table_name
-% id,  name,   schema_id,  query,  type,   system, commit_action,  
readonly,   temporary # name
-% int, varchar,int,varchar,smallint,   boolean,
smallint,   boolean,tinyint # type
-% 1,   0,  1,  0,  1,  5,  1,  5,  1 # length
+% id,  name,   schema_id,  query,  type,   system, commit_action,  access, 
temporary # name
+% int, varchar,int,varchar,smallint,   boolean,
smallint,   smallint,   tinyint # type
+% 1,   0,  1,  0,  1,  5,  1,  1,  1 # length
 
-# 08:08:12   
-# 08:08:12   Done.
-# 08:08:12   
+# 11:34:25   
+# 11:34:25   Done.
+# 11:34:25   
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: resultset - approved error message

2015-03-22 Thread Niels Nes

Changeset: 1c0fccd720e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c0fccd720e3
Modified Files:
geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
Branch: resultset
Log Message:

approved error message


diffs (15 lines):

diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err 
b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
@@ -10,9 +10,10 @@ stderr of test 'copy_into_crash.SF-19754
 # 11:37:42   mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30423 
 # 11:37:42   
 
-MAPI  = (monetdb) /var/tmp/mtest-27557/.s.monetdb.33245
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', '\n';
 45111956, 'POINT(52.0697 4.3723)'
+ERROR = !Failed to import table line 1 field 2 'point' expected in ' 
'POINT(52.0697 4.3723)''
 
 
 # 13:33:18   
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: newstorage - merged with default

2015-03-22 Thread Niels Nes

Changeset: 04c044ee89de for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=04c044ee89de
Added Files:
sql/benchmarks/ATIS/Tests/select_group.stable.out.int128

sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out.int128
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.sql
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.err
sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out

sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128
sql/test/BugTracker-2015/Tests/operator-priority.Bug-3686.sql
sql/test/BugTracker-2015/Tests/operator-priority.Bug-3686.stable.err
sql/test/BugTracker-2015/Tests/operator-priority.Bug-3686.stable.out
Modified Files:
clients/Tests/SQL-dump_all.stable.out
clients/Tests/SQL-dump_all.stable.out.int128
clients/Tests/SQL-dump_all.stable.out.oid32
clients/Tests/SQL-dump_all.stable.out.oid32.int128
clients/Tests/SQL-dump_geom.stable.out
clients/Tests/SQL-dump_geom.stable.out.32bit
clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
clients/Tests/SQL-dump_none.stable.out
clients/Tests/exports.stable.out
clients/mapiclient/tachograph.c
clients/mapilib/mapi.c
clients/odbc/driver/SQLBrowseConnect.c
clients/odbc/driver/SQLGetDescField.c
clients/odbc/driver/SQLGetInfo.c
clients/odbc/driver/SQLGetStmtAttr.c
gdk/gdk_atoms.c
gdk/gdk_bbp.c
gdk/gdk_storage.c
gdk/gdk_utils.c
monetdb5/extras/rapi/Tests/All
monetdb5/mal/mal_session.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/optimizer/opt_coercion.c
sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql
sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out
sql/benchmarks/ATIS/Tests/select_group.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/14.sql
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
sql/common/sql_types.c

sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out

sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker-2015/Tests/All
tools/merovingian/daemon/client.c
Branch: newstorage
Log Message:

merged with default


diffs (truncated from 3636 to 300 lines):

diff --git

MonetDB: newstorage - merged with default

2015-03-22 Thread Niels Nes

Changeset: 3871c6d4de44 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3871c6d4de44
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/common/sql_types.c
Branch: newstorage
Log Message:

merged with default


diffs (60 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2622,7 +2622,7 @@ mvc_import_table_wrap(Client cntxt, MalB
BAT **b = NULL;
unsigned char *tsep = NULL, *rsep = NULL, *ssep = NULL, *ns = NULL;
ssize_t len = 0;
-   str filename, cs;
+   str filename = NULL, cs;
sql_table *t = *(sql_table **) getArgReference(stk, pci, pci-retc + 0);
unsigned char **T = (unsigned char **) getArgReference_str(stk, pci, 
pci-retc + 1);
unsigned char **R = (unsigned char **) getArgReference_str(stk, pci, 
pci-retc + 2);
diff --git a/sql/backends/monet5/sql_gencode.c 
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -26,7 +26,6 @@
  * reduce the cost to prepare MAL statements significantly.
  *
  * A dummy module is needed to load properly.
- * @-
  */
 #include monetdb_config.h
 #include sql_gencode.h
@@ -58,7 +57,7 @@ static int backend_dumpstmt(backend *be,
  *
  * The catalog relations should be maintained in a MAL box, which
  * provides the handle for transaction management.
- * @-
+ *
  * The atoms produced by the parser should be converted back into
  * MAL constants. Ideally, this should not be necessary when the
  * SQL parser keeps the string representation around.
@@ -109,7 +108,6 @@ argumentZero(MalBlkPtr mb, int tpe)
 }
 
 /*
- * @-
  * To speedup code generation we freeze the references to the major modules.
  * This safes table lookups.
  */
@@ -128,7 +126,6 @@ initSQLreferences(void)
 }
 
 /*
- * @-
  * The dump_header produces a sequence of instructions for
  * the front-end to prepare presentation of a result table.
  */
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1618,7 +1618,7 @@ sqltypeinit( sql_allocator *sa)
sres, FALSE, F_FUNC, SCALE_FIX);
}
sres = create_arg(sa, NULL, sql_create_subtype(sa, TABLE, 0, 0), 
ARG_OUT); 
-   /* copyfrom fname (arg 6) */
+   /* copyfrom fname (arg 8) */
f=sql_create_func_(sa, copyfrom, sql, copy_from,
list_append( list_append( list_append( list_append(list_append 
(list_append (list_append(list_append(sa_list(sa), 
create_arg(sa, NULL, sql_create_subtype(sa, STR, 0, 0), 
ARG_IN)), 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: resultset - approved output

2015-03-22 Thread Niels Nes

Changeset: 577923f15711 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=577923f15711
Modified Files:
sql/backends/monet5/generator/Tests/generator01.stable.err
Branch: resultset
Log Message:

approved output


diffs (106 lines):

diff --git a/sql/backends/monet5/generator/Tests/generator01.stable.err 
b/sql/backends/monet5/generator/Tests/generator01.stable.err
--- a/sql/backends/monet5/generator/Tests/generator01.stable.err
+++ b/sql/backends/monet5/generator/Tests/generator01.stable.err
@@ -29,48 +29,88 @@ stderr of test 'generator01` in director
 # 12:42:21   mclient -lsql -ftest -Eutf-8 -i -e 
--host=/var/tmp/mtest-23485 --port=37579
 # 12:42:21   
 
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(0,10,-2);
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(10,2,2);
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(0,10,0) ;
 ERROR = !zero step size not allowed
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(0,10,null) ;
 ERROR = !null step size not allowed
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
+QUERY = select * from generate_series(null,10,1) ;
+ERROR = !Illegal generator range
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(cast(null as tinyint),10,1) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
+QUERY = select * from generate_series(null,cast(10 as tinyint),cast(1 as 
tinyint)) ;
+ERROR = !Illegal generator range
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(cast(null as tinyint),cast(10 as 
tinyint),cast(1 as tinyint)) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(cast(null as smallint),10,1) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
+QUERY = select * from generate_series(null,cast(10 as smallint),cast(1 as 
smallint)) ;
+ERROR = !Illegal generator range
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(cast(null as smallint),cast(10 as 
smallint),cast(1 as smallint)) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(cast(null as integer),10,1) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
+QUERY = select * from generate_series(null,cast(10 as integer),cast(1 as 
integer)) ;
+ERROR = !Illegal generator range
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(cast(null as integer),cast(10 as 
integer),cast(1 as integer)) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(cast(null as bigint),10,1) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
+QUERY = select * from generate_series(null,cast(10 as bigint),cast(1 as 
bigint)) ;
+ERROR = !Illegal generator range
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(cast(null as bigint),cast(10 as 
bigint),cast(1 as bigint)) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
 QUERY = select * from generate_series(cast(null as tinyint),cast(10 as 
smallint),cast(1 as bigint)) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-2974/.s.monetdb.36607
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
+QUERY = select * from generate_series(cast(null as timestamp),10,1) ;
+ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal for column 'L2'
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300
+QUERY = select * from generate_series(null,cast(10 as timestamp),cast(1 as 
interval second)) ;
+ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal
+MAPI  = (monetdb) /var/tmp/mtest-11408/.s.monetdb.36300

MonetDB: default - cleanup old mx leftovers

2015-03-22 Thread Niels Nes

Changeset: caa7a5f6a2a1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=caa7a5f6a2a1
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/common/sql_types.c
Branch: default
Log Message:

cleanup old mx leftovers
initialize filename variable


diffs (60 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2779,7 +2779,7 @@ mvc_import_table_wrap(Client cntxt, MalB
BAT **b = NULL;
unsigned char *tsep = NULL, *rsep = NULL, *ssep = NULL, *ns = NULL;
ssize_t len = 0;
-   str filename, cs;
+   str filename = NULL, cs;
sql_table *t = *(sql_table **) getArgReference(stk, pci, pci-retc + 0);
unsigned char **T = (unsigned char **) getArgReference_str(stk, pci, 
pci-retc + 1);
unsigned char **R = (unsigned char **) getArgReference_str(stk, pci, 
pci-retc + 2);
diff --git a/sql/backends/monet5/sql_gencode.c 
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -26,7 +26,6 @@
  * reduce the cost to prepare MAL statements significantly.
  *
  * A dummy module is needed to load properly.
- * @-
  */
 #include monetdb_config.h
 #include sql_gencode.h
@@ -58,7 +57,7 @@ static int backend_dumpstmt(backend *be,
  *
  * The catalog relations should be maintained in a MAL box, which
  * provides the handle for transaction management.
- * @-
+ *
  * The atoms produced by the parser should be converted back into
  * MAL constants. Ideally, this should not be necessary when the
  * SQL parser keeps the string representation around.
@@ -109,7 +108,6 @@ argumentZero(MalBlkPtr mb, int tpe)
 }
 
 /*
- * @-
  * To speedup code generation we freeze the references to the major modules.
  * This safes table lookups.
  */
@@ -128,7 +126,6 @@ initSQLreferences(void)
 }
 
 /*
- * @-
  * The dump_header produces a sequence of instructions for
  * the front-end to prepare presentation of a result table.
  */
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1618,7 +1618,7 @@ sqltypeinit( sql_allocator *sa)
sres, FALSE, F_FUNC, SCALE_FIX);
}
sres = create_arg(sa, NULL, sql_create_subtype(sa, TABLE, 0, 0), 
ARG_OUT); 
-   /* copyfrom fname (arg 6) */
+   /* copyfrom fname (arg 8) */
f=sql_create_func_(sa, copyfrom, sql, copy_from,
list_append( list_append( list_append( list_append(list_append 
(list_append (list_append(list_append(sa_list(sa), 
create_arg(sa, NULL, sql_create_subtype(sa, STR, 0, 0), 
ARG_IN)), 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: resultset - merged with default and updated (some) output

2015-03-22 Thread Niels Nes

Changeset: 39a4d8cd9fc9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=39a4d8cd9fc9
Added Files:
sql/benchmarks/ATIS/Tests/select_group.stable.out.int128

sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out.int128

sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/SQL-dump_all.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/tachograph.c
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/rapi/Tests/All
monetdb5/optimizer/opt_coercion.c
sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/generator/Tests/generator01.sql
sql/backends/monet5/generator/Tests/generator02.sql
sql/backends/monet5/generator/Tests/generator04.sql
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/tpch/14.sql
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/common/sql_types.c

sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
Branch: resultset
Log Message:

merged with default and updated (some) output


diffs (truncated from 8941 to 300 lines):

diff --git a/clients/Tests/MAL-signatures_all.stable.out 
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -38026,8 +38026,12 @@ pattern generator.series(first:sht,last:
 address VLTgenerator_table;
 pattern generator.series(first:bte,last:bte,step:bte):bat[:oid,:bte] 
 address VLTgenerator_table;
+pattern generator.series(first:any_1,last:any_1,step:any_1):bat[:oid,:any_1] 
+address VLTgenerator_table;
 pattern generator.series(first:dbl,last:dbl):bat[:oid,:dbl] 
 address VLTgenerator_table;
+pattern generator.series(first:timestamp,last:timestamp):bat[:oid,:timestamp] 
+address VLTgenerator_table;
 pattern generator.series(first:flt,last:flt):bat[:oid,:flt] 
 address VLTgenerator_table;
 pattern generator.series(first:lng,last:lng):bat[:oid,:lng] 
@@ -40485,11 +40489,11 @@ pattern sql.current_time():daytime
 address SQLcurrent_daytime;
 comment Get the clients current daytime
 
-pattern 
sql.copyfrom(t:ptr,sep:str,rsep:str,ssep:str,ns:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]...
 
-address mvc_import_table_stdin;
-comment Import a table from bstream s with the given tuple and 
seperators (sep/rsep)
-
-pattern 
sql.copy_from(t:ptr,sep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]...
 
+pattern sql.copy_rejects_clear():void 
+address COPYrejects_clear;
+pattern sql.copy_rejects() 
(rowid:bat[:oid,:lng],fldid:bat[:oid,:int],msg:bat[:oid,:str],inp:bat[:oid,:str])
 
+address COPYrejects;
+pattern 
sql.copy_from(t:ptr,sep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int,best:int):bat[:oid,:any]...
 
 address mvc_import_table_wrap;
 comment Import a table from bstream s with the given tuple and 
seperators (sep/rsep)
 
@@ -40637,10 +40641,6 @@ comment Return column bat with delta's a
 
 command sql.epilogue():void 
 address SQLepilogue;
-pattern 
sql.exportValue{unsafe}(qtype:int,tname:str,name:str,typename:str,digits:int,scale:int,eclass:int,val:any_1,w:str):void
 
-address mvc_export_value_wrap;
-comment export a single value onto the stream s
-
 pattern sql.exportOperation{unsafe}(w:str):void 
 address

MonetDB: resultset - approved output

2015-03-22 Thread Niels Nes

Changeset: d29323f459af for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d29323f459af
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
Branch: resultset
Log Message:

approved output


diffs (24 lines):

diff --git a/clients/Tests/MAL-signatures_all.stable.out 
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -40813,7 +40813,7 @@ pattern sql.resultSet{unsafe}(tbl:bat[:o
 address mvc_row_result_wrap;
 comment Prepare a table result set
 
-pattern 
sql.resultSet{unsafe}(tbl:str,attr:str,tpe:str,len:int,scale:int,val:any):int 
+pattern 
sql.resultSet{unsafe}(tbl:str,attr:str,tpe:str,len:int,scale:int,eclass:int,val:any):int
 
 address mvc_scalar_value_wrap;
 comment Prepare a table result set
 
diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128 
b/clients/Tests/MAL-signatures_all.stable.out.int128
--- a/clients/Tests/MAL-signatures_all.stable.out.int128
+++ b/clients/Tests/MAL-signatures_all.stable.out.int128
@@ -51756,7 +51756,7 @@ pattern sql.resultSet{unsafe}(tbl:bat[:o
 address mvc_row_result_wrap;
 comment Prepare a table result set
 
-pattern 
sql.resultSet{unsafe}(tbl:str,attr:str,tpe:str,len:int,scale:int,val:any):int 
+pattern 
sql.resultSet{unsafe}(tbl:str,attr:str,tpe:str,len:int,scale:int,eclass:int,val:any):int
 
 address mvc_scalar_value_wrap;
 comment Prepare a table result set
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: resultset - approved output

2015-03-22 Thread Niels Nes

Changeset: 02afb0086a5b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02afb0086a5b
Modified Files:
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
Branch: resultset
Log Message:

approved output


diffs (166 lines):

diff --git a/sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
@@ -59,39 +59,39 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 322 # length
+% 325 # length
 function user.s3_1{autoCommit=true}():void;
-X_169:void  := querylog.define(explain 
select\n\ts_suppkey,\n\ts_name,\n\ts_address,\n\ts_phone,\n\ttotal_revenue\nfrom\n\tsupplier,\n\trevenue0\nwhere\n\ts_suppkey
 = supplier_no\n\tand total_revenue = 
(\n\t\tselect\n\t\t\tmax(total_revenue)\n\t\tfrom\n\t\t\trevenue0\n\t)\norder 
by\n\ts_suppkey;,sequential_pipe);
-X_119 := bat.new(nil:oid,nil:str);
-X_127 := bat.append(X_119,sys.supplier);
-X_137 := bat.append(X_127,sys.supplier);
-X_145 := bat.append(X_137,sys.supplier);
-X_152 := bat.append(X_145,sys.supplier);
-X_159 := bat.append(X_152,sys.revenue0);
-X_122 := bat.new(nil:oid,nil:str);
-X_129 := bat.append(X_122,s_suppkey);
-X_138 := bat.append(X_129,s_name);
-X_146 := bat.append(X_138,s_address);
-X_153 := bat.append(X_146,s_phone);
-X_161 := bat.append(X_153,total_revenue);
-X_123 := bat.new(nil:oid,nil:str);
-X_131 := bat.append(X_123,int);
-X_140 := bat.append(X_131,varchar);
-X_148 := bat.append(X_140,varchar);
-X_155 := bat.append(X_148,varchar);
-X_163 := bat.append(X_155,decimal);
+X_167:void := querylog.define(explain 
select\n\ts_suppkey,\n\ts_name,\n\ts_address,\n\ts_phone,\n\ttotal_revenue\nfrom\n\tsupplier,\n\trevenue0\nwhere\n\ts_suppkey
 = supplier_no\n\tand total_revenue = 
(\n\t\tselect\n\t\t\tmax(total_revenue)\n\t\tfrom\n\t\t\trevenue0\n\t)\norder 
by\n\ts_suppkey;,sequential_pipe,100);
+X_117 := bat.new(nil:oid,nil:str);
+X_125 := bat.append(X_117,sys.supplier);
+X_135 := bat.append(X_125,sys.supplier);
+X_143 := bat.append(X_135,sys.supplier);
+X_150 := bat.append(X_143,sys.supplier);
+X_157 := bat.append(X_150,sys.revenue0);
+X_120 := bat.new(nil:oid,nil:str);
+X_127 := bat.append(X_120,s_suppkey);
+X_136 := bat.append(X_127,s_name);
+X_144 := bat.append(X_136,s_address);
+X_151 := bat.append(X_144,s_phone);
+X_159 := bat.append(X_151,total_revenue);
+X_121 := bat.new(nil:oid,nil:str);
+X_129 := bat.append(X_121,int);
+X_138 := bat.append(X_129,varchar);
+X_146 := bat.append(X_138,varchar);
+X_153 := bat.append(X_146,varchar);
+X_161 := bat.append(X_153,decimal);
+X_122 := bat.new(nil:oid,nil:int);
+X_131 := bat.append(X_122,32);
+X_140 := bat.append(X_131,25);
+X_147 := bat.append(X_140,40);
+X_154 := bat.append(X_147,15);
+X_163 := bat.append(X_154,33);
 X_124 := bat.new(nil:oid,nil:int);
-X_133 := bat.append(X_124,32);
-X_142 := bat.append(X_133,25);
-X_149 := bat.append(X_142,40);
-X_156 := bat.append(X_149,15);
-X_165 := bat.append(X_156,33);
-X_126 := bat.new(nil:oid,nil:int);
-X_135 := bat.append(X_126,0);
-X_144 := bat.append(X_135,0);
-X_151 := bat.append(X_144,0);
-X_158 := bat.append(X_151,0);
-X_167 := bat.append(X_158,4);
+X_133 := bat.append(X_124,0);
+X_142 := bat.append(X_133,0);
+X_149 := bat.append(X_142,0);
+X_156 := bat.append(X_149,0);
+X_165 := bat.append(X_156,4);
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,sys,supplier);
 X_6:bat[:oid,:int]  := sql.bind(X_2,sys,supplier,s_suppkey,0);
@@ -105,8 +105,8 @@ function user.s3_1{autoCommit=true}():vo
 X_22:bat[:oid,:date]  := sql.bind(X_2,sys,lineitem,l_shipdate,1);
 X_23 := sql.delta(X_18,X_20,r1_20,X_22);
 X_24 := algebra.leftfetchjoin(X_16,X_23);
-X_27 := mtime.addmonths(1996-01-01:date,3);
-X_28 := algebra.subselect(X_24,1996-01-01:date,X_27,true,false,false);
+X_27 := mtime.addmonths(1996-01-01,3);
+X_28 := algebra.subselect(X_24,1996-01-01,X_27,true,false,false);
 X_30:bat[:oid,:int]  := sql.bind(X_2,sys,lineitem,l_suppkey,0);
 (X_32,r1_35) := sql.bind(X_2,sys,lineitem,l_suppkey,2);
 X_35:bat[:oid,:int]  := sql.bind(X_2,sys,lineitem,l_suppkey,1);
@@ -121,45 +121,44 @@ function user.s3_1{autoCommit=true}():vo
 X_58 := sql.delta(X_49,X_53,r1_56,X_56);
 X_59 := algebra.leftfetchjoin(X_16,X_58);
 X_60 := algebra.leftfetchjoin(X_28,X_59);
-X_61:bat[:oid,:hge]  := batcalc.hge(2,X_60,33,2);
-X_63:bat[:oid,:lng]  := sql.bind(X_2,sys,lineitem,l_discount,0);
-(X_66,r1_75) := sql.bind(X_2,sys,lineitem,l_discount,2);
-X_68:bat[:oid,:lng]  := sql.bind(X_2,sys,lineitem,l_discount,1);
-X_69 := sql.delta(X_63,X_66,r1_75,X_68);
-X_70

MonetDB: resultset - re-introduce the eclass argument to the res...

2015-03-22 Thread Niels Nes

Changeset: e5c41c58c5f5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e5c41c58c5f5
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_gencode.c
Branch: resultset
Log Message:

re-introduce the eclass argument to the resultValue function. The
changes coming from the default branch require this.


diffs (125 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -3008,46 +3008,6 @@ mvc_export_operation_wrap(Client cntxt, 
return NULL;
 }
 
-// collect the SQL type identifier associated with a string
-static int
-SQLname2eclass(const str *type)
-{
-   int ec = 0;
-   if ( strcmp(*type,char) == 0)
-   ec = EC_CHAR;
-   else
-   if ( strncmp(*type,int,3) == 0 || strcmp(*type,tinyint) == 0 || 
strcmp(*type,bigint) == 0 ||
-   strcmp(*type,wrd) == 0 || strcmp(*type,smallint) == 0 || 
strcmp(*type,hugeint) == 0)
-   ec = EC_NUM;
-   else
-   if ( strcmp(*type,wrd) == 0)
-   ec = EC_NUM;
-   else
-   if ( strcmp(*type,boolean) == 0)
-   ec = EC_BIT;
-   else
-   if ( strcmp(*type,varchar) == 0)
-   ec = EC_STRING;
-   else
-   if ( strcmp(*type,real) == 0)
-   ec = EC_FLT;
-   else
-   if ( strcmp(*type,double) == 0)
-   ec = EC_FLT;
-   else
-   if ( strcmp(*type,time) == 0)
-   ec = EC_TIME;
-   else
-   if ( strcmp(*type,timestamp) == 0 || strcmp(*type,timestamptz) == 0)
-   ec = EC_TIMESTAMP;
-   else
-   if ( strcmp(*type,date) == 0)
-   ec = EC_DATE;
-   else
-   if ( strcmp(*type,decimal) == 0)
-   ec = EC_DEC;
-   return ec;
-}
 str
 /*mvc_scalar_value_wrap(int *ret, int *qtype, str tn, str name, str type, int 
*digits, int *scale, int *eclass, ptr p, int mtype)*/
 mvc_scalar_value_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
@@ -3057,9 +3017,9 @@ mvc_scalar_value_wrap(Client cntxt, MalB
str *type = getArgReference_str(stk, pci, 3);
int *digits = getArgReference_int(stk, pci, 4);
int *scale = getArgReference_int(stk, pci, 5);
-   int ec  =0;
-   ptr p = getArgReference(stk, pci, 6);
-   int mtype = getArgType(mb, pci, 6);
+   int *eclass = getArgReference_int(stk, pci, 6);
+   ptr p = getArgReference(stk, pci, 7);
+   int mtype = getArgType(mb, pci, 7);
str msg;
backend *b = NULL;
 
@@ -3069,9 +3029,7 @@ mvc_scalar_value_wrap(Client cntxt, MalB
b = cntxt-sqlcontext;
if (ATOMextern(mtype))
p = *(ptr *) p;
-
-   ec = SQLname2eclass(type);
-   if (b-out == NULL || mvc_export_value(b, b-out, 1, *tn, *cn, *type, 
*digits, *scale, ec, p, mtype, , NULL) != SQL_OK)
+   if (b-out == NULL || mvc_export_value(b, b-out, 1, *tn, *cn, *type, 
*digits, *scale, *eclass, p, mtype, , NULL) != SQL_OK)
throw(SQL, sql.exportValue, failed);
return MAL_SUCCEED;
 }
@@ -3483,8 +3441,8 @@ not_unique_oids(bat *ret, const bat *bid
oid *rf, *rh, *rt;
oid *h = (oid *) Hloc(b, 0), *vp, *ve;
 
-if (BAThash(b, 0) == GDK_FAIL)
- throw(SQL, not_uniques, hash creation failed);
+   if (BAThash(b, 0) == GDK_FAIL)
+   throw(SQL, not_uniques, hash creation failed);
bn = BATnew(TYPE_oid, TYPE_oid, BATcount(b), TRANSIENT);
if (bn == NULL) {
BBPunfix(b-batCacheid);
@@ -4305,14 +4263,14 @@ SQLargRecord(Client cntxt, MalBlkPtr mb,
 
(void) cntxt;
ret = getArgReference_str(stk, pci, 0);
-   s = instruction2str(mb, stk, getInstrPtr(mb, 0), LIST_MAL_DEBUG);
+   s = instruction2str(mb, stk, getInstrPtr(mb, 0), LIST_MAL_ALL);
t = strchr(s, ' ');
*ret = GDKstrdup(t ? t + 1 : s);
GDKfree(s);
return MAL_SUCCEED;
 }
 
- /*
+/*
  * Vacuum cleaning tables
  * Shrinking and re-using space to vacuum clean the holes in the relations.
  */
diff --git a/sql/backends/monet5/sql.mal b/sql/backends/monet5/sql.mal
--- a/sql/backends/monet5/sql.mal
+++ b/sql/backends/monet5/sql.mal
@@ -262,7 +262,7 @@ comment delete from table;
 #pattern resultSet{unsafe}( nr_cols:int, qtype:int, order:bat[:oid,:any_1] ) 
:int 
 #address mvc_table_result_wrap
 #comment Prepare a table result set;
-pattern resultSet{unsafe}(tbl:str, attr:str, tpe:str, len:int,scale:int, 
val:any) :int 
+pattern resultSet{unsafe}(tbl:str, attr:str, tpe:str, len:int, scale:int, 
eclass:int, val:any) :int 
 address mvc_scalar_value_wrap
 comment Prepare a table result set;
 
diff --git a/sql/backends/monet5/sql_gencode.c 
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -2367,6 +2367,7

MonetDB: default - indent

2015-03-22 Thread Niels Nes

Changeset: d80b5c8b389d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d80b5c8b389d
Modified Files:
sql/scripts/17_temporal.sql
Branch: default
Log Message:

indent


diffs (12 lines):

diff --git a/sql/scripts/17_temporal.sql b/sql/scripts/17_temporal.sql
--- a/sql/scripts/17_temporal.sql
+++ b/sql/scripts/17_temporal.sql
@@ -6,7 +6,7 @@
 
 -- assume milliseconds when converted to TIMESTAMP
 create function epoch(sec BIGINT) returns TIMESTAMP
-external name timestamp.epoch;
+   external name timestamp.epoch;
 
 create function epoch(sec INT) returns TIMESTAMP
external name timestamp.epoch;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: resultset - approved output

2015-03-22 Thread Niels Nes

Changeset: bae89ed7d1b1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bae89ed7d1b1
Modified Files:
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
Branch: resultset
Log Message:

approved output


diffs (truncated from 473 to 300 lines):

diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 
b/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
@@ -38,35 +38,35 @@ Ready.
 % clob # type
 % 265 # length
 function user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int):void;
-X_70:void := querylog.define(explain\nselect 
sum(lo_extendedprice*lo_discount) as revenue\n\tfrom lineorder, dwdate\n\twhere 
lo_orderdate = d_datekey\n\t\tand d_year = 1993\n\t\tand lo_discount between 1 
and 3\n\t\tand lo_quantity  25;,sequential_pipe,44);
+X_71:void := querylog.define(explain\nselect 
sum(lo_extendedprice*lo_discount) as revenue\n\tfrom lineorder, dwdate\n\twhere 
lo_orderdate = d_datekey\n\t\tand d_year = 1993\n\t\tand lo_discount between 1 
and 3\n\t\tand lo_quantity  25;,sequential_pipe,44);
 X_6 := sql.mvc();
 X_10:bat[:oid,:int]  := sql.bind(X_6,sys,lineorder,lo_quantity,0);
 X_18:bat[:oid,:int]  := sql.bind(X_6,sys,lineorder,lo_discount,0);
 X_7:bat[:oid,:oid]  := sql.tid(X_6,sys,lineorder);
-X_90 := algebra.subselect(X_18,X_7,A1,A2,true,true,false);
+X_91 := algebra.subselect(X_18,X_7,A1,A2,true,true,false);
 (X_20,r1_23) := sql.bind(X_6,sys,lineorder,lo_discount,2);
-X_91 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
+X_92 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
 X_22:bat[:oid,:int]  := sql.bind(X_6,sys,lineorder,lo_discount,1);
-X_93 := algebra.subselect(X_22,X_7,A1,A2,true,true,false);
-X_23 := sql.subdelta(X_90,X_7,X_20,X_91,X_93);
-X_94 := algebra.thetasubselect(X_10,X_23,A3,);
+X_94 := algebra.subselect(X_22,X_7,A1,A2,true,true,false);
+X_23 := sql.subdelta(X_91,X_7,X_20,X_92,X_94);
+X_95 := algebra.thetasubselect(X_10,X_23,A3,);
 (X_13,r1_13) := sql.bind(X_6,sys,lineorder,lo_quantity,2);
-X_95 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,);
+X_96 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,);
 X_16:bat[:oid,:int]  := sql.bind(X_6,sys,lineorder,lo_quantity,1);
-X_97 := algebra.thetasubselect(X_16,X_23,A3,);
-X_25 := sql.subdelta(X_94,X_23,X_13,X_95,X_97);
+X_98 := algebra.thetasubselect(X_16,X_23,A3,);
+X_25 := sql.subdelta(X_95,X_23,X_13,X_96,X_98);
 X_27:bat[:oid,:oid]  := 
sql.bind_idxbat(X_6,sys,lineorder,lineorder_lo_orderdate_fkey,0);
 (X_29,r1_36) := 
sql.bind_idxbat(X_6,sys,lineorder,lineorder_lo_orderdate_fkey,2);
 X_31:bat[:oid,:oid]  := 
sql.bind_idxbat(X_6,sys,lineorder,lineorder_lo_orderdate_fkey,1);
 X_32 := sql.projectdelta(X_25,X_27,X_29,r1_36,X_31);
 X_36:bat[:oid,:int]  := sql.bind(X_6,sys,dwdate,d_year,0);
 X_33:bat[:oid,:oid]  := sql.tid(X_6,sys,dwdate);
-X_98 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
+X_99 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
 (X_39,r1_48) := sql.bind(X_6,sys,dwdate,d_year,2);
-X_99 := algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,true,false);
+X_100 := algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,true,false);
 X_42:bat[:oid,:int]  := sql.bind(X_6,sys,dwdate,d_year,1);
-X_101 := algebra.subselect(X_42,X_33,A0,A0,true,true,false);
-X_44 := sql.subdelta(X_98,X_33,X_39,X_99,X_101);
+X_102 := algebra.subselect(X_42,X_33,A0,A0,true,true,false);
+X_44 := sql.subdelta(X_99,X_33,X_39,X_100,X_102);
 X_46 := X_44;
 (X_47,r1_59) := algebra.subjoin(X_32,X_46,nil:BAT,nil:BAT,false,nil:lng);
 X_51:bat[:oid,:int]  := 
sql.bind(X_6,sys,lineorder,lo_extendedprice,0);
@@ -79,7 +79,7 @@ function user.s2_1{autoCommit=true}(A0:i
 X_61 := algebra.leftfetchjoin(X_47,X_60);
 X_62:bat[:oid,:lng]  := batcalc.*(X_59,X_61);
 X_63:hge  := aggr.sum(X_62);
-sql.resultSet(sys.L1,revenue,hugeint,128,0,X_63);
+sql.resultSet(sys.L1,revenue,hugeint,128,0,7,X_63);
 end user.s2_1;
 
 # 23:10:45   
diff --git a/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 
b/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
@@ -38,35 +38,35 @@ Ready.
 % clob # type
 %

MonetDB: resultset - approved output and cleanup some code chang...

2015-03-22 Thread Niels Nes

Changeset: 37f88242c97b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37f88242c97b
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
sql/backends/monet5/generator/Tests/generator04.stable.err
sql/backends/monet5/generator/generator.mal
sql/backends/monet5/sql.mal
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
Branch: resultset
Log Message:

approved output and cleanup some code changes (more inline with default)


diffs (truncated from 3495 to 300 lines):

diff --git a/clients/Tests/MAL-signatures_all.stable.out 
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -38026,12 +38026,8 @@ pattern generator.series(first:sht,last:
 address VLTgenerator_table;
 pattern generator.series(first:bte,last:bte,step:bte):bat[:oid,:bte] 
 address VLTgenerator_table;
-pattern generator.series(first:any_1,last:any_1,step:any_1):bat[:oid,:any_1] 
-address VLTgenerator_table;
 pattern generator.series(first:dbl,last:dbl):bat[:oid,:dbl] 
 address VLTgenerator_table;
-pattern generator.series(first:timestamp,last:timestamp):bat[:oid,:timestamp] 
-address VLTgenerator_table;
 pattern generator.series(first:flt,last:flt):bat[:oid,:flt] 
 address VLTgenerator_table;
 pattern generator.series(first:lng,last:lng):bat[:oid,:lng] 
@@ -40673,10 +40669,6 @@ pattern sql.evalAlgebra(cmd:str,optimize
 address RAstatement;
 comment Compile and execute a single 'relational algebra' statement
 
-pattern sql.eval(cmd:str) 
(nme:bat[:oid,:str],tpe:bat[:oid,:str],val:bat[:oid,:any]...) 
-address SQLstatementResult;
-comment Compile and execute a single sql statement. Return the result set for 
rendering
-
 pattern sql.eval(cmd:str,output:bit):void 
 address SQLstatement;
 comment Compile and execute a single sql statement (and optionaly send output 
on the output stream)
diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128 
b/clients/Tests/MAL-signatures_all.stable.out.int128
--- a/clients/Tests/MAL-signatures_all.stable.out.int128
+++ b/clients/Tests/MAL-signatures_all.stable.out.int128
@@ -48937,12 +48937,8 @@ pattern generator.series(first:sht,last:
 address VLTgenerator_table;
 pattern generator.series(first:bte,last:bte,step:bte):bat[:oid,:bte] 
 address VLTgenerator_table;
-pattern generator.series(first:any_1,last:any_1,step:any_1):bat[:oid,:any_1] 
-address VLTgenerator_table;
 pattern generator.series(first:dbl,last:dbl):bat[:oid,:dbl] 
 address VLTgenerator_table;
-pattern generator.series(first:timestamp,last:timestamp):bat[:oid,:timestamp] 
-address VLTgenerator_table;
 pattern

MonetDB: resultset - approved output

2015-03-22 Thread Niels Nes

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

MonetDB: newstorage - use proper result type (size_t) to fix com...

2015-03-22 Thread Niels Nes

Changeset: ccefbc6f35a2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccefbc6f35a2
Modified Files:
gdk/gdk_mvcc.c
gdk/gdk_mvcc.h
Branch: newstorage
Log Message:

use proper result type (size_t) to fix compilation on windows


diffs (24 lines):

diff --git a/gdk/gdk_mvcc.c b/gdk/gdk_mvcc.c
--- a/gdk/gdk_mvcc.c
+++ b/gdk/gdk_mvcc.c
@@ -331,7 +331,7 @@ mvcc_count( mvcc_t *m, ts_t sts, ts_t *t
return total;
 }
 
-int 
+size_t 
 mvcc_rids( mvcc_t *m, ts_t sts, ts_t *times, ts_t wts, oid *r, BUN start, BUN 
nr)
 {
BUN i = 0, j;
diff --git a/gdk/gdk_mvcc.h b/gdk/gdk_mvcc.h
--- a/gdk/gdk_mvcc.h
+++ b/gdk/gdk_mvcc.h
@@ -36,7 +36,7 @@ extern int mvcc_release( mvcc_t *m, oid 
 extern int mvcc_is_new( mvcc_t *m, oid p, BUN nr, ts_t sts, ts_t wts);
 /* return success if row(s) is (are) new. */
 
-extern int mvcc_rids( mvcc_t *m, ts_t sts, ts_t *times, ts_t wts, oid *r, BUN 
start, BUN nr); 
+extern size_t mvcc_rids( mvcc_t *m, ts_t sts, ts_t *times, ts_t wts, oid *r, 
BUN start, BUN nr); 
 extern BUN mvcc_count( mvcc_t *m, ts_t sts, ts_t *times, ts_t wts, rid_type 
flag);
 
 typedef int (*mvcc_f)(void *data, oid r, BUN nr);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: resultset - fixed merge problem (copy into with headers)

2015-03-22 Thread Niels Nes

Changeset: bcf089a04fd6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bcf089a04fd6
Added Files:
sql/test/copy/Tests/key_copy.stable.err
sql/test/copy/Tests/key_copy.stable.out
Modified Files:
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/server/rel_updates.c
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out.int128
Branch: resultset
Log Message:

fixed merge problem (copy into with headers)
approved more output


diffs (truncated from 495 to 300 lines):

diff --git a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out 
b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
@@ -29,9 +29,9 @@ Ready.
 % clob # type
 % 82 # length
 function user.s2_1{autoCommit=true}(A0:bte,A1:bte):void;
-X_11:void := querylog.define(explain select 
fuse(1,2);,sequential_pipe,5);
+X_12:void := querylog.define(explain select 
fuse(1,2);,sequential_pipe,5);
 X_4 := udf.fuse(A0,A1);
-sql.resultSet(.L,fuse_single_value,smallint,16,0,X_4);
+sql.resultSet(.L,fuse_single_value,smallint,16,0,7,X_4);
 end user.s2_1;
 #select fuse(1,2);
 % .L # table_name
@@ -45,9 +45,9 @@ end user.s2_1;
 % clob # type
 % 88 # length
 function user.s3_1{autoCommit=true}(A0:sht,A1:sht):void;
-X_11:void := querylog.define(explain select 
fuse(1000,2000);,sequential_pipe,5);
+X_12:void := querylog.define(explain select 
fuse(1000,2000);,sequential_pipe,5);
 X_4 := udf.fuse(A0,A1);
-sql.resultSet(.L,fuse_single_value,int,32,0,X_4);
+sql.resultSet(.L,fuse_single_value,int,32,0,7,X_4);
 end user.s3_1;
 #select fuse(1000,2000);
 % .L # table_name
@@ -61,9 +61,9 @@ end user.s3_1;
 % clob # type
 % 94 # length
 function user.s4_1{autoCommit=true}(A0:int,A1:int):void;
-X_11:void := querylog.define(explain select 
fuse(100,200);,sequential_pipe,5);
+X_12:void := querylog.define(explain select 
fuse(100,200);,sequential_pipe,5);
 X_4 := udf.fuse(A0,A1);
-sql.resultSet(.L,fuse_single_value,bigint,64,0,X_4);
+sql.resultSet(.L,fuse_single_value,bigint,64,0,7,X_4);
 end user.s4_1;
 #select fuse(100,200);
 % .L # table_name
diff --git a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out 
b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
@@ -48,11 +48,11 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 94 # length
+% 95 # length
 function user.s2_1{autoCommit=true}(A0:str):void;
-X_9:void := querylog.define(explain select 
reverse(\\'MonetDB\\');,sequential_pipe,5);
+X_10:void := querylog.define(explain select 
reverse(\\'MonetDB\\');,sequential_pipe,5);
 X_3 := udf.reverse(A0);
-sql.resultSet(.L,reverse_single_value,clob,0,0,X_3);
+sql.resultSet(.L,reverse_single_value,clob,0,0,4,X_3);
 end user.s2_1;
 #select reverse('MonetDB');
 % .L # table_name
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1225,7 +1225,7 @@ copyfrom(mvc *sql, dlist *qname, dlist *
return sql_error(sql, 02, COPY INTO: filename 
must 
have absolute path: %s, 
fname);
 
-   nrel = rel_import(sql, t, tsep, rsep, ssep, ns, fname, 
nr, offset, locked, best_effort);
+   nrel = rel_import(sql, nt, tsep, rsep, ssep, ns, fname, 
nr, offset, locked, best_effort);
 
if (!rel)
rel = nrel;
@@ -1235,7 +1235,7 @@ copyfrom(mvc *sql, dlist *qname, dlist *
return rel;
}
} else {
-   rel = rel_import(sql, t, tsep, rsep, ssep, ns, NULL, nr, 
offset, locked, best_effort);
+   rel = rel_import(sql, nt, tsep, rsep, ssep, ns, NULL, nr, 
offset, locked, best_effort);
}
if (headers) {
dnode *n;
diff --git a/sql/test/copy/Tests/key_copy.stable.err 
b/sql/test/copy/Tests/key_copy.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/copy/Tests/key_copy.stable.err
@@ -0,0 +1,51 @@
+stderr of test 'key_copy` in directory 'sql/test/copy` itself:
+
+
+# 18:36:17   
+# 18:36:17   mserver5 --debug=10 --set gdk_nr_threads=0 --set 
mapi_open=true --set mapi_port=32293 --set 
mapi_usock=/var/tmp/mtest-6766/.s.monetdb.32293 --set monet_prompt= 
--forcemito --set mal_listing=2 
--dbpath=/home/niels/scratch/resultset/Linux-x86_64/var/MonetDB/mTests_sql_test_copy
 --set

MonetDB: resultset - approved output

2015-03-22 Thread Niels Nes

Changeset: b98deea6e2ce for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b98deea6e2ce
Modified Files:
sql/test/copy/Tests/key_copy.stable.err
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/insert.stable.err
sql/test/pg_regress/Tests/time.stable.err
sql/test/pg_regress/Tests/timetz.stable.err
Branch: resultset
Log Message:

approved output


diffs (truncated from 1132 to 300 lines):

diff --git a/sql/test/copy/Tests/key_copy.stable.err 
b/sql/test/copy/Tests/key_copy.stable.err
--- a/sql/test/copy/Tests/key_copy.stable.err
+++ b/sql/test/copy/Tests/key_copy.stable.err
@@ -30,19 +30,20 @@ stderr of test 'key_copy` in directory '
 # 18:36:17   mclient -lsql -ftest -Eutf-8 -i -e 
--host=/var/tmp/mtest-6766 --port=32293
 # 18:36:17   
 
-MAPI  = (monetdb) /var/tmp/mtest-6766/.s.monetdb.32293
+MAPI  = (monetdb) /var/tmp/mtest-32599/.s.monetdb.37032
 QUERY = copy 4 records into cik1 from stdin USING DELIMITERS ',','\n','\' 
NULL AS '';
 0
 5
 5
 9
-
-MAPI  = (monetdb) /var/tmp/mtest-6766/.s.monetdb.32293
+ERROR = !INSERT INTO: PRIMARY KEY constraint 'cik1.cik1_i_pkey' violated
+MAPI  = (monetdb) /var/tmp/mtest-32599/.s.monetdb.37032
 QUERY = copy 4 records into cik1 from stdin USING DELIMITERS ',','\n','\' 
NULL AS '';
 0,1
 5,1
 5,1
 9,1
+ERROR = !INSERT INTO: PRIMARY KEY constraint 'cik1.cik1_i_pkey' violated
 
 
 # 18:36:17   
diff --git a/sql/test/pg_regress/Tests/alter_table.stable.err 
b/sql/test/pg_regress/Tests/alter_table.stable.err
--- a/sql/test/pg_regress/Tests/alter_table.stable.err
+++ b/sql/test/pg_regress/Tests/alter_table.stable.err
@@ -26,613 +26,613 @@ stderr of test 'alter_table` in director
 # cmdline opt  gdk_debug = 536870922
 
 
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = ALTER TABLE tmp RENAME TO tmp_new;
 ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or 
ADD in: alter table tmp rename
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = SELECT * FROM tmp_new;
 ERROR = !SELECT: no such table 'tmp_new'
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = ALTER TABLE tmp RENAME TO tmp_new2;
 ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or 
ADD in: alter table tmp rename
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = SELECT * FROM tmp_new;
 ERROR = !SELECT: no such table 'tmp_new'
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = SELECT * FROM tmp_new2;
 ERROR = !SELECT: no such table 'tmp_new2'
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = DROP TABLE tmp_new;
 ERROR = !DROP TABLE: no such table 'tmp_new'
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = DROP TABLE tmp_new2;
 ERROR = !DROP TABLE: no such table 'tmp_new2'
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = ALTER INDEX onek_unique1 RENAME TO tmp_onek_unique1;
 ERROR = !syntax error, unexpected INDEX, expecting USER or SEQUENCE or TABLE 
in: alter index
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = ALTER INDEX tmp_onek_unique1 RENAME TO onek_unique1;
 ERROR = !syntax error, unexpected INDEX, expecting USER or SEQUENCE or TABLE 
in: alter index
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = ALTER TABLE tmp_view RENAME TO tmp_view_new;
 ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or 
ADD in: alter table tmp_view rename
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = DROP VIEW tmp_view_new;
 ERROR = !DROP VIEW: unknown view 'tmp_view_new'
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = alter table stud_emp rename to pg_toast_stud_emp;
 ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or 
ADD in: alter table stud_emp rename
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = alter table pg_toast_stud_emp rename to stud_emp;
 ERROR = !syntax error, unexpected RENAME, expecting DROP or SET or ALTER or 
ADD in: alter table pg_toast_stud_emp rename
-MAPI  = (monetdb) /var/tmp/mtest-15933/.s.monetdb.38576
+MAPI  = (monetdb)

MonetDB: resultset - merged with default

2015-03-22 Thread Niels Nes

Changeset: 9640a2ed1379 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9640a2ed1379
Modified Files:
sql/scripts/17_temporal.sql
Branch: resultset
Log Message:

merged with default

___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: resultset - partial update got lost (??)

MonetDB: notepad - Merge from default branch.

MonetDB: Oct2014 - TPCH: approved 32-bit MAL plans

MonetDB: default - Merge with Oct2014 branch.

MonetDB: resultset - fixes to make resultset work with the merge...

MonetDB: default - offset_limited_32bit.SF-2950579: propagated c...

MonetDB: resultset - approved error message

MonetDB: newstorage - merged with default

MonetDB: newstorage - merged with default

MonetDB: resultset - approved output

MonetDB: default - cleanup old mx leftovers

MonetDB: resultset - merged with default and updated (some) output

MonetDB: resultset - approved output

MonetDB: resultset - approved output

MonetDB: resultset - re-introduce the eclass argument to the res...

MonetDB: default - indent

MonetDB: resultset - approved output

MonetDB: resultset - approved output and cleanup some code chang...

MonetDB: resultset - approved output

MonetDB: newstorage - use proper result type (size_t) to fix com...

MonetDB: resultset - fixed merge problem (copy into with headers)

MonetDB: resultset - approved output

MonetDB: resultset - merged with default

23 matches

Site Navigation

Mail list logo

Footer information