subject:"MonetDB\: default \- Approved output."

MonetDB: default - approved output

2015-04-01 Thread Niels Nes

Changeset: 9e2c188cfb6d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e2c188cfb6d
Modified Files:
sql/test/pg_regress/Tests/interval.stable.out
sql/test/pg_regress/Tests/interval.stable.out.int128
sql/test/quantiles/Tests/quantiles.stable.out
Branch: default
Log Message:

approved output


diffs (45 lines):

diff --git a/sql/test/pg_regress/Tests/interval.stable.out 
b/sql/test/pg_regress/Tests/interval.stable.out
--- a/sql/test/pg_regress/Tests/interval.stable.out
+++ b/sql/test/pg_regress/Tests/interval.stable.out
@@ -102,7 +102,7 @@ Ready.
 % sys.L2 # table_name
 % L2 # name
 % decimal # type
-% 24 # length
+% 41 # length
 [ -7034318805200352350.000 ]
 #select count(f1) from interval_tbl;
 % sys.L1 # table_name
diff --git a/sql/test/pg_regress/Tests/interval.stable.out.int128 
b/sql/test/pg_regress/Tests/interval.stable.out.int128
--- a/sql/test/pg_regress/Tests/interval.stable.out.int128
+++ b/sql/test/pg_regress/Tests/interval.stable.out.int128
@@ -102,7 +102,7 @@ Ready.
 % sys.L2 # table_name
 % L2 # name
 % decimal # type
-% 24 # length
+% 41 # length
 [ -7034318805200352350.000 ]
 #select count(f1) from interval_tbl;
 % sys.L1 # table_name
diff --git a/sql/test/quantiles/Tests/quantiles.stable.out 
b/sql/test/quantiles/Tests/quantiles.stable.out
--- a/sql/test/quantiles/Tests/quantiles.stable.out
+++ b/sql/test/quantiles/Tests/quantiles.stable.out
@@ -103,7 +103,7 @@ Ready.
 % sys.L1 # table_name
 % L1 # name
 % decimal # type
-% 17 # length
+% 20 # length
 [ 36724.50 ]
 #select quantile(l_extendedprice,0.0) from lit;
 % sys.L1 # table_name
@@ -135,7 +135,7 @@ Ready.
 % sys.L1 # table_name
 % L1 # name
 % decimal # type
-% 17 # length
+% 20 # length
 [ 36960.68 ]
 [ 37144.20 ]
 [ 35937.88 ]
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2015-03-18 Thread Niels Nes

Changeset: 20ccf1982260 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20ccf1982260
Modified Files:
sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.out
Branch: default
Log Message:

approved output


diffs (12 lines):

diff --git 
a/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.out 
b/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.out
--- a/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.out
+++ b/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.out
@@ -55,7 +55,7 @@ Ready.
 [(datetime.datetime(2014, 4, 24, 19, 12, 12, 415000),)]
 [(datetime.date(2014, 4, 24),)]
 [(datetime.time(17, 12, 12),)]
-[(datetime.time(17, 12, 12),)]
+[(datetime.time(19, 12, 12),)]
 
 # 17:15:02   
 # 17:15:02   Done.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2015-03-18 Thread Niels Nes

Changeset: ff3e80f0202c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ff3e80f0202c
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:

approved output


diffs (21 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2225,7 +2225,7 @@ void freeSymbolList(Symbol s);
 void freeVariable(MalBlkPtr mb, int varid);
 str fstrcmp0_impl(dbl *ret, str *string1, str *string2);
 str fstrcmp_impl(dbl *ret, str *string1, str *string2, dbl *minimum);
-str function2str(MalBlkPtr mb, int flg);
+str function2str(MalBlkPtr mb);
 void garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int flag);
 void garbageElement(Client cntxt, ValPtr v);
 str generatorRef;
@@ -2385,7 +2385,7 @@ int logger_exit_wrap(logger *L);
 int logger_find_bat_wrap(int *bid, logger *L, str nme);
 int logger_restart_wrap(logger *L);
 str lookupRef;
-str mal2str(MalBlkPtr mb, int flg, int first, int last);
+str mal2str(MalBlkPtr mb, int first, int last);
 malType malAnyBatType(malType t1, malType t2);
 int malAtomSize(int size, int align, char *name);
 int malBootstrap(void);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2015-03-04 Thread Niels Nes

Changeset: df25227185af for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df25227185af
Modified Files:
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
Branch: default
Log Message:

approved output


diffs (87 lines):

diff --git a/sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
@@ -43,32 +43,32 @@ function user.s2_1{autoCommit=true}(A0:d
 X_67:void  := querylog.define(explain select\n\tsum(l_extendedprice * 
l_discount) as revenue\nfrom\n\tlineitem\nwhere\n\tl_shipdate = date 
\\'1994-01-01\\'\n\tand l_shipdate  date \\'1994-01-01\\' + interval \\'1\\' 
year\n\tand l_discount between 0.06 - 0.01 and 0.06 + 0.01\n\tand l_quantity  
24;,sequential_pipe,40);
 X_10 := sql.mvc();
 X_14:bat[:oid,:lng]  := sql.bind(X_10,sys,lineitem,l_discount,0);
-X_27:bat[:oid,:int]  := sql.bind(X_10,sys,lineitem,l_quantity,0);
-X_32:bat[:oid,:date]  := sql.bind(X_10,sys,lineitem,l_shipdate,0);
+X_27:bat[:oid,:date] := sql.bind(X_10,sys,lineitem,l_shipdate,0);
+X_33:bat[:oid,:int] := sql.bind(X_10,sys,lineitem,l_quantity,0);
 X_11:bat[:oid,:oid]  := sql.tid(X_10,sys,lineitem);
-X_39 := mtime.addmonths(A1,A2);
-X_83 := algebra.subselect(X_32,X_11,A0,X_39,true,false,false);
-(X_34,r1_43) := sql.bind(X_10,sys,lineitem,l_shipdate,2);
-X_84 := 
algebra.subselect(r1_43,nil:bat[:oid,:oid],A0,X_39,true,false,false);
-X_38:bat[:oid,:date]  := sql.bind(X_10,sys,lineitem,l_shipdate,1);
-X_86 := algebra.subselect(X_38,X_11,A0,X_39,true,false,false);
-X_40 := sql.subdelta(X_83,X_11,X_34,X_84,X_86);
-X_87 := algebra.thetasubselect(X_27,X_40,A7,);
-(X_29,r1_35) := sql.bind(X_10,sys,lineitem,l_quantity,2);
-X_88 := algebra.thetasubselect(r1_35,nil:bat[:oid,:oid],A7,);
-X_31:bat[:oid,:int]  := sql.bind(X_10,sys,lineitem,l_quantity,1);
-X_90 := algebra.thetasubselect(X_31,X_40,A7,);
-X_43 := sql.subdelta(X_87,X_40,X_29,X_88,X_90);
+X_83 := algebra.thetasubselect(X_33,X_11,A7,);
+(X_37,r1_48) := sql.bind(X_10,sys,lineitem,l_quantity,2);
+X_84 := algebra.thetasubselect(r1_48,nil:bat[:oid,:oid],A7,);
+X_39:bat[:oid,:int] := sql.bind(X_10,sys,lineitem,l_quantity,1);
+X_86 := algebra.thetasubselect(X_39,X_11,A7,);
+X_40 := sql.subdelta(X_83,X_11,X_37,X_84,X_86);
+X_32 := mtime.addmonths(A1,A2);
+X_87 := algebra.subselect(X_27,X_40,A0,X_32,true,false,false);
+(X_29,r1_35) := sql.bind(X_10,sys,lineitem,l_shipdate,2);
+X_88 := 
algebra.subselect(r1_35,nil:bat[:oid,:oid],A0,X_32,true,false,false);
+X_31:bat[:oid,:date] := sql.bind(X_10,sys,lineitem,l_shipdate,1);
+X_90 := algebra.subselect(X_31,X_40,A0,X_32,true,false,false);
+X_42 := sql.subdelta(X_87,X_40,X_29,X_88,X_90);
 X_22 := calc.-(A3,A4);
 X_23 := calc.lng(2,X_22,15,2);
 X_25 := calc.+(A5,A6);
 X_26 := calc.lng(2,X_25,15,2);
-X_91 := algebra.subselect(X_14,X_43,X_23,X_26,true,true,false);
+X_91 := algebra.subselect(X_14,X_42,X_23,X_26,true,true,false);
 (X_17,r1_17) := sql.bind(X_10,sys,lineitem,l_discount,2);
 X_92 := 
algebra.subselect(r1_17,nil:bat[:oid,:oid],X_23,X_26,true,true,false);
 X_20:bat[:oid,:lng]  := sql.bind(X_10,sys,lineitem,l_discount,1);
-X_94 := algebra.subselect(X_20,X_43,X_23,X_26,true,true,false);
-X_45 := sql.subdelta(X_91,X_43,X_17,X_92,X_94);
+X_94 := algebra.subselect(X_20,X_42,X_23,X_26,true,true,false);
+X_45 := sql.subdelta(X_91,X_42,X_17,X_92,X_94);
 X_46:bat[:oid,:lng]  := 
sql.bind(X_10,sys,lineitem,l_extendedprice,0);
 (X_49,r1_63) := sql.bind(X_10,sys,lineitem,l_extendedprice,2);
 X_52:bat[:oid,:lng]  := 
sql.bind(X_10,sys,lineitem,l_extendedprice,1);
@@ -77,7 +77,7 @@ function user.s2_1{autoCommit=true}(A0:d
 X_57 := sql.projectdelta(X_45,X_14,X_17,r1_17,X_20);
 X_58:bat[:oid,:hge] := batcalc.*(X_55,X_57);
 X_59:hge := aggr.sum(X_58);
-sql.exportValue(1,sys.L1,revenue,decimal,30,4,9,X_59,);
+sql.exportValue(1,sys.L1,revenue,decimal,30,4,10,X_59,);
 end user.s2_1;
 
 # 22:53:26   
diff --git a/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
@@ -93,7 +93,7 @@ function user.s2_1{autoCommit=true}(A0:s
 X_84:hge := aggr.sum(X_83);
 X_85 := calc./(X_77,X_84);
 X_86 := calc.*(A0,X_85);
-sql.exportValue(1,.L2,promo_revenue,decimal,39,2,9,X_86,);
+sql.exportValue(1,.L2,promo_revenue,decimal,39,2,10,X_86,);
 end user.s2_1;
 
 # 22:53:29   
diff --git a/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128

MonetDB: default - approved output after profiler changes

2015-02-22 Thread Niels Nes

Changeset: 58edc51c22db for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=58edc51c22db
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
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/exports.stable.out
Branch: default
Log Message:

approved output after profiler changes


diffs (truncated from 3218 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
@@ -40136,7 +40136,7 @@ pattern querylog.call(tick1:timestamp,ti
 address QLOGcall;
 comment Add a new query call to the query log
 
-command querylog.define(q:str,pipe:str):void 
+command querylog.define(q:str,pipe:str,size:int):void 
 address QLOGdefineNaive;
 comment Noop operation, just marking the query
 
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
@@ -51071,7 +51071,7 @@ pattern querylog.call(tick1:timestamp,ti
 address QLOGcall;
 comment Add a new query call to the query log
 
-command querylog.define(q:str,pipe:str):void 
+command querylog.define(q:str,pipe:str,size:int):void 
 address QLOGdefineNaive;
 comment Noop operation, just marking the query
 
diff --git a/clients/Tests/SQL-dump_all.stable.out 
b/clients/Tests/SQL-dump_all.stable.out
--- a/clients/Tests/SQL-dump_all.stable.out
+++ b/clients/Tests/SQL-dump_all.stable.out
@@ -201,6 +201,8 @@ SYSTEM FUNCTION  sys.point
 SYSTEM FUNCTION  sys.pointfromtext
 SYSTEM FUNCTION  sys.polyfromtext
 SYSTEM FUNCTION  sys.polygonfromtext
+SYSTEM FUNCTION  sys.profiler_openstream
+SYSTEM FUNCTION  sys.profiler_stethoscope
 SYSTEM FUNCTION  sys.quantile
 SYSTEM FUNCTION  sys.querycache
 SYSTEM FUNCTION  sys.querylog
diff --git a/clients/Tests/SQL-dump_all.stable.out.int128 
b/clients/Tests/SQL-dump_all.stable.out.int128
--- a/clients/Tests/SQL-dump_all.stable.out.int128
+++ b/clients/Tests/SQL-dump_all.stable.out.int128
@@ -197,6 +197,8 @@ SYSTEM FUNCTION  sys.point
 SYSTEM FUNCTION  sys.pointfromtext
 SYSTEM FUNCTION  sys.polyfromtext
 SYSTEM FUNCTION  sys.polygonfromtext
+SYSTEM FUNCTION  sys.profiler_openstream
+SYSTEM FUNCTION  sys.profiler_stethoscope
 SYSTEM FUNCTION  sys.quantile
 SYSTEM FUNCTION  sys.querycache
 SYSTEM FUNCTION  sys.querylog
@@ -1826,121 +1828,121 @@ 5957  minfltbigint64  0   
5961NULLtr
 5958   majfltbigint64  0   5961NULLtrue
10  NULL
 5959   nvcsw bigint64  0   5961NULLtrue11  
NULL
 5960   stmt  clob  0   0   5961NULLtrue12  NULL
-6084   user  clob  0   0   6090NULLtrue0   NULL
-6085   login timestamp 7   0   6090NULLtrue1   
NULL
-6086   sessiontimeoutbigint64  0   6090NULL
true2   NULL
-6087   lastcommand   timestamp 7   0   6090NULLtrue
3   NULL
-6088   querytimeout  bigint64  0   6090NULLtrue
4   NULL
-6089   activeboolean   1   0   6090NULLtrue
5   NULL
-6167   name  clob  0   0   6170NULLtrue0   NULL
-6168   def   clob  0   0   6170NULLtrue1   NULL
-6169   statusclob  0   0   6170NULLtrue2   
NULL
-6176   name  clob  0   0   6178NULLtrue0   NULL
-6177   value clob  0   0   6178NULLtrue1   NULL
-6208   qtag  bigint64  0   6216NULLtrue0   
NULL
-6209   user  clob  0   0   6216NULLtrue1   NULL
-6210   started   timestamp 7   0   6216NULLtrue
2   NULL
-6211   estimate  timestamp 7   0   6216NULLtrue
3   NULL
-6212   progress  int   32  0   6216NULLtrue4   
NULL
-6213   statusclob  0   0   6216NULLtrue5   
NULL
-6214   tag   oid   63  0   6216NULLtrue6   NULL
-6215   query clob  0   0   6216NULLtrue7   NULL
-6909   schemaclob  0   0   6922NULLtrue0   
NULL
-6910   table clob  0   0   6922NULLtrue1   NULL
-6911   columnclob  0   0   6922NULLtrue2   
NULL
-6912   type  clob  0   0   6922NULLtrue3   NULL
-6913   mode  clob  0   0   6922NULLtrue4   NULL
-6914

MonetDB: default - approved output after profiler's new functions

2015-02-22 Thread Niels Nes

Changeset: 618a83bac43b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=618a83bac43b
Modified Files:
sql/test/Tests/systemfunctions_bam.stable.out
sql/test/Tests/systemfunctions_bam.stable.out.int128
Branch: default
Log Message:

approved output after profiler's new functions


diffs (26 lines):

diff --git a/sql/test/Tests/systemfunctions_bam.stable.out 
b/sql/test/Tests/systemfunctions_bam.stable.out
--- a/sql/test/Tests/systemfunctions_bam.stable.out
+++ b/sql/test/Tests/systemfunctions_bam.stable.out
@@ -533,6 +533,9 @@ Ready.
 [ sys,   polygonfromtext,  0,  polygon,  -- 
alias\ncreate function polygonfromtext(wkt string, srid smallint) returns 
polygon external name geom.\PolyFromText\; ]
 [ sys,   polygonfromtext,  1,  clob,   ]
 [ sys,   polygonfromtext,  2,  smallint,   ]
+[ sys,   profiler_openstream,  0,  clob, create procedure 
profiler_openstream(host string, port int) external name 
profiler.\openStream\;]
+[ sys,   profiler_openstream,  1,  int,]
+[ sys,   profiler_stethoscope, 0,  int,  create procedure 
profiler_stethoscope(ticks int) external name profiler.stethoscope;  ]
 [ sys,   quantile, 0,  tinyint,  create aggregate 
quantile(val tinyint, q double) returns tinyint\n \texternal name 
\aggr\.\quantile\; ]
 [ sys,   quantile, 1,  tinyint,]
 [ sys,   quantile, 2,  double, ]
diff --git a/sql/test/Tests/systemfunctions_bam.stable.out.int128 
b/sql/test/Tests/systemfunctions_bam.stable.out.int128
--- a/sql/test/Tests/systemfunctions_bam.stable.out.int128
+++ b/sql/test/Tests/systemfunctions_bam.stable.out.int128
@@ -551,6 +551,9 @@ Ready.
 [ sys,   polygonfromtext,  0,  polygon,  -- 
alias\ncreate function polygonfromtext(wkt string, srid smallint) returns 
polygon external name geom.\PolyFromText\; ]
 [ sys,   polygonfromtext,  1,  clob,   ]
 [ sys,   polygonfromtext,  2,  smallint,   ]
+[ sys,   profiler_openstream,  0,  clob, create procedure 
profiler_openstream(host string, port int) external name 
profiler.\openStream\;]
+[ sys,   profiler_openstream,  1,  int,]
+[ sys,   profiler_stethoscope, 0,  int,  create procedure 
profiler_stethoscope(ticks int) external name profiler.stethoscope;  ]
 [ sys,   quantile, 0,  tinyint,  create aggregate 
quantile(val tinyint, q double) returns tinyint\n \texternal name 
\aggr\.\quantile\; ]
 [ sys,   quantile, 1,  tinyint,]
 [ sys,   quantile, 2,  double, ]
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output after querylog changes

2015-02-22 Thread Niels Nes

Changeset: 249e4dd2c575 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=249e4dd2c575
Modified Files:
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
Branch: default
Log Message:

approved output after querylog changes


diffs (102 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
@@ -27,9 +27,9 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 81 # length
+% 83 # length
 function user.s2_1{autoCommit=true}(A0:bte,A1:bte):void;
-X_14:void  := querylog.define(explain select 
fuse(1,2);,sequential_pipe);
+X_14:void  := querylog.define(explain select 
fuse(1,2);,sequential_pipe,5);
 X_4 := udf.fuse(A0,A1);
 sql.exportValue(1,.L,fuse_single_value,smallint,16,0,7,X_4,);
 end user.s2_1;
@@ -43,9 +43,9 @@ end user.s2_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 87 # length
+% 89 # length
 function user.s3_1{autoCommit=true}(A0:sht,A1:sht):void;
-X_14:void  := querylog.define(explain select 
fuse(1000,2000);,sequential_pipe);
+X_14:void  := querylog.define(explain select 
fuse(1000,2000);,sequential_pipe,5);
 X_4 := udf.fuse(A0,A1);
 sql.exportValue(1,.L,fuse_single_value,int,32,0,7,X_4,);
 end user.s3_1;
@@ -59,9 +59,9 @@ end user.s3_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 93 # length
+% 95 # length
 function user.s4_1{autoCommit=true}(A0:int,A1:int):void;
-X_14:void  := querylog.define(explain select 
fuse(100,200);,sequential_pipe);
+X_14:void  := querylog.define(explain select 
fuse(100,200);,sequential_pipe,5);
 X_4 := udf.fuse(A0,A1);
 sql.exportValue(1,.L,fuse_single_value,bigint,64,0,7,X_4,);
 end user.s4_1;
@@ -93,9 +93,9 @@ end user.s4_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 95 # length
+% 98 # length
 function user.s8_1{autoCommit=true}():void;
-X_32:void  := querylog.define(explain select fuse(a,b) from 
udf_fuse;,sequential_pipe);
+X_32:void  := querylog.define(explain select fuse(a,b) from 
udf_fuse;,sequential_pipe,20);
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,sys,udf_fuse);
 X_6:bat[:oid,:bte]  := sql.bind(X_2,sys,udf_fuse,a,0);
@@ -118,9 +118,9 @@ end user.s8_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 95 # length
+% 98 # length
 function user.s9_1{autoCommit=true}():void;
-X_32:void  := querylog.define(explain select fuse(c,d) from 
udf_fuse;,sequential_pipe);
+X_32:void  := querylog.define(explain select fuse(c,d) from 
udf_fuse;,sequential_pipe,20);
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,sys,udf_fuse);
 X_6:bat[:oid,:sht]  := sql.bind(X_2,sys,udf_fuse,c,0);
@@ -143,9 +143,9 @@ end user.s9_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 95 # length
+% 98 # length
 function user.s10_1{autoCommit=true}():void;
-X_32:void  := querylog.define(explain select fuse(e,f) from 
udf_fuse;,sequential_pipe);
+X_32:void  := querylog.define(explain select fuse(e,f) from 
udf_fuse;,sequential_pipe,20);
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,sys,udf_fuse);
 X_6:bat[:oid,:int]  := sql.bind(X_2,sys,udf_fuse,e,0);
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,9 +48,9 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 94 # length
+% 96 # length
 function user.s2_1{autoCommit=true}(A0:str):void;
-X_12:void  := querylog.define(explain select 
reverse(\\'MonetDB\\');,sequential_pipe);
+X_12:void  := querylog.define(explain select 
reverse(\\'MonetDB\\');,sequential_pipe,5);
 X_3 := udf.reverse(A0);
 sql.exportValue(1,.L,reverse_single_value,clob,0,0,4,X_3,);
 end user.s2_1;
@@ -82,9 +82,9 @@ end user.s2_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 99 # length
+% 102 # length
 function user.s6_1{autoCommit=true}():void;
-X_24:void  := querylog.define(explain select reverse(x) from 
udf_reverse;,sequential_pipe);
+X_24:void  := querylog.define(explain select reverse(x) from 
udf_reverse;,sequential_pipe,15);
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,sys,udf_reverse);
 X_6:bat[:oid,:str]  := sql.bind(X_2,sys,udf_reverse,x,0);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2015-02-22 Thread Niels Nes

Changeset: 9545aa95d8c7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9545aa95d8c7
Modified Files:
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: default
Log Message:

approved output


diffs (200 lines):

diff --git a/sql/test/leaks/Tests/check1_bam.stable.out.int128 
b/sql/test/leaks/Tests/check1_bam.stable.out.int128
--- a/sql/test/leaks/Tests/check1_bam.stable.out.int128
+++ b/sql/test/leaks/Tests/check1_bam.stable.out.int128
@@ -43,7 +43,7 @@ Ready.
 [ oid,   bit,  1515]
 [ oid,   bit,  1515]
 [ oid,   bit,  1515]
-[ oid,   bte,  4247]
+[ oid,   bte,  4246]
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
@@ -109,11 +109,11 @@ Ready.
 [ oid,   int,  1515]
 [ oid,   int,  1515]
 [ oid,   int,  1515]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
 [ oid,   lng,  0   ]
 [ oid,   lng,  0   ]
 [ oid,   lng,  0   ]
@@ -239,8 +239,8 @@ Ready.
 [ oid,   str,  1515]
 [ oid,   str,  1515]
 [ oid,   str,  1515]
-[ oid,   str,  4247]
-[ oid,   str,  4247]
+[ oid,   str,  4246]
+[ oid,   str,  4246]
 [ oid,   timestamp,0   ]
 [ oid,   timestamp,0   ]
 [ oid,   wrd,  0   ]
diff --git a/sql/test/leaks/Tests/check2_bam.stable.out.int128 
b/sql/test/leaks/Tests/check2_bam.stable.out.int128
--- a/sql/test/leaks/Tests/check2_bam.stable.out.int128
+++ b/sql/test/leaks/Tests/check2_bam.stable.out.int128
@@ -43,7 +43,7 @@ Ready.
 [ oid,   bit,  1515]
 [ oid,   bit,  1515]
 [ oid,   bit,  1515]
-[ oid,   bte,  4247]
+[ oid,   bte,  4246]
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
@@ -109,11 +109,11 @@ Ready.
 [ oid,   int,  1515]
 [ oid,   int,  1515]
 [ oid,   int,  1515]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
 [ oid,   lng,  0   ]
 [ oid,   lng,  0   ]
 [ oid,   lng,  0   ]
@@ -239,8 +239,8 @@ Ready.
 [ oid,   str,  1515]
 [ oid,   str,  1515]
 [ oid,   str,  1515]
-[ oid,   str,  4247]
-[ oid,   str,  4247]
+[ oid,   str,  4246]
+[ oid,   str,  4246]
 [ oid,   timestamp,0   ]
 [ oid,   timestamp,0   ]
 [ oid,   wrd,  0   ]
diff --git a/sql/test/leaks/Tests/check3_bam.stable.out.int128 
b/sql/test/leaks/Tests/check3_bam.stable.out.int128
--- a/sql/test/leaks/Tests/check3_bam.stable.out.int128
+++ b/sql/test/leaks/Tests/check3_bam.stable.out.int128
@@ -43,7 +43,7 @@ Ready.
 [ oid,   bit,  1515]
 [ oid,   bit,  1515]
 [ oid,   bit,  1515]
-[ oid,   bte,  4247]
+[ oid,   bte,  4246]
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
@@ -109,11 +109,11 @@ Ready.
 [ oid,   int,  1515]
 [ oid,   int,  1515]
 [ oid,   int,  1515]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
-[ oid,   int,  4247]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
+[ oid,   int,  4246]
 [ oid,   lng,  0   ]
 [ oid,   lng,  0   ]
 [ oid,   lng,  0   ]
@@ -239,8 +239,8 @@ Ready.
 [ oid,   str,  1515]
 [ oid,   str,  1515]
 [ oid,   str,  1515]
-[ oid,   str,  4247]
-[ oid,   str,  4247]
+[ oid,   str,  4246]
+[ oid,   str,  4246]
 [ oid,   timestamp,0   ]
 [ oid,   timestamp,0   ]
 [ oid,   wrd,  0   ]
diff --git a/sql/test/leaks/Tests/check4_bam.stable.out.int128 
b/sql/test/leaks/Tests/check4_bam.stable.out.int128
--- a/sql/test/leaks/Tests/check4_bam.stable.out.int128
+++ b/sql/test/leaks/Tests/check4_bam.stable.out.int128
@@ -43,7 +43,7 @@ Ready.
 [ oid,   bit,  1515]
 [ oid,   bit,  1515]
 [ oid,   bit,  1515]
-[ oid,   bte,  4247]
+[ oid,   bte,  4246]
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
 [ oid,   int,

MonetDB: default - approved output

2015-01-21 Thread Niels Nes

Changeset: 0a8a327a33b5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a8a327a33b5
Modified Files:
sql/test/Tests/systemfunctions_bam.stable.out.int128
Branch: default
Log Message:

approved output


diffs (127 lines):

diff --git a/sql/test/Tests/systemfunctions_bam.stable.out.int128 
b/sql/test/Tests/systemfunctions_bam.stable.out.int128
--- a/sql/test/Tests/systemfunctions_bam.stable.out.int128
+++ b/sql/test/Tests/systemfunctions_bam.stable.out.int128
@@ -135,6 +135,8 @@ Ready.
 [ sys,   Intersect,0,  boolean,  create function 
\Intersect\(a geometry, b geometry) returns boolean external name 
geom.\Intersect\;   ]
 [ sys,   Intersect,1,  geometry,   ]
 [ sys,   Intersect,2,  geometry,   ]
+[ sys,   Intersect,0,  geometry, create filter function 
\Intersect\(a geometry, b geometry) external name geom.\Intersect\;
]
+[ sys,   Intersect,1,  geometry,   ]
 [ sys,   Union,0,  geometry, create function 
\Union\(a geometry, b geometry) returns geometry external name 
geom.\Union\;  ]
 [ sys,   Union,1,  geometry,   ]
 [ sys,   Union,2,  geometry,   ]
@@ -196,6 +198,15 @@ Ready.
 [ sys,   contains, 0,  boolean,  create function 
contains(a geometry, b geometry) returns boolean external name 
geom.\Contains\; ]
 [ sys,   contains, 1,  geometry,   ]
 [ sys,   contains, 2,  geometry,   ]
+[ sys,   contains, 0,  boolean,  create function 
contains(a geometry, x double, y double) returns boolean external name 
geom.\Contains\; ]
+[ sys,   contains, 1,  geometry,   ]
+[ sys,   contains, 2,  double, ]
+[ sys,   contains, 3,  double, ]
+[ sys,   contains, 0,  geometry, create filter function 
contains(a geometry, b geometry) external name geom.\Contains\;  ]
+[ sys,   contains, 1,  geometry,   ]
+[ sys,   contains, 0,  geometry, create filter function 
contains(a geometry, x double, y double) external name geom.\Contains\;  
]
+[ sys,   contains, 1,  double, ]
+[ sys,   contains, 2,  double, ]
 [ sys,   convexhull,   0,  geometry, create function 
convexhull(a geometry) returns geometry external name geom.\ConvexHull\;]
 [ sys,   convexhull,   1,  geometry,   ]
 [ sys,   corr, 0,  tinyint,  create aggregate corr(e1 
tinyint, e2 tinyint) returns tinyint\n\texternal name \aggr\.\corr\; ]
@@ -225,6 +236,8 @@ Ready.
 [ sys,   crosses,  0,  boolean,  create function 
crosses(a geometry, b geometry) returns boolean external name 
geom.\Crosses\;   ]
 [ sys,   crosses,  1,  geometry,   ]
 [ sys,   crosses,  2,  geometry,   ]
+[ sys,   crosses,  0,  geometry, create filter function 
crosses(a geometry, b geometry) external name geom.\Crosses\;]
+[ sys,   crosses,  1,  geometry,   ]
 [ sys,   date_to_str,  0,  clob, create function date_to_str(d 
date, format string) returns string\n\texternal name mtime.\date_to_str\;
 ]
 [ sys,   date_to_str,  1,  date,   ]
 [ sys,   date_to_str,  2,  clob,   ]
@@ -290,6 +303,8 @@ Ready.
 [ sys,   disjoint, 0,  boolean,  create function 
disjoint(a geometry, b geometry) returns boolean external name 
geom.\Disjoint\; ]
 [ sys,   disjoint, 1,  geometry,   ]
 [ sys,   disjoint, 2,  geometry,   ]
+[ sys,   disjoint, 0,  geometry, create filter function 
disjoint(a geometry, b geometry) external name geom.\Disjoint\;  ]
+[ sys,   disjoint, 1,  geometry,   ]
 [ sys,   distance, 0,  double,   create function 
distance(a geometry, b geometry) returns float external name 
geom.\Distance\;   ]
 [ sys,   distance, 1,  geometry,   ]
 [ sys,   distance, 2,  geometry,   ]
@@ -299,9 +314,17 @@ Ready.
 [ sys,   envelope, 1,  geometry,   ]
 [ sys,   environment,  0,  clob, -- The environment 
table\ncreate function sys.environment()\n\treturns table (\name\ string, 
value string)\n\texternal name sql.sql_environment;]
 [ sys,   environment,  1,  clob,   ]
+[ sys,   epoch,0,  timestamp,-- The contents of 
this file are subject to the MonetDB Public License\n-- Version 1.1 (the 
\License\); you may not use this file except in\n-- compliance with the 
License. You may obtain a copy of the License at\n-- 
http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software distributed under 
the License is distributed on an \AS IS\\n-- basis, WITHOUT

MonetDB: default - approved output

2014-12-03 Thread Niels Nes

Changeset: c3cbe3975d84 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c3cbe3975d84
Modified Files:
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
Branch: default
Log Message:

approved output


diffs (truncated from 305 to 300 lines):

diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
@@ -117,13 +117,13 @@ function user.s2_1{autoCommit=true}(A0:s
 X_105:hge  := aggr.sum(X_104);
 X_106 := calc.*(X_105,A1);
 X_107 := sql.single(X_106);
-X_108:bat[:oid,:hge]  := batcalc.hge(5,X_107,39,2);
-(X_110,r1_166) := 
algebra.subthetajoin(X_85,X_108,nil:BAT,nil:BAT,1,true,nil:lng);
+X_109:bat[:oid,:hge]  := batsql.dec_round(X_107,100:hge);
+(X_110,r1_169) := 
algebra.subthetajoin(X_85,X_109,nil:BAT,nil:BAT,1,true,nil:lng);
 X_115 := algebra.tinter(X_63,X_110);
 X_116 := algebra.leftfetchjoin(X_115,X_85);
-(X_117,r1_173,r2_173) := algebra.subsort(X_116,true,false);
-X_121:bat[:oid,:int]  := algebra.leftfetchjoinPath(r1_173,X_115,X_62);
-X_122 := algebra.leftfetchjoin(r1_173,X_116);
+(X_117,r1_176,r2_176) := algebra.subsort(X_116,true,false);
+X_121:bat[:oid,:int]  := algebra.leftfetchjoinPath(r1_176,X_115,X_62);
+X_122 := algebra.leftfetchjoin(r1_176,X_116);
 X_123 := sql.resultSet(2,1,X_121);
 sql.rsColumn(X_123,sys.partsupp,ps_partkey,int,32,0,X_121);
 sql.rsColumn(X_123,sys.L1,value,decimal,39,2,X_122);
diff --git a/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128 
b/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
@@ -81,8 +81,8 @@ project (
 | | | | | table(sys.partsupp) [ partsupp.ps_availqty NOT NULL, 
partsupp.ps_supplycost NOT NULL, partsupp.%partsupp_ps_suppkey_fkey NOT NULL 
JOINIDX sys.partsupp.partsupp_ps_suppkey_fkey ] COUNT 
 | | | | ) [ partsupp.%partsupp_ps_suppkey_fkey NOT NULL = supplier.%TID% NOT 
NULL JOINIDX sys.partsupp.partsupp_ps_suppkey_fkey ]
 | | | ) [  ] [ sys.sum no nil 
(sys.sql_mul(decimal(39,2)[partsupp.ps_supplycost NOT NULL] as 
partsupp.ps_supplycost, partsupp.ps_availqty NOT NULL)) as L3.L3 ]
-| | ) [ sys.sql_mul(L3, decimal(4,3) 10) as L4.L4 ]
-| ) [ L2  decimal(39,2)[L4.L4] ]
+| | ) [ sys.sql_mul(L3, decimal(4,3) 1) as L4.L4 ]
+| ) [ L2  sys.scale_down(L4.L4, hugeint 100) ]
 ) [ partsupp.ps_partkey NOT NULL, L1 as L1.value ] [ L1.value ]
 
 # 22:46:31   
diff --git a/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
@@ -94,13 +94,13 @@ function user.s2_1{autoCommit=true}(A0:b
 (X_76,r1_90) := sql.bind(X_6,sys,lineitem,l_quantity,2);
 X_78:bat[:oid,:int]  := sql.bind(X_6,sys,lineitem,l_quantity,1);
 X_79 := sql.projectdelta(X_7,X_74,X_76,r1_90,X_78);
-X_85 := algebra.leftfetchjoin(X_58,X_79);
-X_86 := batcalc.dbl(X_85);
-X_87:bat[:oid,:dbl]  := aggr.subavg(X_86,X_71,r1_85,true,true);
+X_86 := algebra.leftfetchjoin(X_58,X_79);
+X_87 := batcalc.dbl(X_86);
+X_88:bat[:oid,:dbl]  := aggr.subavg(X_87,X_71,r1_85,true,true);
 X_80:bat[:oid,:int]  := algebra.leftfetchjoinPath(X_150,X_43,X_79);
-X_89:bat[:oid,:dbl]  := batcalc.*(A3,X_87);
-X_90 := batcalc.int(X_89);
-X_91:bat[:oid,:bit]  := batcalc.(X_80,X_90);
+X_81 := batcalc.dbl(X_80);
+X_90:bat[:oid,:dbl]  := batcalc.*(A3,X_88);
+X_91:bat[:oid,:bit]  := batcalc.(X_81,X_90);
 X_92 := algebra.subselect(X_91,true,true,true,true,false);
 X_94:bat[:oid,:lng]  := sql.bind(X_6,sys,lineitem,l_extendedprice,0);
 (X_97,r1_124) := sql.bind(X_6,sys,lineitem,l_extendedprice,2);
@@ -109,9 +109,9 @@ function user.s2_1{autoCommit=true}(A0:b
 X_101:bat[:oid,:lng]  := algebra.leftfetchjoinPath(X_92,X_150,X_43,X_100);
 X_102:hge  := aggr.sum(X_101);
 X_103 := calc.lng(2,X_102,15,2);
-X_106 := calc.lng(2,X_103,18,5);
+X_105 := calc.lng(2,X_103,18,5);
 X_109 := calc.lng(1,A0,15,2);
-X_111 := calc./(X_106,X_109);
+X_111 := calc./(X_105,X_109);
 sql.exportValue(1,sys.L3,avg_yearly,decimal,18,3,8,X_111,);
 end s2_1;
 # querylog.define(explain select\n\tsum(l_extendedprice) / 7.0 as 
avg_yearly\nfrom\n\tlineitem,\n\tpart\nwhere\n\tp_partkey = l_partkey\n\tand 
p_brand =

MonetDB: default - approved output

2014-11-30 Thread Niels Nes

Changeset: 0adebd93fb17 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0adebd93fb17
Modified Files:
sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err
Branch: default
Log Message:

approved output


diffs (12 lines):

diff --git 
a/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err 
b/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err
--- a/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err
+++ b/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err
@@ -31,7 +31,7 @@ stderr of test 'in_incorrect_multi.Bug-3
 MAPI  = (monetdb) /var/tmp/mtest-1586/.s.monetdb.39561
 QUERY = SELECT * FROM SYS.ARGS
  WHERE FUNC_ID NOT IN (SELECT * FROM SYS.FUNCTIONS);
-ERROR = !IN: iinner query should return a single column
+ERROR = !IN: inner query should return a single column
 
 # 14:17:13   
 # 14:17:13   Done.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2014-11-30 Thread Niels Nes

Changeset: cb319042dc9f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb319042dc9f
Modified Files:
sql/backends/monet5/Tests/limithack.stable.out
Branch: default
Log Message:

approved output


diffs (12 lines):

diff --git a/sql/backends/monet5/Tests/limithack.stable.out 
b/sql/backends/monet5/Tests/limithack.stable.out
--- a/sql/backends/monet5/Tests/limithack.stable.out
+++ b/sql/backends/monet5/Tests/limithack.stable.out
@@ -67,7 +67,7 @@ Ready.
 % id,  name,   schema_id,  query,  type,   system, commit_action,  
readonly,   temporary # name
 % int, varchar,int,varchar,smallint,   boolean,
smallint,   boolean,tinyint # type
 % 4,   15, 4,  0,  1,  5,  1,  5,  1 # length
-[ 7200,systemfunctions,  2000,   NULL,   0,  true,   0,  
false,  0   ]
+[ 7194,systemfunctions,  2000,   NULL,   0,  true,   0,  
false,  0   ]
 
 # 17:27:34   
 # 17:27:34   Done.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2014-11-30 Thread Niels Nes

Changeset: f0de6b905a61 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0de6b905a61
Modified Files:
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
Branch: default
Log Message:

approved output


diffs (120 lines):

diff --git a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out 
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
--- a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
@@ -38,73 +38,68 @@ Ready.
 [ 141246720,   42.0]
 [ 141246720,   43.0]
 [ 141246720,   NULL]
-[ 141246720,   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
 function user.s5_1{autoCommit=true}(A0:timestamp,A1:timestamp,A2:void):void;
-barrier X_116 := language.dataflow();
+barrier X_109 := language.dataflow();
+X_5 := sql.mvc();
 X_6:bat[:oid,:lng]  := bat.new(nil:oid,nil:lng);
-X_5 := sql.mvc();
-X_67:bat[:oid,:oid]  := sql.tid(X_5,sys,foo_nil_2dec,0,2);
-X_70:bat[:oid,:timestamp]  := sql.bind(X_5,sys,foo_nil_2dec,t,0,0,2);
-(X_72:bat[:oid,:oid] ,X_73:bat[:oid,:timestamp] ) := 
sql.bind(X_5,sys,foo_nil_2dec,t,2,0,2);
-X_82 := sql.delta(X_70,X_72,X_73);
-X_84 := algebra.leftfetchjoin(X_67,X_82);
+X_66:bat[:oid,:oid]  := sql.tid(X_5,sys,foo_nil_2dec,0,2);
+X_68:bat[:oid,:oid]  := sql.tid(X_5,sys,foo_nil_2dec,1,2);
+X_69:bat[:oid,:timestamp]  := sql.bind(X_5,sys,foo_nil_2dec,t,0,0,2);
+X_70:bat[:oid,:timestamp]  := sql.bind(X_5,sys,foo_nil_2dec,t,0,1,2);
+(X_71:bat[:oid,:oid] ,X_72:bat[:oid,:timestamp] ) := 
sql.bind(X_5,sys,foo_nil_2dec,t,2,0,2);
+(X_73:bat[:oid,:oid] ,X_74:bat[:oid,:timestamp] ) := 
sql.bind(X_5,sys,foo_nil_2dec,t,2,1,2);
+X_14:bat[:oid,:timestamp]  := sql.bind(X_5,sys,foo_nil_2dec,t,1);
+X_81 := sql.delta(X_69,X_71,X_72);
+X_82 := sql.delta(X_70,X_73,X_74,X_14);
+X_83 := algebra.leftfetchjoin(X_66,X_81);
+X_84 := algebra.leftfetchjoin(X_68,X_82);
 X_16 := calc.timestamp(A0,7);
+X_85 := algebra.project(X_83,X_16);
 X_86 := algebra.project(X_84,X_16);
+X_87 := batmtime.diff(X_83,X_85);
 X_88 := batmtime.diff(X_84,X_86);
-X_69:bat[:oid,:oid]  := sql.tid(X_5,sys,foo_nil_2dec,1,2);
-X_71:bat[:oid,:timestamp]  := sql.bind(X_5,sys,foo_nil_2dec,t,0,1,2);
-(X_74:bat[:oid,:oid] ,X_75:bat[:oid,:timestamp] ) := 
sql.bind(X_5,sys,foo_nil_2dec,t,2,1,2);
-X_14:bat[:oid,:timestamp]  := sql.bind(X_5,sys,foo_nil_2dec,t,1);
-X_83 := sql.delta(X_71,X_74,X_75,X_14);
-X_85 := algebra.leftfetchjoin(X_69,X_83);
-X_87 := algebra.project(X_85,X_16);
-X_89 := batmtime.diff(X_85,X_87);
-X_104 := mat.packIncrement(X_88,2);
-X_18:bat[:oid,:lng]  := mat.packIncrement(X_104,X_89);
+X_99 := mat.packIncrement(X_87,2);
+X_18:bat[:oid,:lng]  := mat.packIncrement(X_99,X_88);
 X_19 := bat.append(X_6,X_18,true);
 X_20 := calc.timestamp(A1,7);
+X_91 := algebra.project(X_83,X_20);
 X_92 := algebra.project(X_84,X_20);
+X_93 := batmtime.diff(X_83,X_91);
 X_94 := batmtime.diff(X_84,X_92);
-X_93 := algebra.project(X_85,X_20);
-X_95 := batmtime.diff(X_85,X_93);
-X_106 := mat.packIncrement(X_94,2);
-X_21:bat[:oid,:lng]  := mat.packIncrement(X_106,X_95);
+X_101 := mat.packIncrement(X_93,2);
+X_21:bat[:oid,:lng]  := mat.packIncrement(X_101,X_94);
 X_22 := bat.append(X_19,X_21,true);
 X_24:bat[:oid,:lng]  := bat.new(nil:oid,nil:lng);
-X_76:bat[:oid,:lng]  := sql.bind(X_5,sys,foo_nil_2dec,v,0,0,2);
-(X_78:bat[:oid,:oid] ,X_79:bat[:oid,:lng] ) := 
sql.bind(X_5,sys,foo_nil_2dec,v,2,0,2);
-X_96 := sql.delta(X_76,X_78,X_79);
-X_98 := algebra.leftfetchjoin(X_67,X_96);
-X_77:bat[:oid,:lng]  := sql.bind(X_5,sys,foo_nil_2dec,v,0,1,2);
-(X_80:bat[:oid,:oid] ,X_81:bat[:oid,:lng] ) := 
sql.bind(X_5,sys,foo_nil_2dec,v,2,1,2);
+X_75:bat[:oid,:lng]  := sql.bind(X_5,sys,foo_nil_2dec,v,0,0,2);
+X_76:bat[:oid,:lng]  := sql.bind(X_5,sys,foo_nil_2dec,v,0,1,2);
+(X_77:bat[:oid,:oid] ,X_78:bat[:oid,:lng] ) := 
sql.bind(X_5,sys,foo_nil_2dec,v,2,0,2);
+(X_79:bat[:oid,:oid] ,X_80:bat[:oid,:lng] ) := 
sql.bind(X_5,sys,foo_nil_2dec,v,2,1,2);
 X_32:bat[:oid,:lng]  := sql.bind(X_5,sys,foo_nil_2dec,v,1);
-X_97 := sql.delta(X_77,X_80,X_81,X_32);
-X_99 := algebra.leftfetchjoin(X_69,X_97);
-X_108 := mat.packIncrement(X_98,2);
-X_34 := mat.packIncrement(X_108,X_99);
+X_95 := sql.delta(X_75,X_77,X_78);
+X_96 := sql.delta(X_76,X_79,X_80,X_32);
+X_97 := algebra.leftfetchjoin(X_66,X_95);
+X_98 := algebra.leftfetchjoin(X_68,X_96);
+X_103 := mat.packIncrement(X_97,2);
+X_34 := mat.packIncrement(X_103,X_98);
 X_35 :=

MonetDB: default - approved output

2014-11-30 Thread Niels Nes

Changeset: db7513df6f5b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db7513df6f5b
Added Files:
sql/test/mergetables/Tests/alter.stable.err
sql/test/mergetables/Tests/alter.stable.out
sql/test/mergetables/Tests/types.stable.err
sql/test/mergetables/Tests/types.stable.out
Branch: default
Log Message:

approved output


diffs (189 lines):

diff --git a/sql/test/mergetables/Tests/alter.stable.err 
b/sql/test/mergetables/Tests/alter.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/alter.stable.err
@@ -0,0 +1,40 @@
+stderr of test 'alter` in directory 'sql/test/mergetables` itself:
+
+
+# 12:41:49   
+# 12:41:49   mserver5 --debug=10 --set gdk_nr_threads=0 --set 
mapi_open=true --set mapi_port=34450 --set 
mapi_usock=/var/tmp/mtest-31544/.s.monetdb.34450 --set monet_prompt= 
--forcemito --set mal_listing=2 
--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables
 --set mal_listing=0 --set embedded_r=yes
+# 12:41:49   
+
+# builtin opt  gdk_dbpath = 
/home/niels/scratch/monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_vmtrim = no
+# builtin opt  monet_prompt = 
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 34450
+# cmdline opt  mapi_usock = /var/tmp/mtest-31544/.s.monetdb.34450
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables
+# cmdline opt  mal_listing = 0
+# cmdline opt  embedded_r = yes
+# cmdline opt  gdk_debug = 536870922
+
+# 12:41:49   
+# 12:41:49   mclient -lsql -ftest -Eutf-8 -i -e 
--host=/var/tmp/mtest-31544 --port=34450
+# 12:41:49   
+
+MAPI  = (monetdb) /var/tmp/mtest-31544/.s.monetdb.34450
+QUERY = select * from mys.smalltable;
+ERROR = !MERGE or REPLICA TABLE should have at least one table associated
+
+# 12:41:49   
+# 12:41:49   Done.
+# 12:41:49   
+
diff --git a/sql/test/mergetables/Tests/alter.stable.out 
b/sql/test/mergetables/Tests/alter.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/alter.stable.out
@@ -0,0 +1,45 @@
+stdout of test 'alter` in directory 'sql/test/mergetables` itself:
+
+
+# 12:41:49   
+# 12:41:49   mserver5 --debug=10 --set gdk_nr_threads=0 --set 
mapi_open=true --set mapi_port=34450 --set 
mapi_usock=/var/tmp/mtest-31544/.s.monetdb.34450 --set monet_prompt= 
--forcemito --set mal_listing=2 
--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables
 --set mal_listing=0 --set embedded_r=yes
+# 12:41:49   
+
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_mergetables', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit 
integers dynamically linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:34450/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-31544/.s.monetdb.34450
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R   module loaded
+
+Ready.
+
+# 12:41:49   
+# 12:41:49   mclient -lsql -ftest -Eutf-8 -i -e 
--host=/var/tmp/mtest-31544 --port=34450
+# 12:41:49   
+
+#create merge table smalltable(i integer, j integer);
+#alter table smalltable add table unknowntable;
+#drop table smalltable;
+#create schema mys;
+#set schema mys;
+#create merge table mys.smalltable(i integer, j integer);
+#create table mys.part (i integer, j integer);
+#insert into mys.part values(1,2);
+[ 1]
+#alter table mys.smalltable add table part1;
+#alter table mys.smalltable add table mys.part1;
+#drop table mys.smalltable;
+#drop table mys.part;
+
+# 12:41:49   
+# 12:41:49   Done.
+# 12:41:49   
+
diff --git a/sql/test/mergetables/Tests/types.stable.err 
b/sql/test/mergetables/Tests/types.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/types.stable.err
@@ -0,0 +1,46 @@
+stderr of test 'types` in directory 'sql/test/mergetables` itself:
+
+
+# 12:41:49   
+# 12:41:49   mserver5 --debug=10 --set gdk_nr_threads=0 --set 
mapi_open=true --set mapi_port=34450 --set 
mapi_usock=/var/tmp/mtest-31544/.s.monetdb.34450 --set monet_prompt= 
--forcemito --set mal_listing=2 
--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables
 --set mal_listing=0 --set embedded_r=yes
+# 12:41:49   
+
+# builtin opt  gdk_dbpath =

MonetDB: default - approved output

2014-11-29 Thread Niels Nes

Changeset: 53ae18146ba0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53ae18146ba0
Modified Files:
sql/backends/monet5/Tests/limithack.stable.out
Branch: default
Log Message:

approved output


diffs (12 lines):

diff --git a/sql/backends/monet5/Tests/limithack.stable.out 
b/sql/backends/monet5/Tests/limithack.stable.out
--- a/sql/backends/monet5/Tests/limithack.stable.out
+++ b/sql/backends/monet5/Tests/limithack.stable.out
@@ -67,7 +67,7 @@ Ready.
 % id,  name,   schema_id,  query,  type,   system, commit_action,  
readonly,   temporary # name
 % int, varchar,int,varchar,smallint,   boolean,
smallint,   boolean,tinyint # type
 % 4,   15, 4,  0,  1,  5,  1,  5,  1 # length
-[ 7201,systemfunctions,  2000,   NULL,   0,  true,   0,  
false,  0   ]
+[ 7200,systemfunctions,  2000,   NULL,   0,  true,   0,  
false,  0   ]
 
 # 17:27:34   
 # 17:27:34   Done.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2014-10-19 Thread Niels Nes

Changeset: 65e702dfd5fe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65e702dfd5fe
Modified Files:
sql/test/mergetables/Tests/mergeload.stable.out
Branch: default
Log Message:

approved output


diffs (15 lines):

diff --git a/sql/test/mergetables/Tests/mergeload.stable.out 
b/sql/test/mergetables/Tests/mergeload.stable.out
--- a/sql/test/mergetables/Tests/mergeload.stable.out
+++ b/sql/test/mergetables/Tests/mergeload.stable.out
@@ -20,11 +20,6 @@ stdout of test 'mergeload` in directory 
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema sys;
-create function epoch(t int) returns timestamp external name timestamp.epoch;
-create function epoch(t timestamp) returns int external name timestamp.epoch;
-create function epoch(t bigint) returns timestamp external name calc.timestamp;
 
 # 16:18:32   
 # 16:18:32   mclient -lsql -ftest -Eutf-8 -i -e 
--host=/var/tmp/mtest-10817 --port=39884
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2014-10-16 Thread Niels Nes

Changeset: 2884636d735e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2884636d735e
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/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
Branch: default
Log Message:

approved output


diffs (truncated from 471 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
@@ -54,9 +54,9 @@ function user.s2_1{autoCommit=true}(A0:i
 X_16:bat[:oid,:int]  := sql.bind(X_6,sys,lineorder,lo_quantity,1);
 X_99 := algebra.thetasubselect(X_16,X_23,A3,);
 X_25 := sql.subdelta(X_96,X_23,X_13,X_97,X_99);
-X_27 := 
sql.bind_idxbat(X_6,sys,lineorder,lineorder_lo_orderdate_fkey,0);
+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 := 
sql.bind_idxbat(X_6,sys,lineorder,lineorder_lo_orderdate_fkey,1);
+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);
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
@@ -54,9 +54,9 @@ function user.s2_1{autoCommit=true}(A0:i
 X_17:bat[:oid,:int]  := sql.bind(X_7,sys,lineorder,lo_quantity,1);
 X_99 := algebra.subselect(X_17,X_24,A3,A4,true,true,false);
 X_26 := sql.subdelta(X_96,X_24,X_14,X_97,X_99);
-X_27 := 
sql.bind_idxbat(X_7,sys,lineorder,lineorder_lo_orderdate_fkey,0);
+X_27:bat[:oid,:oid]  := 
sql.bind_idxbat(X_7,sys,lineorder,lineorder_lo_orderdate_fkey,0);
 (X_29,r1_37) := 
sql.bind_idxbat(X_7,sys,lineorder,lineorder_lo_orderdate_fkey,2);
-X_31 := 
sql.bind_idxbat(X_7,sys,lineorder,lineorder_lo_orderdate_fkey,1);
+X_31:bat[:oid,:oid]  := 
sql.bind_idxbat(X_7,sys,lineorder,lineorder_lo_orderdate_fkey,1);
 X_32 := sql.projectdelta(X_26,X_27,X_29,r1_37,X_31);
 X_36:bat[:oid,:int]  := sql.bind(X_7,sys,dwdate,d_yearmonthnum,0);
 X_33:bat[:oid,:oid]  := sql.tid(X_7,sys,dwdate);
diff --git a/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 
b/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
@@ -54,9 +54,9 @@ function user.s2_1{autoCommit=true}(A0:i
 X_18:bat[:oid,:int]  := sql.bind(X_8,sys,lineorder,lo_quantity,1);
 X_110 := algebra.subselect(X_18,X_25,A4,A5,true,true,false);
 X_27 := sql.subdelta(X_107,X_25,X_15,X_108,X_110);
-X_28 := 
sql.bind_idxbat(X_8,sys,lineorder,lineorder_lo_orderdate_fkey,0);
+X_28:bat[:oid,:oid]  := 
sql.bind_idxbat(X_8,sys,lineorder,lineorder_lo_orderdate_fkey,0);
 (X_30,r1_38) := 
sql.bind_idxbat(X_8,sys,lineorder,lineorder_lo_orderdate_fkey,2);
-X_32 := 
sql.bind_idxbat(X_8,sys,lineorder,lineorder_lo_orderdate_fkey,1);
+X_32:bat[:oid,:oid]  := 
sql.bind_idxbat(X_8,sys,lineorder,lineorder_lo_orderdate_fkey,1);
 X_33 := sql.projectdelta(X_27,X_28,X_30,r1_38,X_32);
 X_37:bat[:oid,:int]  := sql.bind(X_8,sys,dwdate,d_weeknuminyear,0);
 X_45:bat[:oid,:int]  := sql.bind(X_8,sys,dwdate,d_year,0);
diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 
b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
@@ -43,9 +43,9 @@ Ready.
 function user.s2_1{autoCommit=true}(A0:str,A1:str):void;
 X_4 := sql.mvc();
 X_5:bat[:oid,:oid]  := sql.tid(X_4,sys,lineorder);
-X_8 := 
sql.bind_idxbat(X_4,sys,lineorder,lineorder_lo_partkey_fkey,0);
+X_8:bat[:oid,:oid]  := 
sql.bind_idxbat(X_4,sys,lineorder,lineorder_lo_partkey_fkey,0);
 (X_11,r1_11) :=

MonetDB: default - approved output

2014-10-10 Thread Niels Nes

Changeset: 42bbc5ea0c9a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=42bbc5ea0c9a
Modified Files:
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-plan.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.int128
sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
Branch: default
Log Message:

approved output


diffs (truncated from 336 to 300 lines):

diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
@@ -57,7 +57,7 @@ Ready.
 % mal # name
 % clob # type
 % 714 # length
-function user.s2_1{autoCommit=true}(A0:str,A1:lng,A2:str):void;
+function user.s2_1{autoCommit=true}(A0:str,A1:sht,A2:str):void;
 X_5 := sql.mvc();
 X_6:bat[:oid,:oid]  := sql.tid(X_5,sys,supplier);
 X_9 := sql.bind_idxbat(X_5,sys,supplier,supplier_s_nationkey_fkey,0);
@@ -117,13 +117,13 @@ function user.s2_1{autoCommit=true}(A0:s
 X_105:hge  := aggr.sum(X_104);
 X_106 := calc.*(X_105,A1);
 X_107 := sql.single(X_106);
-X_109:bat[:oid,:hge]  := batsql.dec_round(X_107,100:hge);
-(X_110,r1_169) := 
algebra.subthetajoin(X_85,X_109,nil:BAT,nil:BAT,1,true,nil:lng);
+X_108:bat[:oid,:hge]  := batcalc.hge(5,X_107,39,2);
+(X_110,r1_166) := 
algebra.subthetajoin(X_85,X_108,nil:BAT,nil:BAT,1,true,nil:lng);
 X_115 := algebra.tinter(X_63,X_110);
 X_116 := algebra.leftfetchjoin(X_115,X_85);
-(X_117,r1_176,r2_176) := algebra.subsort(X_116,true,false);
-X_121:bat[:oid,:int]  := algebra.leftfetchjoinPath(r1_176,X_115,X_62);
-X_122 := algebra.leftfetchjoin(r1_176,X_116);
+(X_117,r1_173,r2_173) := algebra.subsort(X_116,true,false);
+X_121:bat[:oid,:int]  := algebra.leftfetchjoinPath(r1_173,X_115,X_62);
+X_122 := algebra.leftfetchjoin(r1_173,X_116);
 X_123 := sql.resultSet(2,1,X_121);
 sql.rsColumn(X_123,sys.partsupp,ps_partkey,int,32,0,X_121);
 sql.rsColumn(X_123,sys.L1,value,decimal,39,2,X_122);
diff --git a/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128 
b/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
@@ -81,8 +81,8 @@ project (
 | | | | | table(sys.partsupp) [ partsupp.ps_availqty NOT NULL, 
partsupp.ps_supplycost NOT NULL, partsupp.%partsupp_ps_suppkey_fkey NOT NULL 
JOINIDX sys.partsupp.partsupp_ps_suppkey_fkey ] COUNT 
 | | | | ) [ partsupp.%partsupp_ps_suppkey_fkey NOT NULL = supplier.%TID% NOT 
NULL JOINIDX sys.partsupp.partsupp_ps_suppkey_fkey ]
 | | | ) [  ] [ sys.sum no nil 
(sys.sql_mul(decimal(39,2)[partsupp.ps_supplycost NOT NULL] as 
partsupp.ps_supplycost, partsupp.ps_availqty NOT NULL)) as L3.L3 ]
-| | ) [ sys.sql_mul(L3, decimal(11,10) 1) as L4.L4 ]
-| ) [ L2  sys.scale_down(L4.L4, hugeint 100) ]
+| | ) [ sys.sql_mul(L3, decimal(4,3) 10) as L4.L4 ]
+| ) [ L2  decimal(39,2)[L4.L4] ]
 ) [ partsupp.ps_partkey NOT NULL, L1 as L1.value ] [ L1.value ]
 
 # 22:46:31   
diff --git a/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
@@ -43,7 +43,7 @@ Ready.
 % mal # name
 % clob # type
 % 405 # length
-function 
user.s2_1{autoCommit=true}(A0:int,A1:str,A2:bte,A3:bte,A4:bte,A5:date,A6:date,A7:int):void;
+function 
user.s2_1{autoCommit=true}(A0:sht,A1:str,A2:bte,A3:bte,A4:bte,A5:date,A6:date,A7:int):void;
 X_10 := sql.mvc();
 X_14:bat[:oid,:date]  := sql.bind(X_10,sys,lineitem,l_shipdate,0);
 X_11:bat[:oid,:oid]  := sql.tid(X_10,sys,lineitem);
diff --git a/sql/benchmarks/tpch/Tests/14-plan.stable.out.int128 
b/sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
@@ -51,7 +51,7 @@ project (
 | | | table(sys.part) [ part.p_type NOT NULL, part.%TID% NOT NULL ] COUNT 
 | | ) [ lineitem.%lineitem_l_partkey_fkey NOT NULL = part.%TID% NOT NULL 
JOINIDX sys.lineitem.lineitem_l_partkey_fkey ]
 | ) [  ] [ sys.sum no nil 
(sys.ifthenelse(sys.ifthenelse(sys.isnull(sys.like(part.p_type NOT NULL, 
char[char(6) PROMO%])), boolean false, sys.like(part.p_type NOT NULL, 
char[char(6) PROMO%])), sys.sql_mul(decimal(33,2)[lineitem.l_extendedprice 
NOT NULL] as lineitem.l_extendedprice, sys.sql_sub(decimal(15,2)[tinyint 1], 
lineitem.l_discount NOT NULL)),

MonetDB: default - approved output after bind call changes

2014-10-08 Thread Niels Nes

Changeset: 2fb9c91c72b1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2fb9c91c72b1
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/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
Branch: default
Log Message:

approved output after bind call changes


diffs (truncated from 899 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
@@ -39,38 +39,38 @@ Ready.
 % 246 # length
 function user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int):void;
 X_6 := sql.mvc();
-X_10 := sql.bind(X_6,sys,lineorder,lo_quantity,0);
-X_18 := sql.bind(X_6,sys,lineorder,lo_discount,0);
+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_92 := 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_93 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
-X_22 := sql.bind(X_6,sys,lineorder,lo_discount,1);
+X_22:bat[:oid,:int]  := sql.bind(X_6,sys,lineorder,lo_discount,1);
 X_95 := algebra.subselect(X_22,X_7,A1,A2,true,true,false);
 X_23 := sql.subdelta(X_92,X_7,X_20,X_93,X_95);
 X_96 := algebra.thetasubselect(X_10,X_23,A3,);
 (X_13,r1_13) := sql.bind(X_6,sys,lineorder,lo_quantity,2);
 X_97 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,);
-X_16 := sql.bind(X_6,sys,lineorder,lo_quantity,1);
+X_16:bat[:oid,:int]  := sql.bind(X_6,sys,lineorder,lo_quantity,1);
 X_99 := algebra.thetasubselect(X_16,X_23,A3,);
 X_25 := sql.subdelta(X_96,X_23,X_13,X_97,X_99);
 X_27 := 
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 := 
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 := sql.bind(X_6,sys,dwdate,d_year,0);
+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_100 := 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_101 := algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,true,false);
-X_42 := sql.bind(X_6,sys,dwdate,d_year,1);
+X_42:bat[:oid,:int]  := sql.bind(X_6,sys,dwdate,d_year,1);
 X_103 := algebra.subselect(X_42,X_33,A0,A0,true,true,false);
 X_44 := sql.subdelta(X_100,X_33,X_39,X_101,X_103);
 X_46 := X_44;
 (X_47,r1_59) := algebra.subjoin(X_32,X_46,nil:BAT,nil:BAT,true,nil:lng);
-X_51 := sql.bind(X_6,sys,lineorder,lo_extendedprice,0);
+X_51:bat[:oid,:int]  := 
sql.bind(X_6,sys,lineorder,lo_extendedprice,0);
 (X_54,r1_66) := sql.bind(X_6,sys,lineorder,lo_extendedprice,2);
-X_56 := sql.bind(X_6,sys,lineorder,lo_extendedprice,1);
+X_56:bat[:oid,:int]  := 
sql.bind(X_6,sys,lineorder,lo_extendedprice,1);
 X_57 := sql.projectdelta(X_25,X_51,X_54,r1_66,X_56);
 X_58 := algebra.leftfetchjoin(X_47,X_57);
 X_59 := batcalc.hge(X_58);
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
@@ -39,38 +39,38 @@ Ready.
 % 269 # length
 function user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int,A4:int):void;
 X_7 := sql.mvc();
-X_11 := sql.bind(X_7,sys,lineorder,lo_quantity,0);
-X_19 := sql.bind(X_7,sys,lineorder,lo_discount,0);
+X_11:bat[:oid,:int]  := sql.bind(X_7,sys,lineorder,lo_quantity,0);
+X_19:bat[:oid,:int]  := sql.bind(X_7,sys,lineorder,lo_discount,0);
 X_8:bat[:oid,:oid]  := sql.tid(X_7,sys,lineorder);
 X_92 := algebra.subselect(X_19,X_8,A1,A2,true,true,false);
 (X_21,r1_25) := sql.bind(X_7,sys,lineorder,lo_discount,2);
 X_93 :=

MonetDB: default - approved output after bind changes

2014-10-08 Thread Niels Nes

Changeset: c4221b6caeb0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c4221b6caeb0
Modified Files:
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/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-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: default
Log Message:

approved output after bind changes


diffs (truncated from 1588 to 300 lines):

diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
@@ -53,42 +53,42 @@ Ready.
 % 602 # length
 function user.s2_1{autoCommit=true}(A0:bte,A1:bte,A2:bte,A3:date,A4:lng):void;
 X_7 := sql.mvc();
-X_11 := sql.bind(X_7,sys,lineitem,l_shipdate,0);
+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_189 := algebra.thetasubselect(X_11,X_8,X_19,=);
 (X_14,r1_14) := sql.bind(X_7,sys,lineitem,l_shipdate,2);
 X_190 := algebra.thetasubselect(r1_14,nil:bat[:oid,:oid],X_19,=);
-X_17 := sql.bind(X_7,sys,lineitem,l_shipdate,1);
+X_17:bat[:oid,:date]  := sql.bind(X_7,sys,lineitem,l_shipdate,1);
 X_192 := algebra.thetasubselect(X_17,X_8,X_19,=);
 X_20 := sql.subdelta(X_189,X_8,X_14,X_190,X_192);
-X_22 := 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 := 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 := 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 := 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 := 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 := 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,:hge]  := aggr.subsum(X_61,X_37,r1_45,true,true);
-X_65 := sql.bind(X_7,sys,lineitem,l_extendedprice,0);
+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 := 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,:hge]  := aggr.subsum(X_70,X_37,r1_45,true,true);
 X_73:bat[:oid,:hge]  := batcalc.hge(2,X_70,33,2);
 X_75 := calc.lng(A0,15,2);
-X_77 := sql.bind(X_7,sys,lineitem,l_discount,0);
+X_77:bat[:oid,:lng]  := sql.bind(X_7,sys,lineitem,l_discount,0);
 (X_82,r1_97) := sql.bind(X_7,sys,lineitem,l_discount,2);
-X_85 := sql.bind(X_7,sys,lineitem,l_discount,1);
+X_85:bat[:oid,:lng]  := sql.bind(X_7,sys,lineitem,l_discount,1);
 X_87 := sql.projectdelta(X_20,X_77,X_82,r1_97,X_85);
 X_88:bat[:oid,:lng]  := batcalc.-(X_75,X_87);

MonetDB: default - approved output

2014-10-08 Thread Niels Nes

Changeset: d340c83ee6ad for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d340c83ee6ad
Modified Files:
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128

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/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
Branch: default
Log Message:

approved output


diffs (234 lines):

diff --git 
a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
@@ -48,11 +48,11 @@ project (
 function user.s4_1(A0:hge,A1:bte):void;
 X_3 := sql.mvc();
 X_4:bat[:oid,:oid]  := sql.tid(X_3,sys,dbg);
-X_7 := sql.bind(X_3,sys,dbg,a,0);
+X_7:bat[:oid,:int]  := sql.bind(X_3,sys,dbg,a,0);
 X_10 := algebra.leftfetchjoin(X_4,X_7);
 (X_11,r1_11,r2_11) := group.subgroupdone(X_10);
 X_14 := algebra.leftfetchjoin(r1_11,X_10);
-X_15 := sql.bind(X_3,sys,dbg,b,0);
+X_15:bat[:oid,:int]  := sql.bind(X_3,sys,dbg,b,0);
 X_17 := algebra.leftfetchjoin(X_4,X_15);
 X_18:bat[:oid,:hge]  := aggr.subsum(X_17,X_11,r1_11,true,true);
 X_20 := algebra.project(X_10,A1);
@@ -101,11 +101,11 @@ project (
 function user.s10_1(A0:hge,A1:bte):void;
 X_3 := sql.mvc();
 X_4:bat[:oid,:oid]  := sql.tid(X_3,sys,dbg);
-X_7 := sql.bind(X_3,sys,dbg,a,0);
+X_7:bat[:oid,:int]  := sql.bind(X_3,sys,dbg,a,0);
 X_10 := algebra.leftfetchjoin(X_4,X_7);
 (X_11,r1_11,r2_11) := group.subgroupdone(X_10);
 X_14 := algebra.leftfetchjoin(r1_11,X_10);
-X_15 := sql.bind(X_3,sys,dbg,b,0);
+X_15:bat[:oid,:int]  := sql.bind(X_3,sys,dbg,b,0);
 X_17 := algebra.leftfetchjoin(X_4,X_15);
 X_18:bat[:oid,:hge]  := aggr.subsum(X_17,X_11,r1_11,true,true);
 X_20 := algebra.project(X_10,A1);
diff --git 
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
 
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
--- 
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++ 
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -37,13 +37,13 @@ function user.s2_1(A0:str):void;
 X_47 := algebra.likesubselect(X_6,X_3,A0,,false);
 (X_9,r1_9) := sql.bind(X_2,sys,functions,name,2);
 X_48 := algebra.likesubselect(r1_9,nil:bat[:oid,:oid],A0,,false);
-X_12 := sql.bind(X_2,sys,functions,name,1);
+X_12:bat[:oid,:str]  := sql.bind(X_2,sys,functions,name,1);
 X_50 := algebra.likesubselect(X_12,X_3,A0,,false);
 X_15 := sql.subdelta(X_47,X_3,X_9,X_48,X_50);
 X_17 := sql.projectdelta(X_15,X_6,X_9,r1_9,X_12);
-X_18 := sql.bind(X_2,sys,functions,func,0);
+X_18:bat[:oid,:str]  := sql.bind(X_2,sys,functions,func,0);
 (X_20,r1_25) := sql.bind(X_2,sys,functions,func,2);
-X_22 := sql.bind(X_2,sys,functions,func,1);
+X_22:bat[:oid,:str]  := sql.bind(X_2,sys,functions,func,1);
 X_23 := sql.projectdelta(X_15,X_18,X_20,r1_25,X_22);
 X_24 := sql.resultSet(2,1,X_17);
 sql.rsColumn(X_24,sys.functions,name,varchar,256,0,X_17);
@@ -64,13 +64,13 @@ function user.s3_1(A0:str):void;
 X_47 := algebra.likesubselect(X_6,X_3,A0,,true);
 (X_9,r1_9) := sql.bind(X_2,sys,functions,name,2);
 X_48 := algebra.likesubselect(r1_9,nil:bat[:oid,:oid],A0,,true);
-X_12 := sql.bind(X_2,sys,functions,name,1);
+X_12:bat[:oid,:str]  := sql.bind(X_2,sys,functions,name,1);
 X_50 := algebra.likesubselect(X_12,X_3,A0,,true);
 X_15 := sql.subdelta(X_47,X_3,X_9,X_48,X_50);
 X_17 := sql.projectdelta(X_15,X_6,X_9,r1_9,X_12);
-X_18 := sql.bind(X_2,sys,functions,func,0);
+X_18:bat[:oid,:str]  := sql.bind(X_2,sys,functions,func,0);
 (X_20,r1_25) := sql.bind(X_2,sys,functions,func,2);
-X_22 := sql.bind(X_2,sys,functions,func,1);
+X_22:bat[:oid,:str]  := sql.bind(X_2,sys,functions,func,1);
 X_23 := sql.projectdelta(X_15,X_18,X_20,r1_25,X_22);
 X_24 := sql.resultSet(2,1,X_17);
 sql.rsColumn(X_24,sys.functions,name,varchar,256,0,X_17);
@@ -91,13 +91,13 @@ function user.s4_1(A0:str):void;
 X_47 := algebra.ilikesubselect(X_6,X_3,A0,,false);
 (X_9,r1_9) := sql.bind(X_2,sys,functions,name,2);
 X_48 := algebra.ilikesubselect(r1_9,nil:bat[:oid,:oid],A0,,false);
-X_12 := sql.bind(X_2,sys,functions,name,1);
+X_12:bat[:oid,:str]  := sql.bind(X_2,sys,functions,name,1);
 X_50 := algebra.ilikesubselect(X_12,X_3,A0,,false);
 X_15 := sql.subdelta(X_47,X_3,X_9,X_48,X_50);
 X_17 :=

MonetDB: default - Approved output.

2014-09-11 Thread Sjoerd Mullender

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

Approved output.


diffs (truncated from 2169 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
@@ -2338,6 +2338,10 @@ command algebra.ilikesubselect(s:bat[:oi
 address PCREilike_join_pcre;
 function 
algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid];
 function 
algebra.ilikesubselect(b:bat[:oid,:str],pat:str,esc:str,anti:bit):bat[:oid,:oid];
+command algebra.ilike(s:str,pat:str):bit 
+address PCREilike2;
+command algebra.ilike(s:str,pat:str,esc:str):bit 
+address PCREilike3;
 command 
algebra.indexjoin(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3]):bat[:any_1,:any_3]
 
 address ALGindexjoin;
 comment Hook directly into the index implementation of the join.
@@ -2401,6 +2405,10 @@ command algebra.likesubselect(b:bat[:oid
 address PCRElikesubselect1;
 comment Select all head values for which the tail value is like  the 
given (SQL-style) pattern.  Input is a dense-headed BAT, output is a 
dense-headed BAT with in   the tail the head value of the input BAT for 
which the  relationship holds.  The output BAT is sorted on the tail value.
 
+command algebra.like(s:str,pat:str):bit 
+address PCRElike2;
+command algebra.like(s:str,pat:str,esc:str):bit 
+address PCRElike3;
 command 
algebra.leftfetchjoin(left:bat[:oid,:oid],right:bat[:oid,:any_3]):bat[:oid,:any_3]
 
 address ALGleftfetchjoin;
 comment Hook directly into the left fetch join implementation.
@@ -2449,6 +2457,14 @@ command algebra.markT(b:bat[:any_1,:any_
 address ALGtmark;
 comment Produces a BAT with fresh unique dense sequense of OIDs in 
the tail that starts at base (i.e. [base,..base+b.count()-1] ).
 
+command algebra.not_ilike(s:str,pat:str):bit 
+address PCREnotilike2;
+command algebra.not_ilike(s:str,pat:str,esc:str):bit 
+address PCREnotilike3;
+command algebra.not_like(s:str,pat:str):bit 
+address PCREnotlike2;
+command algebra.not_like(s:str,pat:str,esc:str):bit 
+address PCREnotlike3;
 command 
algebra.outerjoin(outer:bat[:any_1,:any_2],inner:bat[:any_2,:any_3],estimate:lng):bat[:any_1,:any_3]
 
 address ALGouterjoinestimate;
 command 
algebra.outerjoin(outer:bat[:any_1,:oid],inner:bat[:oid,:any_3]):bat[:any_1,:any_3]
 
@@ -2869,6 +2885,22 @@ command batgeom.point(x:bat[:oid,:dbl],y
 address wkbcreatepoint_bat;
 comment Construct a point-BAT from two geometry-BATs
 
+command batalgebra.ilike(s:bat[:oid,:str],pat:str):bat[:oid,:bit] 
+address BATPCREilike2;
+command batalgebra.ilike(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] 
+address BATPCREilike;
+command batalgebra.like(s:bat[:oid,:str],pat:str):bat[:oid,:bit] 
+address BATPCRElike2;
+command batalgebra.like(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] 
+address BATPCRElike;
+command batalgebra.not_ilike(s:bat[:oid,:str],pat:str):bat[:oid,:bit] 
+address BATPCREnotliike2;
+command batalgebra.not_ilike(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] 
+address BATPCREnotilike;
+command batalgebra.not_like(s:bat[:oid,:str],pat:str):bat[:oid,:bit] 
+address BATPCREnotlike2;
+command batalgebra.not_like(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] 
+address BATPCREnotlike;
 command batcolor.blue(c:bat[:oid,:color]):bat[:oid,:int] 
 address CLRbatBlue;
 comment Extracts blue component from a color atom
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
@@ -2855,6 +2855,10 @@ command algebra.ilikesubselect(s:bat[:oi
 address PCREilike_join_pcre;
 function 
algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid];
 function 
algebra.ilikesubselect(b:bat[:oid,:str],pat:str,esc:str,anti:bit):bat[:oid,:oid];
+command algebra.ilike(s:str,pat:str):bit 
+address PCREilike2;
+command algebra.ilike(s:str,pat:str,esc:str):bit 
+address PCREilike3;
 command 
algebra.indexjoin(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3]):bat[:any_1,:any_3]
 
 address ALGindexjoin;
 comment Hook directly into the index implementation of the join.
@@ -2918,6 +2922,10 @@ command algebra.likesubselect(b:bat[:oid
 address PCRElikesubselect1;

MonetDB: default - approved output. Plan/explain changed because...

2014-04-19 Thread Niels Nes

Changeset: 88970f309a81 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88970f309a81
Modified Files:
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-plan.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-plan.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-plan.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-plan.stable.out
Branch: default
Log Message:

approved output. Plan/explain changed because of stricter ordering on selects 
and group by expressions


diffs (224 lines):

diff --git a/sql/benchmarks/ssbm/Tests/02-explain.stable.out 
b/sql/benchmarks/ssbm/Tests/02-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/02-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/02-explain.stable.out
@@ -39,20 +39,20 @@ Ready.
 % 269 # length
 function user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int,A4:int):void;
 X_7 := sql.mvc();
-X_11 := sql.bind(X_7,sys,lineorder,lo_discount,0);
-X_19 := sql.bind(X_7,sys,lineorder,lo_quantity,0);
+X_11 := sql.bind(X_7,sys,lineorder,lo_quantity,0);
+X_19 := sql.bind(X_7,sys,lineorder,lo_discount,0);
 X_8:bat[:oid,:oid]  := sql.tid(X_7,sys,lineorder);
-X_90 := algebra.subselect(X_19,X_8,A3,A4,true,true,false);
-(X_21,r1_25) := sql.bind(X_7,sys,lineorder,lo_quantity,2);
-X_91 := algebra.subselect(r1_25,A3,A4,true,true,false);
-X_23 := sql.bind(X_7,sys,lineorder,lo_quantity,1);
-X_92 := algebra.subselect(X_23,X_8,A3,A4,true,true,false);
+X_90 := algebra.subselect(X_19,X_8,A1,A2,true,true,false);
+(X_21,r1_25) := sql.bind(X_7,sys,lineorder,lo_discount,2);
+X_91 := algebra.subselect(r1_25,A1,A2,true,true,false);
+X_23 := sql.bind(X_7,sys,lineorder,lo_discount,1);
+X_92 := algebra.subselect(X_23,X_8,A1,A2,true,true,false);
 X_24 := sql.subdelta(X_90,X_8,X_21,X_91,X_92);
-X_93 := algebra.subselect(X_11,X_24,A1,A2,true,true,false);
-(X_14,r1_14) := sql.bind(X_7,sys,lineorder,lo_discount,2);
-X_94 := algebra.subselect(r1_14,A1,A2,true,true,false);
-X_17 := sql.bind(X_7,sys,lineorder,lo_discount,1);
-X_95 := algebra.subselect(X_17,X_24,A1,A2,true,true,false);
+X_93 := algebra.subselect(X_11,X_24,A3,A4,true,true,false);
+(X_14,r1_14) := sql.bind(X_7,sys,lineorder,lo_quantity,2);
+X_94 := algebra.subselect(r1_14,A3,A4,true,true,false);
+X_17 := sql.bind(X_7,sys,lineorder,lo_quantity,1);
+X_95 := algebra.subselect(X_17,X_24,A3,A4,true,true,false);
 X_26 := sql.subdelta(X_93,X_24,X_14,X_94,X_95);
 X_27 := 
sql.bind_idxbat(X_7,sys,lineorder,lineorder_lo_orderdate_fkey,0);
 (X_29,r1_37) := 
sql.bind_idxbat(X_7,sys,lineorder,lineorder_lo_orderdate_fkey,2);
@@ -74,7 +74,7 @@ function user.s2_1{autoCommit=true}(A0:i
 X_55 := sql.projectdelta(X_26,X_49,X_52,r1_65,X_54);
 X_56 := algebra.leftfetchjoin(X_47,X_55);
 X_57 := batcalc.lng(X_56);
-X_58 := sql.projectdelta(X_26,X_11,X_14,r1_14,X_17);
+X_58 := sql.projectdelta(X_26,X_19,X_21,r1_25,X_23);
 X_59 := algebra.leftfetchjoin(X_47,X_58);
 X_60:bat[:oid,:lng]  := batcalc.*(X_57,X_59);
 X_61 := algebra.selectNotNil(X_60);
diff --git a/sql/benchmarks/ssbm/Tests/02-plan.stable.out 
b/sql/benchmarks/ssbm/Tests/02-plan.stable.out
--- a/sql/benchmarks/ssbm/Tests/02-plan.stable.out
+++ b/sql/benchmarks/ssbm/Tests/02-plan.stable.out
@@ -41,7 +41,7 @@ project (
 | | join (
 | | | select (
 | | | | table(sys.lineorder) [ lineorder.lo_quantity, 
lineorder.lo_extendedprice, lineorder.lo_discount, 
lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX 
sys.lineorder.lineorder_lo_orderdate_fkey ] COUNT 
-| | | ) [ int[tinyint 26] = lineorder.lo_quantity = int[tinyint 35], 
int[tinyint 4] = lineorder.lo_discount = int[tinyint 6] ],
+| | | ) [ int[tinyint 4] = lineorder.lo_discount = int[tinyint 6], 
int[tinyint 26] = lineorder.lo_quantity = int[tinyint 35] ],
 | | | select (
 | | | | table(sys.dwdate) [ dwdate.d_yearmonthnum, dwdate.%TID% NOT NULL ] 
COUNT 
 | | | ) [ dwdate.d_yearmonthnum = int 199401 ]
diff --git a/sql/benchmarks/ssbm/Tests/03-explain.stable.out 
b/sql/benchmarks/ssbm/Tests/03-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/03-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/03-explain.stable.out
@@ -39,20 +39,20 @@ Ready.
 % 283 # length
 function 
user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int,A4:int,A5:int):void;
 X_8 := sql.mvc();
-X_12 := sql.bind(X_8,sys,lineorder,lo_discount,0);
-X_20 := sql.bind(X_8,sys,lineorder,lo_quantity,0);
+X_12 := sql.bind(X_8,sys,lineorder,lo_quantity,0);
+X_20 := sql.bind(X_8,sys,lineorder,lo_discount,0);
 X_9:bat[:oid,:oid]  := sql.tid(X_8,sys,lineorder);
-X_101 := algebra.subselect(X_20,X_9,A4,A5,true,true,false);
-(X_22,r1_26) := sql.bind(X_8,sys,lineorder,lo_quantity,2);
-

MonetDB: default - approved output. Plan changes because of stri...

2014-04-19 Thread Niels Nes

Changeset: 041d7927d2e1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=041d7927d2e1
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-plan.stable.out
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-plan.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/08-plan.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out
Branch: default
Log Message:

approved output. Plan changes because of stricter groupby/select expression 
ordering. Explains changed because of plan and/or new topn implementation.


diffs (truncated from 1120 to 300 lines):

diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out 
b/sql/benchmarks/tpch/Tests/01-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out
@@ -62,18 +62,18 @@ function user.s2_1{autoCommit=true}(A0:b
 X_17 := 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_22 := sql.bind(X_7,sys,lineitem,l_returnflag,0);
-(X_24,r1_28) := sql.bind(X_7,sys,lineitem,l_returnflag,2);
-X_26 := sql.bind(X_7,sys,lineitem,l_returnflag,1);
+X_22 := sql.bind(X_7,sys,lineitem,l_linestatus,0);
+(X_24,r1_28) := sql.bind(X_7,sys,lineitem,l_linestatus,2);
+X_26 := 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 := sql.bind(X_7,sys,lineitem,l_linestatus,0);
-(X_30,r1_36) := sql.bind(X_7,sys,lineitem,l_linestatus,2);
-X_32 := sql.bind(X_7,sys,lineitem,l_linestatus,1);
+X_28 := sql.bind(X_7,sys,lineitem,l_returnflag,0);
+(X_30,r1_36) := sql.bind(X_7,sys,lineitem,l_returnflag,2);
+X_32 := 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_33);
-X_41 := algebra.leftfetchjoin(r1_45,X_27);
+X_40 := algebra.leftfetchjoin(r1_45,X_27);
+X_41 := algebra.leftfetchjoin(r1_45,X_33);
 X_51 := sql.bind(X_7,sys,lineitem,l_quantity,0);
 (X_56,r1_64) := sql.bind(X_7,sys,lineitem,l_quantity,2);
 X_59 := sql.bind(X_7,sys,lineitem,l_quantity,1);
diff --git a/sql/benchmarks/tpch/Tests/01-plan.stable.out 
b/sql/benchmarks/tpch/Tests/01-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/01-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/01-plan.stable.out
@@ -55,7 +55,7 @@ project (
 | | select (
 | | | table(sys.lineitem) [ lineitem.l_quantity NOT NULL, 
lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL, lineitem.l_tax 
NOT NULL, lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, 
lineitem.l_shipdate NOT NULL ] COUNT 
 | | ) [ lineitem.l_shipdate NOT NULL = sys.sql_sub(date 1998-12-01, 
sec_interval(4) 777600) ]
-| ) [ lineitem.l_linestatus NOT NULL, lineitem.l_returnflag NOT NULL ] [ 
lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, sys.sum no nil 
(lineitem.l_quantity NOT NULL) NOT NULL as L1.L1, sys.sum no nil 
(lineitem.l_extendedprice NOT NULL) NOT NULL as L2.L2, sys.sum no nil 
(sys.sql_mul(lineitem.l_extendedprice NOT NULL, 
sys.sql_sub(decimal(15,2)[tinyint 1], lineitem.l_discount NOT NULL))) as 
L3.L3, sys.sum no nil (sys.sql_mul(sys.sql_mul(lineitem.l_extendedprice NOT 
NULL, sys.sql_sub(decimal(15,2)[tinyint 1], lineitem.l_discount NOT NULL)), 
sys.sql_add(decimal(15,2)[tinyint 1], lineitem.l_tax NOT NULL))) as L4.L4, 
sys.avg no nil (double[lineitem.l_quantity NOT NULL] as lineitem.l_quantity) as 
L5.L5, sys.avg no nil (double[lineitem.l_extendedprice NOT NULL] as 
lineitem.l_extendedprice) as L6.L6, sys.avg no nil (double[lineitem.l_discount 
NOT NULL] as lineitem.l_discount) as L7.L7, sys.count() NOT NULL as L10.L10 ]
+| ) [ lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL ] [ 
lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, sys.sum no nil 
(lineitem.l_quantity NOT NULL) NOT NULL as L1.L1, sys.sum no nil 
(lineitem.l_extendedprice NOT NULL) NOT NULL as L2.L2, sys.sum no nil 
(sys.sql_mul(lineitem.l_extendedprice NOT NULL, 
sys.sql_sub(decimal(15,2)[tinyint 1], lineitem.l_discount NOT NULL))) as 
L3.L3, sys.sum no nil (sys.sql_mul(sys.sql_mul(lineitem.l_extendedprice NOT 
NULL, sys.sql_sub(decimal(15,2)[tinyint 1], lineitem.l_discount NOT NULL)), 
sys.sql_add(decimal(15,2)[tinyint 1], lineitem.l_tax NOT NULL))) as L4.L4, 
sys.avg no nil (double[lineitem.l_quantity NOT NULL] as lineitem.l_quantity) as 
L5.L5, sys.avg no nil (double[lineitem.l_extendedprice NOT NULL] as

MonetDB: default - approved output after pqueue changes, orderby...

2014-04-19 Thread Niels Nes

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

sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
Branch: default
Log Message:

approved output after pqueue changes, orderby on an equal column ie allowed 
change


diffs (25 lines):

diff --git 
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
 
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
--- 
a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
+++ 
b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
@@ -138,8 +138,9 @@ Ready.
 % value,   type,   prob # name
 % varchar, char,   double # type
 % 2,   4,  24 # length
+[ A1,term, 1   ]
 [ A2,term, 1   ]
-[ A1,term, 1   ]
+#ROLLBACK;
 
 # 23:06:18   
 # 23:06:18   Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=31419  
/home/wouter/opt/MonetDB-Aug2009/mTests/src/test/BugTracker-2009/old_views_incorrectly_reused.SF-2863804.view2.sql
@@ -168,8 +169,9 @@ Ready.
 % value,   type,   prob # name
 % varchar, char,   double # type
 % 4,   4,  24 # length
+[ 2000,  term, 1   ]
 [ 2001,  term, 1   ]
-[ 2000,  term, 1   ]
+#ROLLBACK;
 
 # 23:06:18   
 # 23:06:18   Done.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2014-04-19 Thread Niels Nes

Changeset: c669195b0544 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c669195b0544
Added Files:
sql/test/BugTracker-2014/Tests/temporary.Bug-3430.stable.err
sql/test/BugTracker-2014/Tests/temporary.Bug-3430.stable.out
Modified Files:
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.out
sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.out
Branch: default
Log Message:

approved output


diffs (143 lines):

diff --git 
a/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out 
b/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
--- a/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
+++ b/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
@@ -30,7 +30,7 @@ Ready.
 % L1 # name
 % double # type
 % 24 # length
-[ 5091 ]
+[ 5193 ]
 
 # 17:14:33   
 # 17:14:33   Done.
diff --git 
a/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.out 
b/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.out
--- a/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.out
+++ b/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.out
@@ -28,10 +28,10 @@ Ready.
 #SELECT * FROM SYS.ARGS
 # WHERE FUNC_ID NOT IN (SELECT ID FROM SYS.FUNCTIONS)
 #OR FUNC_ID NOT IN (SELECT ID FROM SYS.FUNCTIONS);
-% .args,   .args,  .args,  .args,  .args,  .args,  .args # table_name
-% id,  func_id,name,   type,   type_digits,type_scale, number 
# name
-% int, int,varchar,varchar,int,int,int # type
-% 1,   1,  0,  0,  1,  1,  1 # length
+% .args,   .args,  .args,  .args,  .args,  .args,  .args,  .args # 
table_name
+% id,  func_id,name,   type,   type_digits,type_scale, inout,  
number # name
+% int, int,varchar,varchar,int,int,tinyint,
int # type
+% 1,   1,  0,  0,  1,  1,  1,  1 # length
 
 # 14:17:10   
 # 14:17:10   Done.
diff --git 
a/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.out 
b/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.out
--- a/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.out
+++ b/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.out
@@ -27,10 +27,10 @@ Ready.
 
 #SELECT * FROM SYS.ARGS
 # WHERE FUNC_ID NOT IN (SELECT FUNC_ID FROM SYS.FUNCTIONS);
-% sys.args,sys.args,   sys.args,   sys.args,   sys.args,   
sys.args,   sys.args # table_name
-% id,  func_id,name,   type,   type_digits,type_scale, number 
# name
-% int, int,varchar,varchar,int,int,int # type
-% 1,   1,  0,  0,  1,  1,  1 # length
+% sys.args,sys.args,   sys.args,   sys.args,   sys.args,   
sys.args,   sys.args,   sys.args # table_name
+% id,  func_id,name,   type,   type_digits,type_scale, inout,  
number # name
+% int, int,varchar,varchar,int,int,tinyint,
int # type
+% 1,   1,  0,  0,  1,  1,  1,  1 # length
 
 # 14:17:13   
 # 14:17:13   Done.
diff --git a/sql/test/BugTracker-2014/Tests/temporary.Bug-3430.stable.err 
b/sql/test/BugTracker-2014/Tests/temporary.Bug-3430.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/temporary.Bug-3430.stable.err
@@ -0,0 +1,51 @@
+stderr of test 'temporary.Bug-3430` in directory 'sql/test/BugTracker-2014` 
itself:
+
+
+# 12:14:57   
+# 12:14:57   mserver5 --debug=10 --set gdk_nr_threads=0 --set 
mapi_open=true --set mapi_port=33005 --set 
mapi_usock=/var/tmp/mtest-30260/.s.monetdb.33005 --set monet_prompt= 
--forcemito --set mal_listing=2 
--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014
 --set mal_listing=0
+# 12:14:57   
+
+# builtin opt  gdk_dbpath = 
/home/niels/scratch/monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_vmtrim = no
+# builtin opt  monet_prompt = 
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 33005
+# cmdline opt  mapi_usock = /var/tmp/mtest-30260/.s.monetdb.33005
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt  mal_listing = 0
+# cmdline opt  gdk_debug = 536870922
+
+# 12:14:57   
+# 12:14:57   mclient -lsql -ftest -Eutf-8 -i -e 
--host=/var/tmp/mtest-30260 --port=33005
+# 12:14:57

MonetDB: default - Approved output.

2014-03-24 Thread Sjoerd Mullender

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

monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows

monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
Branch: default
Log Message:

Approved output.


diffs (49 lines):

diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
--- 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
+++ 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
@@ -30,16 +30,16 @@ stderr of test 'opt_sql_append` in direc
 # 22:58:57   mclient -lsql -ftest -Eutf-8 -i -e --host=rome 
--port=36275
 # 22:58:57   
 
-MAPI  = (monetdb) /var/tmp/mtest-11972/.s.monetdb.36131
+MAPI  = monetdb@LAB03:37903
 QUERY = explain copy into ttt from '/tmp/xyz';
 ERROR = !COPY INTO: filename must have absolute path: /tmp/xyz
-MAPI  = (monetdb) /var/tmp/mtest-11972/.s.monetdb.36131
+MAPI  = monetdb@LAB03:37903
 QUERY = explain copy into ttt from '\tmp/xyz';
 ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI  = (monetdb) /var/tmp/mtest-11972/.s.monetdb.36131
+MAPI  = monetdb@LAB03:37903
 QUERY = explain copy into ttt from '/tmp/xyz';
 ERROR = !COPY INTO: filename must have absolute path: /tmp/xyz
-MAPI  = (monetdb) /var/tmp/mtest-11972/.s.monetdb.36131
+MAPI  = monetdb@LAB03:37903
 QUERY = explain copy into ttt from '\tmp/xyz';
 ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
 
diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
--- 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++ 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -55,8 +55,8 @@ Ready.
 % .L # table_name
 % def # name
 % clob # type
-% 467 # length
-[ 
optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.garbageCollector();
]
+% 448 # length
+[ 
optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.garbageCollector();
   ]
 #explain copy into ttt from 'a:\tmp/xyz';
 % .explain # table_name
 % mal # name
@@ -89,8 +89,8 @@ end s4_1;
 % .L # table_name
 % def # name
 % clob # type
-% 490 # length
-[ 
optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();
 ]
+% 471 # length
+[ 
optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();
]
 #explain copy into ttt from 'Z:/tmp/xyz';
 % .explain # table_name
 % mal # name
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output after manifold changes

2013-12-30 Thread Niels Nes

Changeset: 4a7779ca24cd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a7779ca24cd
Modified Files:
monetdb5/mal/Tests/tst1200.stable.out
Branch: default
Log Message:

approved output after manifold changes


diffs (truncated from 888 to 300 lines):

diff --git a/monetdb5/mal/Tests/tst1200.stable.out 
b/monetdb5/mal/Tests/tst1200.stable.out
--- a/monetdb5/mal/Tests/tst1200.stable.out
+++ b/monetdb5/mal/Tests/tst1200.stable.out
@@ -651,296 +651,72 @@ function user.main():void;
 ## test the operations on rules 
 ma_a := bat.setColumn(rule_bat,rule);
 #io.print(rule_bat.bat.setColumn(rule), 
-X_847 := bat.reverse(rule_bat);
-X_849 := bat.new(nil:oid,nil:int);
-barrier (X_853,X_854) := iterator.new(rule_bat);
-X_856 := mtime.month(X_854);
-X_857 := algebra.fetch(X_847,X_853);
-bat.insert(X_849,X_857,X_856);
-redo (X_853,X_854) := iterator.next(rule_bat);
-exit (X_853,X_854);
-na_a:bat[:oid,:int]  := X_849;
+na_a:bat[:oid,:int]  := mal.manifold(mtime,month,rule_bat);
 oa_a := bat.setColumn(na_a,month);
 #  [month](rule_bat).bat.setColumn(month), 
-X_863 := bat.reverse(rule_bat);
-X_865 := bat.new(nil:oid,nil:int);
-barrier (X_867,X_868) := iterator.new(rule_bat);
-X_870 := mtime.weekday(X_868);
-X_871 := algebra.fetch(X_863,X_867);
-bat.insert(X_865,X_871,X_870);
-redo (X_867,X_868) := iterator.next(rule_bat);
-exit (X_867,X_868);
-pa_a:bat[:oid,:int]  := X_865;
+pa_a:bat[:oid,:int]  := mal.manifold(mtime,weekday,rule_bat);
 qa_a := bat.setColumn(pa_a,weekday);
 #  [weekday](rule_bat).bat.setColumn(weekday), 
-X_877 := bat.reverse(rule_bat);
-X_879 := bat.new(nil:oid,nil:int);
-barrier (X_881,X_882) := iterator.new(rule_bat);
-X_884 := mtime.day(X_882);
-X_885 := algebra.fetch(X_877,X_881);
-bat.insert(X_879,X_885,X_884);
-redo (X_881,X_882) := iterator.next(rule_bat);
-exit (X_881,X_882);
-ra_a:bat[:oid,:int]  := X_879;
+ra_a:bat[:oid,:int]  := mal.manifold(mtime,day,rule_bat);
 sa_a := bat.setColumn(ra_a,day);
 #  [day](rule_bat).bat.setColumn(day), 
-X_891 := bat.reverse(rule_bat);
-X_893 := bat.new(nil:oid,nil:int);
-barrier (X_897,X_898) := iterator.new(rule_bat);
-X_900 := mtime.minutes(X_898);
-X_901 := algebra.fetch(X_891,X_897);
-bat.insert(X_893,X_901,X_900);
-redo (X_897,X_898) := iterator.next(rule_bat);
-exit (X_897,X_898);
-ta_a:bat[:oid,:int]  := X_893;
+ta_a:bat[:oid,:int]  := mal.manifold(mtime,minutes,rule_bat);
 ua_a := bat.setColumn(ta_a,minutes);
 io.print(rule_bat,na_a,pa_a,ra_a,ta_a);
 va_a := io.print(month_bat,rule_bat,na_a,pa_a,ra_a,ta_a);
 #  [minutes](rule_bat).bat.setColumn(minutes)); 
 bat.setColumn(rule_bat,rule);
 #io.print(rule_bat.bat.setColumn(rule), 
-X_907 := bat.reverse(rule_bat);
-X_909 := bat.new(nil:oid,nil:date);
-barrier (X_912,X_913) := iterator.new(rule_bat);
-X_915 := mtime.compute(X_913,2001);
-X_916 := algebra.fetch(X_907,X_912);
-bat.insert(X_909,X_916,X_915);
-redo (X_912,X_913) := iterator.next(rule_bat);
-exit (X_912,X_913);
-xa_a:bat[:oid,:date]  := X_909;
+xa_a:bat[:oid,:date]  := mal.manifold(mtime,compute,rule_bat,2001);
 ya_a := bat.setColumn(xa_a,2001);
 #  [compute](rule_bat, 2001).bat.setColumn(2001), 
-X_922 := bat.reverse(rule_bat);
-X_924 := bat.new(nil:oid,nil:date);
-barrier (X_926,X_927) := iterator.new(rule_bat);
-X_929 := mtime.compute(X_927,2001);
-X_930 := algebra.fetch(X_922,X_926);
-bat.insert(X_924,X_930,X_929);
-redo (X_926,X_927) := iterator.next(rule_bat);
-exit (X_926,X_927);
-ab_a:bat[:oid,:date]  := X_924;
-X_936 := bat.reverse(ab_a);
-X_938 := bat.new(nil:oid,nil:int);
-barrier (X_942,X_943) := iterator.new(ab_a);
-X_945 := mtime.dayofweek(X_943);
-X_946 := algebra.fetch(X_936,X_942);
-bat.insert(X_938,X_946,X_945);
-redo (X_942,X_943) := iterator.next(ab_a);
-exit (X_942,X_943);
-bb_a:bat[:oid,:int]  := X_938;
-X_952 := bat.reverse(bb_a);
-X_954 := bat.new(nil:oid,nil:str);
-barrier (X_957,X_958) := iterator.new(bb_a);
-X_960 := mtime.dayname(X_958);
-X_961 := algebra.fetch(X_952,X_957);
-bat.insert(X_954,X_961,X_960);
-redo (X_957,X_958) := iterator.next(bb_a);
-exit (X_957,X_958);
-cb_a:bat[:oid,:str]  := X_954;
+ab_a:bat[:oid,:date]  := mal.manifold(mtime,compute,rule_bat,2001);
+bb_a:bat[:oid,:int]  := mal.manifold(mtime,dayofweek,ab_a);
+cb_a:bat[:oid,:str]  := mal.manifold(mtime,dayname,bb_a);
 bat.setColumn(cb_a,2001);
 #  [dayname]([dayofweek]([compute](rule_bat, 
2001))).bat.setColumn(2001), 
-X_967 := bat.reverse(rule_bat);
-X_969 := bat.new(nil:oid,nil:date);
-barrier (X_972,X_973) := iterator.new(rule_bat);
-X_975 := mtime.compute(X_973,1999);
-X_976 := algebra.fetch(X_967,X_972);
-bat.insert(X_969,X_976,X_975);
-redo (X_972,X_973) :=

MonetDB: default - approved output

2013-12-11 Thread Niels Nes

Changeset: 5c6924998ff2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c6924998ff2
Modified Files:
sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.sql
sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.stable.out
Branch: default
Log Message:

approved output


diffs (31 lines):

diff --git a/sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.sql 
b/sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.sql
--- a/sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.sql
+++ b/sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.sql
@@ -1,5 +1,5 @@
 create table testjsonisnull(js json);
-
+insert into testjsonisnull values (NULL);
 select * from testjsonisnull where js is null;
 
 drop table testjsonisnull;
diff --git a/sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.stable.out 
b/sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.stable.out
--- a/sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.stable.out
+++ b/sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.stable.out
@@ -55,11 +55,14 @@ Ready.
 # 13:09:26   
 
 #create table testjsonisnull(js json);
+#insert into testjsonisnull values (NULL);
+[ 1]
 #select * from testjsonisnull where js is null;
 % sys.testjsonisnull # table_name
-% boolean # type
-% 5 # length
-[ true ]
+% js # name
+% json # type
+% 0 # length
+[ NULL ]
 #drop table testjsonisnull;
 
 # 13:09:26   
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2013-08-25 Thread Niels Nes

Changeset: d7af9c8acff9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d7af9c8acff9
Modified Files:
sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
Branch: default
Log Message:

approved output


diffs (118 lines):

diff --git a/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out 
b/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
--- a/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
+++ b/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
@@ -25,39 +25,39 @@ Ready.
 # 13:16:19   mclient -lsql -ftest -Eutf-8 -i -e 
--host=/var/tmp/mtest-24961 --port=30091
 # 13:16:19   
 
-(u'10/1047', 262144, 60175)
-(u'10/1050', 262144, 60175)
-(u'10/1051', 262144, 60175)
-(u'10/1052', 262144, 60175)
-(u'10/1053', 262144, 60175)
-(u'10/1054', 524288, 60175)
-(u'10/1055', 524288, 60175)
-(u'10/1056', 524288, 60175)
-(u'10/1057', 60175, 60175)
-(u'10/1060', 60175, 60175)
-(u'10/1061', 262144, 60175)
-(u'10/1062', 262144, 60175)
-(u'10/1063', 262144, 60175)
-(u'10/1064', 60175, 60175)
-(u'10/1065', 60175, 60175)
-(u'10/1066', 262144, 60175)
-[(u'10/1047', 0), (u'10/1050', 0), (u'10/1051', 0), (u'10/1052', 0), 
(u'10/1053', 0), (u'10/1054', 0), (u'10/1055', 0), (u'10/1056', 0), 
(u'10/1057', 0), (u'10/1060', 0), (u'10/1061', 0), (u'10/1062', 0), 
(u'10/1063', 0), (u'10/1064', 0), (u'10/1065', 0), (u'10/1066', 0)]
-(u'10/1047', 262144, 0)
-(u'10/1050', 262144, 0)
-(u'10/1051', 262144, 0)
-(u'10/1052', 262144, 0)
-(u'10/1053', 262144, 0)
-(u'10/1054', 524288, 0)
-(u'10/1055', 524288, 0)
-(u'10/1056', 524288, 0)
-(u'10/1057', 60175, 0)
-(u'10/1060', 60175, 0)
-(u'10/1061', 262144, 0)
-(u'10/1062', 262144, 0)
-(u'10/1063', 262144, 0)
-(u'10/1064', 60175, 0)
-(u'10/1065', 60175, 0)
-(u'10/1066', 262144, 0)
+(u'12/1205', 262144, 60175)
+(u'12/1206', 262144, 60175)
+(u'12/1207', 262144, 60175)
+(u'12/1210', 262144, 60175)
+(u'12/1211', 262144, 60175)
+(u'12/1212', 524288, 60175)
+(u'12/1213', 524288, 60175)
+(u'12/1214', 524288, 60175)
+(u'12/1215', 60175, 60175)
+(u'12/1216', 60175, 60175)
+(u'12/1217', 262144, 60175)
+(u'12/1220', 262144, 60175)
+(u'12/1221', 262144, 60175)
+(u'12/1222', 60175, 60175)
+(u'12/1223', 60175, 60175)
+(u'12/1224', 262144, 60175)
+[(u'12/1205', 0), (u'12/1206', 0), (u'12/1207', 0), (u'12/1210', 0), 
(u'12/1211', 0), (u'12/1212', 0), (u'12/1213', 0), (u'12/1214', 0), 
(u'12/1215', 0), (u'12/1216', 0), (u'12/1217', 0), (u'12/1220', 0), 
(u'12/1221', 0), (u'12/1222', 0), (u'12/1223', 0), (u'12/1224', 0)]
+(u'12/1205', 262144, 0)
+(u'12/1206', 262144, 0)
+(u'12/1207', 262144, 0)
+(u'12/1210', 262144, 0)
+(u'12/1211', 262144, 0)
+(u'12/1212', 524288, 0)
+(u'12/1213', 524288, 0)
+(u'12/1214', 524288, 0)
+(u'12/1215', 60175, 0)
+(u'12/1216', 60175, 0)
+(u'12/1217', 262144, 0)
+(u'12/1220', 262144, 0)
+(u'12/1221', 262144, 0)
+(u'12/1222', 60175, 0)
+(u'12/1223', 60175, 0)
+(u'12/1224', 262144, 0)
 
 # 13:16:20   
 # 13:16:20   Done.
diff --git a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out 
b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
--- a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
+++ b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
@@ -25,22 +25,22 @@ Ready.
 # 16:01:26   /usr/bin/python2 leaks.SQL.py leaks
 # 16:01:26   
 
-(u'10/1047', 0, 0)
-(u'10/1050', 0, 0)
-(u'10/1051', 0, 0)
-(u'10/1052', 0, 0)
-(u'10/1053', 0, 0)
-(u'10/1054', 0, 0)
-(u'10/1055', 0, 0)
-(u'10/1056', 0, 0)
-(u'10/1057', 0, 0)
-(u'10/1060', 0, 0)
-(u'10/1061', 0, 0)
-(u'10/1062', 0, 0)
-(u'10/1063', 0, 0)
-(u'10/1064', 0, 0)
-(u'10/1065', 0, 0)
-(u'10/1066', 0, 0)
+(u'12/1205', 0, 0)
+(u'12/1206', 0, 0)
+(u'12/1207', 0, 0)
+(u'12/1210', 0, 0)
+(u'12/1211', 0, 0)
+(u'12/1212', 0, 0)
+(u'12/1213', 0, 0)
+(u'12/1214', 0, 0)
+(u'12/1215', 0, 0)
+(u'12/1216', 0, 0)
+(u'12/1217', 0, 0)
+(u'12/1220', 0, 0)
+(u'12/1221', 0, 0)
+(u'12/1222', 0, 0)
+(u'12/1223', 0, 0)
+(u'12/1224', 0, 0)
 
 # 16:01:26   
 # 16:01:26   Done.
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2013-08-25 Thread Niels Nes

Changeset: c77da45ba47a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c77da45ba47a
Modified Files:
sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.stable.err
Branch: default
Log Message:

approved output


diffs (15 lines):

diff --git 
a/sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.stable.err 
b/sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.stable.err
--- a/sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.stable.err
+++ b/sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.stable.err
@@ -28,9 +28,9 @@ stderr of test 'binary_copy_into.Bug-334
 # 11:33:26   /usr/bin/python2 binary_copy_into.Bug-3345.SQL.py 
binary_copy_into.Bug-3345
 # 11:33:26   
 
-MAPI  = (monetdb) /var/tmp/mtest-15437/.s.monetdb.35953
+MAPI  = (monetdb) /var/tmp/mtest-18822/.s.monetdb.34793
 QUERY = start transaction;create table bug (n_nationkey INTEGER,n_regionkey 
INTEGER);
-copy binary into bug from 
'/home/niels/scratch/rc-clean/Linux-x86_64/mTests/sql/test/BugTracker-2013/n_nationkey.sorted',
 
'/home/niels/scratch/rc-clean/Linux-x86_64/mTests/sql/test/BugTracker-2013/n_regionkey.sorted';
+copy binary into bug from 
'/scratch/niels/build/monetdb/Linux-x86_64/mTests/sql/test/BugTracker-2013/n_nationkey.sorted',
 
'/scratch/niels/build/monetdb/Linux-x86_64/mTests/sql/test/BugTracker-2013/n_regionkey.sorted';
 ERROR = !binary files for table 'bug' have inconsistent counts
 
 # 11:33:26   
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2013-08-25 Thread Niels Nes

Changeset: 17d252bff566 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17d252bff566
Modified Files:
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out

sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
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/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: default
Log Message:

approved output


diffs (241 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
@@ -43,7 +43,7 @@ end s2_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 68 # length
+% 70 # length
 function user.s3_1{autoCommit=true}(A0:sht,A1:sht):void;
 X_4 := udf.fuse(A0,A1);
 sql.exportValue(1,.L,fuse_single_value,int,32,0,6,X_4,);
@@ -59,7 +59,7 @@ end s3_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 73 # length
+% 76 # length
 function user.s4_1{autoCommit=true}(A0:int,A1:int):void;
 X_4 := udf.fuse(A0,A1);
 sql.exportValue(1,.L,fuse_single_value,bigint,64,0,6,X_4,);
@@ -93,7 +93,7 @@ end s4_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 75 # length
+% 78 # length
 function user.s8_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,sys,udf_fuse);
@@ -118,7 +118,7 @@ end s8_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 75 # length
+% 78 # length
 function user.s9_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,sys,udf_fuse);
@@ -143,7 +143,7 @@ end s9_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 75 # length
+% 78 # length
 function user.s10_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,sys,udf_fuse);
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,7 +48,7 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 74 # length
+% 77 # length
 function user.s2_1{autoCommit=true}(A0:str):void;
 X_3 := udf.reverse(A0);
 sql.exportValue(1,.L,reverse_single_value,clob,0,0,4,X_3,);
@@ -82,7 +82,7 @@ end s2_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 79 # length
+% 82 # length
 function user.s6_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,sys,udf_reverse);
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,7 +27,7 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 78 # length
+% 81 # length
 function user.s3_1{autoCommit=true}(A0:dbl):void;
 X_3 := sql.mvc();
 X_4:bat[:oid,:oid]  := sql.tid(X_3,sys,sf_2596114);
@@ -47,7 +47,7 @@ end s3_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 71 # length
+% 74 # length
 function user.s4_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,sys,sf_2596114);
diff --git 
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out 
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
--- a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
+++ b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
@@ -38,7 +38,7 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 91 # length
+% 94 # length
 function user.s5_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,sys,t2564);
diff --git 
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out 
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
--- a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
+++ b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
@@ -33,7 +33,7 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 90 # length
+% 93 # length
 function user.s5_1{autoCommit=true}(A0:flt):void;
 X_3 := sql.mvc();
 X_7 := sql.bind(X_3,sys,tab_2826,d,0);
diff --git 
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out

MonetDB: default - Approved output after recent changes

2013-07-03 Thread Stefan Manegold

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

sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/drop3_nogeom.stable.out
sql/test/leaks/Tests/select1_nogeom.stable.out
sql/test/leaks/Tests/select2_nogeom.stable.out
sql/test/leaks/Tests/temp1_nogeom.stable.out
sql/test/leaks/Tests/temp2_nogeom.stable.out
sql/test/leaks/Tests/temp3_nogeom.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/mapi/Tests/php_monetdb_nogeom.stable.out
Branch: default
Log Message:

Approved output after recent changes


diffs (truncated from 1047 to 300 lines):

diff --git 
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
 
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
--- 
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
+++ 
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
@@ -35,7 +35,7 @@ stdout of test 'set_sql_debug_64__breaki
 % name,fullname,   default_schema # name
 % varchar, varchar,int # type
 % 9,   10, 4 # length
-[ skyserver, sky server,   7720]
+[ skyserver, sky server,   7733]
 #alter user skyserver set schema sys;
 #drop schema sky;
 #drop user skyserver;
diff --git a/sql/test/leaks/Tests/check1.stable.out 
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -34,8 +34,8 @@ Ready.
 [ oid,   bit,  69  ]
 [ oid,   bit,  69  ]
 [ oid,   bit,  393 ]
-[ oid,   bit,  1229]
-[ oid,   bit,  1229]
+[ oid,   bit,  1232]
+[ oid,   bit,  1232]
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
@@ -72,12 +72,12 @@ Ready.
 [ oid,   int,  19  ]
 [ oid,   int,  19  ]
 [ oid,   int,  19  ]
-[ oid,   int,  43  ]
-[ oid,   int,  43  ]
-[ oid,   int,  43  ]
-[ oid,   int,  43  ]
-[ oid,   int,  43  ]
-[ oid,   int,  43  ]
+[ oid,   int,  44  ]
+[ oid,   int,  44  ]
+[ oid,   int,  44  ]
+[ oid,   int,  44  ]
+[ oid,   int,  44  ]
+[ oid,   int,  44  ]
 [ oid,   int,  69  ]
 [ oid,   int,  69  ]
 [ oid,   int,  135 ]
@@ -88,15 +88,15 @@ Ready.
 [ oid,   int,  393 ]
 [ oid,   int,  393 ]
 [ oid,   int,  393 ]
-[ oid,   int,  1229]
-[ oid,   int,  1229]
-[ oid,   int,  1229]
-[ oid,   int,  1229]
-[ oid,   int,  3341]
-[ oid,   int,  3341]
-[ oid,   int,  3341]
-[ oid,   int,  3341]
-[ oid,   int,  3341]
+[ oid,   int,  1232]
+[ oid,   int,  1232]
+[ oid,   int,  1232]
+[ oid,   int,  1232]
+[ oid,   int,  3347]
+[ oid,   int,  3347]
+[ oid,   int,  3347]
+[ oid,   int,  3347]
+[ oid,   int,  3347]
 [ oid,   lng,  0   ]
 [ oid,   lng,  0   ]
 [ oid,   lng,  0   ]
@@ -157,8 +157,8 @@ Ready.
 [ oid,   str,  1   ]
 [ oid,   str,  2   ]
 [ oid,   str,  3   ]
-[ oid,   str,  43  ]
-[ oid,   str,  43  ]
+[ oid,   str,  44  ]
+[ oid,   str,  44  ]
 [ oid,   str,  69  ]
 [ oid,   str,  69  ]
 [ oid,   str,  135 ]
@@ -166,11 +166,11 @@ Ready.
 [ oid,   str,  393 ]
 [ oid,   str,  393 ]
 [ oid,   str,  393 ]
-[ oid,   str,  1229]
-[ oid,   str,  1229]
-[ oid,   str,  1229]
-[ oid,   str,  3341]
-[ oid,   str,  3341]
+[ oid,   str,  1232]
+[ oid,   str,  1232]
+[ oid,   str,  1232]
+[ oid,   str,  3347]
+[ oid,   str,  3347]
 #select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
 % .L1, .L2 # table_name
 % L1,  L2 # name
diff --git a/sql/test/leaks/Tests/check1_nogeom.stable.out 
b/sql/test/leaks/Tests/check1_nogeom.stable.out
--- a/sql/test/leaks/Tests/check1_nogeom.stable.out
+++ b/sql/test/leaks/Tests/check1_nogeom.stable.out
@@ -34,8 +34,8 @@ Ready.
 [ oid,   bit,  69  ]
 [ oid,   bit,  69  ]
 [ oid,   bit,  393 ]
-[ oid,   bit,

MonetDB: default - approved output after recent changes.

2013-06-19 Thread Niels Nes

Changeset: 7dbbc71e5a3f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7dbbc71e5a3f
Modified Files:
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/sql_scenario.c
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/ambiguous_order_by.SF-2827916.stable.err
sql/test/BugTracker-2009/Tests/ambiguous_view.stable.err
sql/test/BugTracker-2009/Tests/assert_in_update.SF-2807336.stable.err

sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stable.err

sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.stable.err

sql/test/BugTracker-2009/Tests/create_table_dup_name.SF-2879005.stable.err
sql/test/BugTracker-2009/Tests/drop-sequence-crash.SF-2854195.stable.err
sql/test/BugTracker-2009/Tests/except_error_wrong.SF-2808409.stable.err
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2009/Tests/incomplete.SF.2536893.stable.err

sql/test/BugTracker-2009/Tests/insert_into_values_bug.SF-2807609.stable.err
sql/test/BugTracker-2009/Tests/limit_in_subquery.SF-2620437.stable.err

sql/test/BugTracker-2009/Tests/not_invalidtable_crash.SF-2927174.stable.err
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err
sql/test/BugTracker-2009/Tests/primekeyconstraint.SF-2783425.stable.err
sql/test/BugTracker-2009/Tests/rollback_bug.stable.err
sql/test/BugTracker-2009/Tests/rollback_mistake.SF-2814622.stable.err

sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out

sql/test/BugTracker-2009/Tests/segv_for_unknown_identifier_in_subquery.SF-2874045.stable.err

sql/test/BugTracker-2009/Tests/select_X_where_bla_EQ_whatever.SF-282597.stable.err
sql/test/BugTracker-2009/Tests/select_from_history.SF-2556566.stable.err

sql/test/BugTracker-2009/Tests/subquery_returns_table_crash.SF-2513620.stable.err

sql/test/BugTracker-2009/Tests/temp_table_fail_leaves_data.SF-2793286.stable.err

sql/test/BugTracker-2009/Tests/temporary_table_leftover.SF-2734713.stable.err

sql/test/BugTracker-2009/Tests/unique_constraint_on_char.SF-2873564.stable.err
sql/test/BugTracker-2009/Tests/wrong_error_message.SF-2637051.stable.err

sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out

sql/test/BugTracker-2010/Tests/TypeException_with_missing_function.Bug-2674.stable.err

sql/test/BugTracker-2010/Tests/call_function_without_warning.Bug-2752.stable.err

sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err

sql/test/BugTracker-2010/Tests/crash_default_unlocked.Bug-2744.stable.err
sql/test/BugTracker-2010/Tests/crash_on_in_2.Bug-2604.stable.err
sql/test/BugTracker-2010/Tests/crashonschema.Bug-2547.stable.err
sql/test/BugTracker-2010/Tests/duplicate-key.Bug-2667.stable.err
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err

sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out

sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err

sql/test/BugTracker-2010/Tests/second_function_existing_signature.Bug-2611.stable.err
sql/test/BugTracker-2010/Tests/select_from_seq.Bug-2730.stable.err
sql/test/BugTracker-2010/Tests/select_star.Bug-2563.stable.err

sql/test/BugTracker-2010/Tests/sequence-restart-with-null.Bug-2648.stable.err
sql/test/BugTracker-2010/Tests/subselect.Bug-2537.stable.err
sql/test/BugTracker-2010/Tests/sum_on_date_crash.Bug-2643.stable.err
sql/test/BugTracker-2010/Tests/times-crash.Bug-2586.stable.err

sql/test/BugTracker-2010/Tests/wrong_error_message_dropping_view.Bug-2713.stable.err
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-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err

sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
sql/test/leaks/Tests/temp2.stable.out
Branch: default
Log Message:

approved output after recent changes.


diffs (truncated from 1454 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
---

MonetDB: default - approved output

2013-03-21 Thread Niels Nes

Changeset: 5c04995f0cb8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c04995f0cb8
Modified Files:
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
Branch: default
Log Message:

approved output


diffs (26 lines):

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
@@ -44,11 +44,9 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 58 # length
+% 173 # length
 function user.s0_1():void;
-X_22 := nil:bat[:oid,:int];
-X_24 := nil:bat[:oid,:int];
-barrier X_44 := language.dataflow();
+barrier X_51 := language.dataflow();
 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);
@@ -65,7 +63,7 @@ barrier X_44 := language.dataflow();
 language.pass(X_8);
 language.pass(X_2);
 language.pass(X_21);
-exit X_44;
+exit X_51;
 X_26 := sql.resultSet(2,1,X_22);
 sql.rsColumn(X_26,sys.t1,id1,int,32,0,X_22);
 sql.rsColumn(X_26,sys.t2,id2,int,32,0,X_24);
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output after Toptimize fix

2013-03-20 Thread Niels Nes

Changeset: 2f5b868d3d1e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f5b868d3d1e
Modified Files:
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: default
Log Message:

approved output after Toptimize fix


diffs (52 lines):

diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out 
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -23,9 +23,9 @@ Ready.
 
 Operation successful
 
-+-+
+++
 | mal|
-+=+
+++
 | function user.s0_1{autoCommit=true}():void; |
 | X_3:bat[:oid,:str]  := bat.new(nil:oid,nil:str);|
 | X_2 := sql.mvc(); |
@@ -55,8 +55,8 @@ Operation successful
 | X_45 := io.stdout(); |
 | sql.exportResult(X_45,X_39); |
 | end s0_1;   |
-| # querylog.define(explain select \name\ from 
\tables\;,default_pipe,968767:lng) |
-+-+
+| # querylog.define(explain select \name\ from 
\tables\;,default_pipe,8:lng) |
+++
 30 rows
 
 
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out 
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -47,9 +47,9 @@ 20 rows
 
 Operation successful
 
-+-+
+++
 | mal |
-+=+
+++
 | function user.s1_1{autoCommit=true}():void; |
 | X_3:bat[:oid,:wrd]  := bat.new(nil:oid,nil:wrd);|
 | X_2 := sql.mvc();   |
@@ -81,8 +81,8 @@ Operation successful
 | X_44:wrd  := aggr.sum(X_43); |
 | sql.exportValue(1,.tables,L1,wrd,64,0,6,X_44,);  |
 | end s1_1;   |
-| # querylog.define(explain select count(*) from 
tables;,default_pipe,353893:lng) |
-+-+
+| # querylog.define(explain select count(*) from 
tables;,default_pipe,6:lng) |
+++
 32 rows
 
 
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2013-03-20 Thread Niels Nes

Changeset: e7a6b3b63a9d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e7a6b3b63a9d
Modified Files:
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: default
Log Message:

approved output


diffs (24 lines):

diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out 
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -55,7 +55,7 @@ Operation successful
 | X_45 := io.stdout(); |
 | sql.exportResult(X_45,X_39); |
 | end s0_1;   |
-| # querylog.define(explain select \name\ from 
\tables\;,default_pipe,8:lng) |
+| # querylog.define(explain select \name\ from 
\tables\;,default_pipe,0:lng) |
 
++
 30 rows
 
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out 
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -81,7 +81,7 @@ Operation successful
 | X_44:wrd  := aggr.sum(X_43); |
 | sql.exportValue(1,.tables,L1,wrd,64,0,6,X_44,);  |
 | end s1_1;   |
-| # querylog.define(explain select count(*) from 
tables;,default_pipe,6:lng) |
+| # querylog.define(explain select count(*) from 
tables;,default_pipe,0:lng) |
 
++
 32 rows
 
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approved output after recent changes.

2012-11-22 Thread Sjoerd Mullender

Changeset: 84d0cbd527fd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84d0cbd527fd
Modified Files:
clients/Tests/exports.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
Branch: default
Log Message:

Approved output after recent changes.


diffs (208 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2721,6 +2721,7 @@ str kunionRef;
 str kuniqueRef;
 str languageRef;
 str lastline(Client cntxt);
+str leftfetchjoinPathRef;
 str leftfetchjoinRef;
 str leftjoinPathRef;
 str leftjoinRef;
@@ -3031,6 +3032,7 @@ str schedulerRef;
 str selectNotNilRef;
 str selectRef;
 str semaRef;
+str semijoinPathRef;
 str semijoinRef;
 str setAccessRef;
 void setArgType(MalBlkPtr mb, InstrPtr p, int i, int tpe);
diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -55,8 +55,8 @@ Ready.
 % . # table_name
 % def # name
 % clob # type
-% 423 # length
-[ 
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();
]
+% 446 # length
+[ 
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();
 ]
 #explain copy into ttt from '/:\tmp/xyz';
 % .explain # table_name
 % mal # name
@@ -66,8 +66,8 @@ function user.s2_1{autoCommit=true}():vo
 X_2 := sql.mvc();
 (X_5:bat[:oid,:int] ,X_6:bat[:oid,:int] ,X_7:bat[:oid,:int] ) := 
sql.copy_from(sys:str,ttt:str,|:str,\\n:str,nil:str,null:str,/:\\tmp/xyz:str,-1:lng,0:lng,0:int);
 X_9 := sql.append(X_2,sys,ttt,a,X_5);
-X_11 := sql.append(X_9,sys:str,ttt:str,b,X_6);
-X_15 := sql.append(X_11,sys:str,ttt:str,c,X_7);
+X_11 := sql.append(X_9,sys,ttt,b,X_6);
+X_15 := sql.append(X_11,sys,ttt,c,X_7);
 X_16 := aggr.count(X_7);
 sql.affectedRows(X_15,X_16,);
 end s2_1;
@@ -83,8 +83,8 @@ end s2_1;
 % . # table_name
 % def # name
 % clob # type
-% 446 # length
-[ 
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();
 ]
+% 469 # length
+[ 
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();
  ]
 #explain copy into ttt from '/:\tmp/xyz';
 % .explain # table_name
 % mal # name
diff --git a/monetdb5/optimizer/Tests/inline07.stable.out 
b/monetdb5/optimizer/Tests/inline07.stable.out
--- a/monetdb5/optimizer/Tests/inline07.stable.out
+++ b/monetdb5/optimizer/Tests/inline07.stable.out
@@ -28,7 +28,7 @@ end main;
 function user.qry():void;   #  0 qry:void := user.qry() {G}
 b := bat.new(:oid,:int);#  1 b:bat[:oid,:int] := 
CMDBATnew(_2:oid, _3:int) {G}
 bat.insert(b,0@0,1);#  2 _4:bat[:oid,:int] := 
BKCinsert_bun(b:bat[:oid,:int], _5:oid, _6:int) {G}
-X_13 := aggr.sum(b);#  3 _13:dbl := 
aggr.sum(b:bat[:oid,:int]) {G}
+X_13 := aggr.sum(b);#  3 _13:dbl := 
CMDBATsum(b:bat[:oid,:int]) {G}
 X_14 := batcalc.+(b,X_13);

MonetDB: default - approved output

2012-07-18 Thread Niels Nes

Changeset: 8dd44dc0e5fa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8dd44dc0e5fa
Modified Files:
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
Branch: default
Log Message:

approved output


diffs (truncated from 924 to 300 lines):

diff --git a/sql/test/leaks/Tests/check0.stable.out 
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -48,23 +48,26 @@ Ready.
 % htype,   ttype,  count # name
 % clob,clob,   bigint # type
 % 3,   3,  4 # length
-[ int,   int,  8   ]
-[ int,   lng,  2   ]
-[ int,   str,  142 ]
-[ oid,   int,  20  ]
-[ oid,   int,  20  ]
-[ oid,   int,  1149]
-[ oid,   int,  3168]
-[ oid,   int,  3168]
-[ oid,   int,  3168]
-[ oid,   int,  3168]
-[ oid,   int,  3168]
-[ oid,   lng,  20  ]
+[ oid,   int,  1   ]
+[ oid,   int,  1   ]
+[ oid,   int,  2   ]
+[ oid,   int,  8   ]
+[ oid,   int,  8   ]
+[ oid,   int,  144 ]
+[ oid,   int,  1148]
+[ oid,   int,  3163]
+[ oid,   int,  3163]
+[ oid,   int,  3163]
+[ oid,   int,  3163]
+[ oid,   int,  3163]
+[ oid,   lng,  1   ]
+[ oid,   lng,  2   ]
 [ oid,   str,  1   ]
 [ oid,   str,  1   ]
-[ oid,   str,  20  ]
-[ oid,   str,  3168]
-[ oid,   str,  3168]
+[ oid,   str,  1   ]
+[ oid,   str,  144 ]
+[ oid,   str,  3163]
+[ oid,   str,  3163]
 #select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
 % .L1, .bbp # table_name
 % L1,  L2 # name
@@ -76,7 +79,7 @@ Ready.
 % L1,  L2 # name
 % char,wrd # type
 % 10,  2 # length
-[ persistent,17  ]
+[ persistent,20  ]
 
 # 22:02:15   
 # 22:02:15   Done.
diff --git a/sql/test/leaks/Tests/check1.stable.out 
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -28,15 +28,14 @@ Ready.
 % htype,   ttype,  count # name
 % clob,clob,   bigint # type
 % 3,   9,  4 # length
-[ int,   int,  0   ]
-[ int,   lng,  2   ]
-[ int,   str,  142 ]
 [ oid,   bit,  0   ]
-[ oid,   bit,  59  ]
-[ oid,   bit,  59  ]
-[ oid,   bit,  300 ]
-[ oid,   bit,  1149]
-[ oid,   bit,  1149]
+[ oid,   bit,  58  ]
+[ oid,   bit,  58  ]
+[ oid,   bit,  299 ]
+[ oid,   bit,  1148]
+[ oid,   bit,  1148]
+[ oid,   int,  0   ]
+[ oid,   int,  0   ]
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
@@ -46,6 +45,9 @@ Ready.
 [ oid,   int,  0   ]
 [ oid,   int,  0   ]
 [ oid,   int,  1   ]
+[ oid,   int,  1   ]
+[ oid,   int,  1   ]
+[ oid,   int,  2   ]
 [ oid,   int,  2   ]
 [ oid,   int,  2   ]
 [ oid,   int,  2   ]
@@ -61,8 +63,6 @@ Ready.
 [ oid,   int,  3   ]
 [ oid,   int,  4   ]
 [ oid,   int,  4   ]
-[ oid,   int,  5   ]
-[ oid,   int,  5   ]
 [ oid,   int,  19  ]
 [ oid,   int,  19  ]
 [ oid,   int,  19  ]
@@ -74,24 +74,25 @@ Ready.
 [ oid,   int,  42  ]
 [ oid,   int,  42  ]
 [ oid,   int,  42  ]
-[ oid,   int,  59  ]
-[ oid,   int,  59  ]
+[ oid,   int,  58  ]
+[ oid,   int,  58  ]
+[ oid,   int,  144 ]
 [ oid,   int,  195 ]
 [ oid,   int,  195 ]
-[ oid,   int,  300 ]
-[ oid,   int,  300 ]
-[ oid,   int,  300 ]
-[ oid,   int,  300 ]
-[ oid,   int,  300 ]
-[ oid,   int,  1149]
-[ oid,   int,  1149]
-[ oid,   int,  1149]
-[ oid,   int,  1149]
-[ oid,   int,  3168]
-[ oid,   int,  3168]
-[ oid,   int,  3168]
-[ oid,   int,  3168]
-[ oid,   int,  3168]
+[ oid,   int,  299 ]
+[ oid,   int,  299 ]
+[ oid,   int,  299 ]
+[ oid,   int,  299 ]
+[ oid,   int,  299 ]
+[ oid,   int,  1148]
+[ oid,   int,  1148]
+[ oid,   int,  1148]
+[ oid,   int,  1148]
+[ oid,   int,  3163]
+[ oid,   int,  3163]
+[ oid,   int,  3163]
+[

MonetDB: default - Approved output after removal of derivePaths ...

2012-03-15 Thread Sjoerd Mullender

Changeset: 47466e959296 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47466e959296
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:

Approved output after removal of derivePaths optimizer.


diffs (22 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -531,10 +531,6 @@ str ALGcount_bat(wrd *result, int *bid);
 str ALGcount_nil(wrd *result, int *bid, bit *ignore_nils);
 str ALGcount_no_nil(wrd *result, int *bid);
 str ALGcross(int *result, int *lid, int *rid);
-str ALGderiveCount(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ALGderivePath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ALGderivePath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ALGderiveSum(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str ALGexist(bit *ret, int *bid, ptr val);
 str ALGexistBUN(bit *ret, int *bid, ptr val, ptr tval);
 str ALGfetch(ptr ret, int *bid, lng *pos);
@@ -4518,7 +4514,6 @@ str OPTcostModel(Client cntxt, MalBlkPtr
 str OPTdatacyclotron(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str OPTdataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str OPTdeadcode(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str OPTderivePath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str OPTdictionary(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str OPTdumpQEP(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str OPTemptySet(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output, changes are due to generatin...

2012-02-26 Thread Niels Nes

Changeset: b1ffdf95de3a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b1ffdf95de3a
Modified Files:
sql/test/Dependencies/Tests/Dependencies.stable.out
Branch: default
Log Message:

approved output, changes are due to generating code in 2 steps now
(before direct bin alg was generated)


diffs (30 lines):

diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out 
b/sql/test/Dependencies/Tests/Dependencies.stable.out
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.out
@@ -262,7 +262,6 @@ Dependencies between database objects
 [ rkey,  dependencies_columns_on_keys, DEP_FUNC  ]
 [ rkey,  dependencies_tables_on_foreignkeys,   DEP_FUNC  ]
 [ id,dependencies_columns_on_indexes,  DEP_FUNC  ]
-[ id,dependencies_tables_on_indexes,   DEP_FUNC  ]
 [ table_id,  dependencies_columns_on_indexes,  DEP_FUNC  ]
 [ table_id,  dependencies_tables_on_indexes,   DEP_FUNC  ]
 [ name,  dependencies_columns_on_indexes,  DEP_FUNC  ]
@@ -357,8 +356,9 @@ Dependencies between database objects
 % sys.f,   sys.tri,. # table_name
 % name,name,   single_value # name
 % varchar, varchar,char # type
-% 5,   12, 11 # length
+% 6,   12, 11 # length
 [ ,trigger_test, DEP_TRIGGER   ]
+[ isnull,trigger_test, DEP_TRIGGER   ]
 [ count, trigger_test, DEP_TRIGGER   ]
 % sys.k,   sys.fk, . # table_name
 % name,name,   single_value # name
@@ -594,7 +594,6 @@ Cleanup
 [ rkey,  dependencies_columns_on_keys, DEP_FUNC  ]
 [ rkey,  dependencies_tables_on_foreignkeys,   DEP_FUNC  ]
 [ id,dependencies_columns_on_indexes,  DEP_FUNC  ]
-[ id,dependencies_tables_on_indexes,   DEP_FUNC  ]
 [ table_id,  dependencies_columns_on_indexes,  DEP_FUNC  ]
 [ table_id,  dependencies_tables_on_indexes,   DEP_FUNC  ]
 [ name,  dependencies_columns_on_indexes,  DEP_FUNC  ]
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2011-11-09 Thread Niels Nes

Changeset: a3851430a534 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3851430a534
Modified Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out

sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out

sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out

sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
Branch: default
Log Message:

approved output


diffs (truncated from 385 to 300 lines):

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,12 +28,12 @@ Ready.
 % .plan # table_name
 % rel # name
 % clob # type
-% 182 # length
+% 189 # 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),  [ cm_tmp.i ],
-| | table sys.copyfrom(varchar sys, varchar cm_tmp, varchar |, varchar 
\n, varchar NULL, varchar null, varchar /file2, bigint -1, bigint 
0, int 0),  [ cm_tmp.i ]
+| | table sys.copyfrom(varchar sys, varchar cm_tmp, varchar |, varchar 
\n, varchar NULL, varchar null, varchar /file1, bigint -1, bigint 
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),  [ cm_tmp.i ] COUNT 
 | ) [  ]
 )
 
diff --git 
a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out 
b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
--- 
a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
+++ 
b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
@@ -49,19 +49,19 @@ Ready.
 % .plan # table_name
 % rel # name
 % clob # type
-% 67 # length
+% 74 # length
 project (
 | group by (
-| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ]
+| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ] COUNT 
 | ) [ sorted.a, sorted.b ] [ sorted.a, sorted.b ]
 ) [ sorted.a, sorted.b ]
 % .plan # table_name
 % rel # name
 % clob # type
-% 67 # length
+% 74 # length
 project (
 | group by (
-| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ]
+| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ] COUNT 
 | ) [ sorted.a, sorted.b ] [ sorted.b, sorted.a ]
 ) [ sorted.a, sorted.b ]
 
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
@@ -32,96 +32,96 @@ Ready.
 % .plan # table_name
 % rel # name
 % clob # type
-% 49 # length
+% 56 # length
 project (
-| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
+| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT 
 ) [ oblo.a ]
 #PLAN select * from oblo OFFSET 2;
 % .plan # table_name
 % rel # name
 % clob # type
-% 51 # length
+% 58 # length
 top N (
 | project (
-| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
+| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT 
 | ) [ oblo.a ]
 ) [ wrd 2 ]
 #PLAN select * from oblo LIMIT 2;
 % .plan # table_name
 % rel # name
 % clob # type
-% 51 # length
+% 58 # length
 top N (
 | project (
-| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
+| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT 
 | ) [ oblo.a ]
 ) [ wrd 2 ]
 #PLAN select * from oblo LIMIT 1 OFFSET 2;
 % .plan # table_name
 % rel # name
 % clob # type
-% 51 # length
+% 58 # length
 top N (
 | project (
-| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
+| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT 
 | ) [ oblo.a ]
 ) [ wrd 1, wrd 2 ]
 #PLAN select * from oblo LIMIT 2 OFFSET 1;
 % .plan # table_name
 % rel # name
 % clob # type
-% 51 # length
+% 58 # length
 top N (
 | project (
-| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
+| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT 
 | ) [ oblo.a ]
 ) [ wrd 2, wrd 1 ]
 #PLAN select * from oblo ORDER BY a;
 % .plan # table_name
 % rel # name
 % clob # type
-% 49 # length
+% 56 # length
 project (
-| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
+| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT 
 ) [ oblo.a ] [ oblo.a ASC ]
 #PLAN select * from oblo ORDER BY a OFFSET 2;
 % .plan # table_name
 % rel # name
 % clob # type
-% 51 # length
+% 58 # length
 top N (
 | project (
-| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
+| | table(sys.oblo) [

MonetDB: default - approved output

2011-11-09 Thread Niels Nes

Changeset: 74c40eab3133 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74c40eab3133
Modified Files:
sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.stable.out
Branch: default
Log Message:

approved output


diffs (16 lines):

diff --git 
a/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.stable.out 
b/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.stable.out
--- a/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.stable.out
+++ b/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.stable.out
@@ -337,12 +337,6 @@ Ready.
 % double # type
 % 24 # length
 [ 0.9741885087 ]
-#SELECT rad(55.81689)
-% . # table_name
-% rad_single_value # name
-% double # type
-% 24 # length
-[ 0.9741885087 ]
 #CREATE USER testuser WITH ENCRYPTED PASSWORD 
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
 NAME 'Test User' SCHEMA sys;
 #CREATE SCHEMA testschema AUTHORIZATION testuser;
 #ALTER USER testuser SET SCHEMA testschema
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2011-10-16 Thread Niels Nes

Changeset: 0ea9df90b1d0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ea9df90b1d0
Modified Files:
sql/backends/monet5/sql_gencode.c
sql/rel.txt

sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: default
Log Message:

approved output

fixed problem with like and filters


diffs (94 lines):

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
@@ -396,11 +396,14 @@ multiplexN(MalBlkPtr mb, char *mod, char
 static int
 dump_joinN(backend *sql, MalBlkPtr mb, stmt *s)
 {
-   char *mod = sql_func_mod(s-op4.funcval-func);
-   char *fimp = sql_func_imp(s-op4.funcval-func);
+   char *mod, *fimp; 
InstrPtr q;
int k, op1, op2, op3 = 0;
 
+   backend_create_func(sql, s-op4.funcval-func);
+   mod = sql_func_mod(s-op4.funcval-func);
+   fimp = sql_func_imp(s-op4.funcval-func);
+
/* dump left and right operands */
op1 = _dumpstmt(sql, mb, s-op1);
op2 = _dumpstmt(sql, mb, s-op2);
diff --git a/sql/rel.txt b/sql/rel.txt
--- a/sql/rel.txt
+++ b/sql/rel.txt
@@ -105,18 +105,13 @@ e_cmp
cmp_equal = 4,
cmp_notequal = 5,
 
-   cmp_notlike = 6,/* tobe removed */
-   cmp_like = 7,
-   cmp_notilike = 8,
-   cmp_ilike = 9,
+   cmp_filter = 6, filters -r is 
a list of values
+   cmp_or = 7, or handling -l/r 
are both lists
+   cmp_in = 8, in list handling-r is 
a list of values
+   cmp_notin = 9   not in list handling-r is 
a list of values
 
-   cmp_or = 10,or handling -l/r 
are both lists
-
-   cmp_filter = 11,filters -r is 
a list of values
-   cmp_in = 12,in list handling-r is 
a list of values
-   cmp_notin = 13  not in list handling-r is 
a list of values
-
-   cmp_all = 14,   cross product
+   cmp_all = 10,   cross product
+   cmp_project = 11,   special case for projection 
joins
)
 
 e_func
diff --git 
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
 
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
--- 
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
+++ 
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
@@ -25,7 +25,7 @@ Ready.
 # 12:13:20   
 
 mdb#mdb.start();
-mdb#user.s1_1();
+mdb#X_2:void  := user.s1_1();
 
 # 12:13:21   
 # 12:13:21   Done.
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out 
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -49,8 +49,8 @@ Ready.
 | X_22:bat[:oid,:str]  := sql.bind(X_2,sys,_tables,name,2); |
 | X_25 := algebra.kdifference(X_24,X_22); |
 | X_26 := algebra.kunion(X_25,X_22); |
-| X_20:bat[:oid,:str]  := sql.bind(X_2,sys,_tables,name,1); |
-| X_27 := algebra.kunion(X_26,X_20); |
+| X_19:bat[:oid,:str]  := sql.bind(X_2,sys,_tables,name,1); |
+| X_27 := algebra.kunion(X_26,X_19);  |
 | X_47 := algebra.leftjoin(X_46,X_27); |
 | X_51 := bat.append(X_48,X_47,true); |
 | X_12:bat[:oid,:sht]  := sql.bind(X_2,tmp,_tables,type,0); |
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out 
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -41,14 +41,14 @@ Ready.
 | | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.type as p.type, 
_tables.%TID% NOT NULL as p.%TID% ] |
 | | | | | | ) [ p.type  smallint[tinyint 2] ]   
|
 | | | | | ) [ p.id as tables.id ]  
|
-| | | | ) [ sys.count() NOT NULL as L1 ],  
|
+| | | | ) [  ] [ sys.count() NOT NULL as L1 ], 
|
 | | | | group by (

MonetDB: default - approved output (prepare/exec nr's shifted be...

2011-08-13 Thread Niels Nes

Changeset: d6e32a17f424 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6e32a17f424
Modified Files:
sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
Branch: default
Log Message:

approved output (prepare/exec nr's shifted because of set timezone)


diffs (14 lines):

diff --git 
a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err 
b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
--- a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
+++ b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
@@ -71,8 +71,8 @@ stderr of test 'prepare_stmt.Bug-2533.Bu
 # 09:32:45   mclient -lsql -ftest -i -e --host=rig --port=33580 
 # 09:32:45   
 
-MAPI  = monetdb@rig:35262
-QUERY = exec 0(2.3);
+MAPI  = monetdb@alf:32346
+QUERY = exec 1(2.3);
 ERROR = !SQLException:sql.prepare:wrong type for argument 1 of prepared 
statement: decimal, expected wrd
 
 # 09:32:45   
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output after recent changes

2011-06-07 Thread Niels Nes

Changeset: 86358afed04e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86358afed04e
Modified Files:
sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err

sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: default
Log Message:

approved output after recent changes


diffs (100 lines):

diff --git a/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err 
b/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
--- a/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
+++ b/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
@@ -79,7 +79,7 @@
 # 19:33:23   mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33470 
 # 19:33:23   
 
-MAPI  = monetdb@alf:32144
+MAPI  = monetdb@alf:36639
 QUERY = INSERT INTO examines (docID, vicID) VALUES
 (
 (
@@ -94,8 +94,7 @@
 )
 );
 ERROR = !SQLException:zero_or_one:cardinality violation (21)
-!SQLException:zero_or_one:cardinality violation (21)
-MAPI  = monetdb@alf:32144
+MAPI  = monetdb@alf:36639
 QUERY = INSERT INTO timelines (vicID, time, event) VALUES
 (
 (
diff --git 
a/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
 
b/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
--- 
a/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
+++ 
b/sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
@@ -30,7 +30,25 @@
 % tinyint # type
 % 1 # length
 [ 1]
-% .tables, sys.tables, .tables,.tables,.tables,
.tables,.tables,.tables,.tables,.tables # 
table_name
+#SELECT * FROM (
+#  SELECT 'demo' AS TABLE_CAT,
+#  schemas.name AS TABLE_SCHEM,
+#  tables.name AS TABLE_NAME,
+#  'SYSTEM TABLE' AS TABLE_TYPE,
+#  '' AS REMARKS,
+#  null AS TYPE_CAT,
+#  null AS TYPE_SCHEM,
+#  null AS TYPE_NAME,
+#  'rowid' AS SELF_REFERENCING_COL_NAME,
+#  'SYSTEM' AS REF_GENERATION
+#  FROM tables, schemas
+#  WHERE tables.schema_id = schemas.id
+#  AND tables.system = true
+#  AND tables.type = 0
+#) AS tables
+#WHERE 1 = 1
+#  AND (TABLE_TYPE LIKE 'TABLE' OR TABLE_T
+% .tables, .tables,.tables,.tables,.tables,
.tables,.tables,.tables,.tables,.tables # 
table_name
 % TABLE_CAT,   TABLE_SCHEM,TABLE_NAME, TABLE_TYPE, REMARKS,
TYPE_CAT,   TYPE_SCHEM, TYPE_NAME,  SELF_REFERENCING_COL_NAME,  
REF_GENERATION # name
 % char,varchar,varchar,char,   char,   char,   char,   
char,   char,   char # type
 % 4,   0,  0,  12, 0,  0,  0,  0,  5,  6 # 
length
diff --git a/sql/test/leaks/Tests/check0.stable.out 
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -47,6 +47,7 @@
 [ oid,   int,  3155]
 [ oid,   int,  3155]
 [ oid,   int,  3155]
+[ oid,   lng,  0   ]
 [ oid,   lng,  19  ]
 [ oid,   str,  1   ]
 [ oid,   str,  1   ]
@@ -61,13 +62,13 @@
 % L1,  L2 # name
 % char,wrd # type
 % 9,   3 # length
-[ transient, 488 ]
+[ transient, 487 ]
 #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
 % .L3, .bbp # table_name
 % L3,  L4 # name
 % char,wrd # type
 % 10,  2 # length
-[ persistent,24  ]
+[ persistent,25  ]
 
 # 22:02:15   
 # 22:02:15   Done.
diff --git a/sql/test/mapi/Tests/php_monetdb.stable.out 
b/sql/test/mapi/Tests/php_monetdb.stable.out
--- a/sql/test/mapi/Tests/php_monetdb.stable.out
+++ b/sql/test/mapi/Tests/php_monetdb.stable.out
@@ -88,11 +88,11 @@
 5082   auths   20000   true0   false   0   
 5086   privileges  20000   true0   false   0   
 5199   queryhistory20000   true0   false   0   
-5213   callhistory 20000   false   0   false   0   
-5230   querylog2000create view querylog asnselect qd.*, ql.ctime, 
ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, 
ql.oublock from queryhistory qd, callhistory qlnwhere qd.id = ql.id;1   
false   0   false   0   
-5656   systemfunctions 20000   false   0   false   0   
+5213   callhistory 20000   true0   false   0   
+5230   querylog2000create view querylog asnselect qd.*, ql.ctime, 
ql.arguments, ql.exec, ql.result, ql.foot, ql.memory,

MonetDB: default - approved output after client changes

2011-05-18 Thread Niels Nes

Changeset: aaa3408fa47b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aaa3408fa47b
Modified Files:
sql/test/Tests/mclient-t-s.stable.err
Branch: default
Log Message:

approved output after client changes


diffs (12 lines):

diff --git a/sql/test/Tests/mclient-t-s.stable.err 
b/sql/test/Tests/mclient-t-s.stable.err
--- a/sql/test/Tests/mclient-t-s.stable.err
+++ b/sql/test/Tests/mclient-t-s.stable.err
@@ -77,7 +77,7 @@
 # 11:08:32   
 
 mclient: invalid option -- 't'
-Usage: mclient [ options ]
+Usage: mclient [ options ] [ file or database [ file ... ] ]
 
 Options are:
  -h hostname | --host=hostnamehost or UNIX domain socket to connect to
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output after recent changes

2010-12-20 Thread Niels Nes

Changeset: bb7fb0e98b41 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb7fb0e98b41
Modified Files:
MonetDB/src/gdk/gdk_bat.mx
MonetDB5/src/extras/xml/xml.mx
MonetDB5/src/modules/mal/tablet.mx
sql/rel.txt
sql/src/backends/monet5/sql.mx
sql/src/backends/monet5/sql_gencode.mx
sql/src/backends/monet5/sql_result.mx
sql/src/include/sql_relation.h
sql/src/server/rel_bin.c
sql/src/server/rel_optimizer.c
sql/src/server/rel_select.c
sql/src/server/rel_updates.c
sql/src/server/sql_mvc.h
sql/src/storage/sql_storage.h
sql/src/storage/store.c

sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/src/test/Dependencies/Tests/Dependencies.stable.out
sql/src/test/leaks/Tests/check0.stable.out
sql/src/test/leaks/Tests/check1.stable.out
sql/src/test/leaks/Tests/check2.stable.out
sql/src/test/leaks/Tests/check3.stable.out
sql/src/test/leaks/Tests/check4.stable.out
sql/src/test/leaks/Tests/check5.stable.out
sql/src/test/sql_xml/Tests/funcs.sql
Branch: default
Log Message:

approved output after recent changes

added copy into ... locked. This allows for loading a data into a table
directly (no overhead of logging and delta management). The database is
fully locked during this process (ie no other active transactions can co
exist)


diffs (truncated from 1075 to 300 lines):

diff -r 639822cd6235 -r bb7fb0e98b41 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxMon Dec 20 17:53:43 2010 +0100
+++ b/MonetDB/src/gdk/gdk_bat.mxMon Dec 20 20:39:27 2010 +0100
@@ -3507,7 +3507,7 @@
BATseqbase(b, *(oid *) BUNhloc(bi, BUNfirst(b)));
}
   exit:
-   if (mode  BATPROPS_CHECK) {
+   if ((mode  BATPROPS_CHECK) == BATPROPS_CHECK) {
if ((sorted_bak  1)  !(BAThordered(b)  1)) {
GDKerror(BATpropcheck: BAT %s(%d)[%s,%s] with  BUNFMT 
 tuples was incorrectly marked sorted!\n, BATgetId(b), b-batCacheid, 
ATOMname(b-htype), ATOMname(b-ttype), b-batCount);
if (BAThordered(b))
diff -r 639822cd6235 -r bb7fb0e98b41 MonetDB5/src/extras/xml/xml.mx
--- a/MonetDB5/src/extras/xml/xml.mxMon Dec 20 17:53:43 2010 +0100
+++ b/MonetDB5/src/extras/xml/xml.mxMon Dec 20 20:39:27 2010 +0100
@@ -754,7 +754,7 @@
 CREATE FUNCTION xml (s STRING) RETURNS xml external name xml.xml;
 CREATE FUNCTION str (s XML) RETURNS STRING external name xml.str;
 CREATE FUNCTION comment (s STRING) RETURNS xml external name xml.comment;
-CREATE FUNCTION parse (val STRING, option STRING) RETURNS xml external name 
xml.parse;
+CREATE FUNCTION parse (doccont STRING, val STRING, option STRING) RETURNS 
xml external name xml.parse;
 CREATE FUNCTION pi (nme STRING, val STRING) RETURNS xml external name xml.pi;
 CREATE FUNCTION root (val STRING, version STRING, standalone STRING) RETURNS 
xml external name xml.root;
 CREATE FUNCTION attribute (nme STRING, val STRING) RETURNS xml external name 
xml.attribute;
diff -r 639822cd6235 -r bb7fb0e98b41 MonetDB5/src/modules/mal/tablet.mx
--- a/MonetDB5/src/modules/mal/tablet.mxMon Dec 20 17:53:43 2010 +0100
+++ b/MonetDB5/src/modules/mal/tablet.mxMon Dec 20 20:39:27 2010 +0100
@@ -478,6 +478,7 @@
 tablet_export BUN TABLETload_file(Tablet * as, bstream *b, stream *out);
 tablet_export BUN SQLload_file(Client cntxt, Tablet * as, bstream *b, stream 
*out, char *csep, char *rsep, char quote, lng skip, lng maxrow);
 tablet_export BAT *TABLETcollect_bats(Tablet * as);
+tablet_export BAT *TABLETcollect_parts(Tablet * as, BUN offset);
 tablet_export void TABLETdestroy_format(Tablet * as);
 tablet_export int TABLEToutput_file(Tablet * as, BAT *order, stream *s);
 
@@ -1340,6 +1341,54 @@
return bats;
 }
 
+BAT *
+TABLETcollect_parts(Tablet * as, BUN offset)
+{
+   BAT *bats = BATnew(TYPE_str, TYPE_bat, as-nr_attrs);
+   Column *fmt = as-format;
+   BUN i;
+   BUN cnt = BATcount(fmt[0].c[0]);
+
+   if (bats == NULL)
+   return NULL;
+   for (i = 0; i  as-nr_attrs; i++) {
+   BAT *b = fmt[i].c[0];
+   BAT *bv = BATslice(b, offset, BATcount(b));
+
+   BUNins(bats, (ptr) fmt[i].name, (ptr) bv-batCacheid, FALSE);
+   BATsetaccess(b, BAT_READ);
+   BATaccessBegin(bv, USE_ALL, MMAP_WILLNEED);
+   BATpropcheck(bv, BATPROPS_ALL);
+   /* drop the hashes, we don't need them now  and they consume 
space */
+   HASHremove(b);
+
+   BATpropcheck(BATmirror(bv), BATPROPS_ALL);
+   /* drop the hashes, we don't need them now  and they consume 
space */
+   HASHremove(BATmirror(b));
+   BATaccessEnd(bv, USE_ALL, MMAP_WILLNEED);
+
+   b-hkey = bv-hkey;
+   b-tkey = bv-tkey;
+

MonetDB: default - approved output after copy into extra parameters

2010-12-15 Thread Niels Nes

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

sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
Branch: default
Log Message:

approved output after copy into extra parameters


diffs (19 lines):

diff -r 018cf16b1c6e -r 40e5ea1dda58 
sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
--- 
a/sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out  
Wed Dec 15 13:22:26 2010 +0100
+++ 
b/sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out  
Wed Dec 15 13:35:40 2010 +0100
@@ -29,12 +29,12 @@
 % .plan # table_name
 % rel # name
 % clob # type
-% 93 # length
+% 96 # length
 insert(
 | table(sys.cm_tmp) [ cm_tmp.i, cm_tmp.%TID% NOT NULL ]
 | union (
-| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', 'file1', -1, 
0),  [ cm_tmp.i ],
-| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', 'file2', -1, 
0),  [ cm_tmp.i ]
+| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', 'file1', -1, 0, 
0),  [ cm_tmp.i ],
+| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', 'file2', -1, 0, 
0),  [ cm_tmp.i ]
 | )
 )
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output

2010-05-21 Thread Niels Nes

Changeset: a773c7419829 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a773c7419829
Modified Files:
sql/src/test/leaks/Tests/check0.stable.out
sql/src/test/leaks/Tests/check1.stable.out
sql/src/test/leaks/Tests/check2.stable.out
sql/src/test/leaks/Tests/check3.stable.out
sql/src/test/leaks/Tests/check4.stable.out
sql/src/test/leaks/Tests/check5.stable.out
sql/src/test/leaks/Tests/drop3.stable.out
sql/src/test/leaks/Tests/select1.stable.out
sql/src/test/leaks/Tests/select2.stable.out
sql/src/test/leaks/Tests/temp1.stable.out
sql/src/test/leaks/Tests/temp2.stable.out
sql/src/test/leaks/Tests/temp3.stable.out
Branch: default
Log Message:

approved output


diffs (162 lines):

diff -r 5221fce0b044 -r a773c7419829 sql/src/test/leaks/Tests/check0.stable.out
--- a/sql/src/test/leaks/Tests/check0.stable.outFri May 21 17:13:23 
2010 +0200
+++ b/sql/src/test/leaks/Tests/check0.stable.outFri May 21 20:20:17 
2010 +0200
@@ -59,7 +59,7 @@
 % L1,  L2 # name
 % char,wrd # type
 % 9,   3 # length
-[ transient, 494 ]
+[ transient, 496 ]
 #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
 % .L3, .bbp # table_name
 % L3,  L4 # name
diff -r 5221fce0b044 -r a773c7419829 sql/src/test/leaks/Tests/check1.stable.out
--- a/sql/src/test/leaks/Tests/check1.stable.outFri May 21 17:13:23 
2010 +0200
+++ b/sql/src/test/leaks/Tests/check1.stable.outFri May 21 20:20:17 
2010 +0200
@@ -186,7 +186,7 @@
 % L1,  L2 # name
 % char,wrd # type
 % 9,   3 # length
-[ transient, 158 ]
+[ transient, 157 ]
 #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
 % .L3, .bbp # table_name
 % L3,  L4 # name
diff -r 5221fce0b044 -r a773c7419829 sql/src/test/leaks/Tests/check2.stable.out
--- a/sql/src/test/leaks/Tests/check2.stable.outFri May 21 17:13:23 
2010 +0200
+++ b/sql/src/test/leaks/Tests/check2.stable.outFri May 21 20:20:17 
2010 +0200
@@ -186,7 +186,7 @@
 % L1,  L2 # name
 % char,wrd # type
 % 9,   3 # length
-[ transient, 155 ]
+[ transient, 165 ]
 #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
 % .L3, .bbp # table_name
 % L3,  L4 # name
diff -r 5221fce0b044 -r a773c7419829 sql/src/test/leaks/Tests/check3.stable.out
--- a/sql/src/test/leaks/Tests/check3.stable.outFri May 21 17:13:23 
2010 +0200
+++ b/sql/src/test/leaks/Tests/check3.stable.outFri May 21 20:20:17 
2010 +0200
@@ -186,7 +186,7 @@
 % L1,  L2 # name
 % char,wrd # type
 % 9,   3 # length
-[ transient, 175 ]
+[ transient, 180 ]
 #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
 % .L3, .bbp # table_name
 % L3,  L4 # name
diff -r 5221fce0b044 -r a773c7419829 sql/src/test/leaks/Tests/check4.stable.out
--- a/sql/src/test/leaks/Tests/check4.stable.outFri May 21 17:13:23 
2010 +0200
+++ b/sql/src/test/leaks/Tests/check4.stable.outFri May 21 20:20:17 
2010 +0200
@@ -186,7 +186,7 @@
 % L1,  L2 # name
 % char,wrd # type
 % 9,   3 # length
-[ transient, 178 ]
+[ transient, 179 ]
 #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
 % .L3, .bbp # table_name
 % L3,  L4 # name
diff -r 5221fce0b044 -r a773c7419829 sql/src/test/leaks/Tests/check5.stable.out
--- a/sql/src/test/leaks/Tests/check5.stable.outFri May 21 17:13:23 
2010 +0200
+++ b/sql/src/test/leaks/Tests/check5.stable.outFri May 21 20:20:17 
2010 +0200
@@ -186,7 +186,7 @@
 % L1,  L2 # name
 % char,wrd # type
 % 9,   3 # length
-[ transient, 175 ]
+[ transient, 181 ]
 #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
 % .L3, .bbp # table_name
 % L3,  L4 # name
diff -r 5221fce0b044 -r a773c7419829 sql/src/test/leaks/Tests/drop3.stable.out
--- a/sql/src/test/leaks/Tests/drop3.stable.out Fri May 21 17:13:23 2010 +0200
+++ b/sql/src/test/leaks/Tests/drop3.stable.out Fri May 21 20:20:17 2010 +0200
@@ -29,7 +29,7 @@
 % L1,  L2 # name
 % char,wrd # type
 % 9,   3 # length
-[ transient, 185 ]
+[ transient, 179 ]
 #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
 % .L3, .bbp # table_name
 % L3,  L4 # name
diff -r 5221fce0b044 -r a773c7419829 sql/src/test/leaks/Tests/select1.stable.out
--- a/sql/src/test/leaks/Tests/select1.stable.out   Fri May 21 17:13:23 
2010 +0200
+++ b/sql/src/test/leaks/Tests/select1.stable.out   Fri May 21 20:20:17 
2010 +0200
@@ -34,7 +34,7 @@
 % L1 # name
 % wrd # type
 % 3 # length
-[ 144  ]
+[ 147  ]
 #select 1; 
 % . # table_name
 % single_value # name
@@ -45,7 +45,7 @@
 % L1 # name
 % wrd # type
 % 3 # length
-[ 140  ]
+[ 142  ]
 
 # 22:03:05   
 # 22:03:05   Done.
diff -r 5221fce0b044 -r a773c7419829 sql/src/test/leaks/Tests/select2.stable.out
--- a/sql/src/test/leaks/Tests/select2.stable.out   Fri May 21 17:13:23 
2010

MonetDB: default - approved output

2010-05-19 Thread Niels Nes

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

sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.sql

sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out

sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out

sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.stable.out
sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
sql/src/test/leaks/Tests/check2.stable.out
sql/src/test/leaks/Tests/check3.stable.out
sql/src/test/leaks/Tests/check4.stable.out
sql/src/test/leaks/Tests/drop3.stable.out
sql/src/test/leaks/Tests/select1.stable.out
sql/src/test/leaks/Tests/select2.stable.out
sql/src/test/osm/Tests/drop_constraint_bug.stable.err
Branch: default
Log Message:

approved output


diffs (189 lines):

diff -r 161a673899c4 -r c5073f462198 
sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.sql
--- 
a/sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.sql 
Wed May 19 21:43:06 2010 +0200
+++ 
b/sql/src/test/BugTracker-2009/Tests/alter_table_drop_constraint.SF-2803477.sql 
Wed May 19 21:44:52 2010 +0200
@@ -32,7 +32,5 @@
 ALTER TABLE TABLE_B
 DROP CONSTRAINT UNQ_VALUE_C;
 
-DROP INDEX UNQ_VALUE_C;
-
 ALTER TABLE TABLE_B
 ADD CONSTRAINT FK_TABLE_A_ID FOREIGN KEY ( TABLE_A_ID ) REFERENCES TABLE_A 
( TABLE_A_ID );
diff -r 161a673899c4 -r c5073f462198 
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
--- 
a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
  Wed May 19 21:43:06 2010 +0200
+++ 
b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out
  Wed May 19 21:44:52 2010 +0200
@@ -25,7 +25,6 @@
 # 11:17:13   mclient -lsql -ftest -i -e --host=alf --port=39432 
 # 11:17:13   
 
-TABLE   sys.queryhistory
 TABLE   sys.url_test
 CREATE TABLE sys.triggers (
id int,
diff -r 161a673899c4 -r c5073f462198 
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out   
Wed May 19 21:43:06 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out   
Wed May 19 21:44:52 2010 +0200
@@ -30,7 +30,6 @@
 # 11:17:12   Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=alf 
--port=39432  -i  
/net/alf.ins.cwi.nl/export/scratch1/niels/MonetDB/sql/src/test/BugTracker-2009/Tests/../dumping_tables.SF-2776908.sql
 # 11:17:12   
 
-TABLE   sys.queryhistory
 TABLE   sys.url_test
 CREATE TABLE sys.triggers (
id int,
diff -r 161a673899c4 -r c5073f462198 
sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
--- 
a/sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out 
Wed May 19 21:43:06 2010 +0200
+++ 
b/sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out 
Wed May 19 21:44:52 2010 +0200
@@ -37,24 +37,6 @@
theurl url,
name   CHARACTER LARGE OBJECT
 );
-CREATE TABLE sys.queryhistory (
-   id   bigintNOT NULL,
-   defined  TIMESTAMP,
-   name CHARACTER LARGE OBJECT,
-   queryCHARACTER LARGE OBJECT,
-   parsebigint,
-   optimize bigint,
-   CONSTRAINT queryhistory_id_pkey PRIMARY KEY (id)
-);
-COPY 3 RECORDS INTO sys.queryhistory FROM stdin USING DELIMITERS 
'\t','\n','';
-10268702010-05-18 11:49:13.00  monetdb   select id from 
tables where id  0;   45531677
-10271002010-05-18 11:49:13.00  monetdb   create table 
t1 (id int); 116 332
-10271562010-05-18 11:49:13.00  monetdb   drop table 
t1;70  285
-create procedure resethistory()
-begin
-   delete from callhistory;
-   delete from queryhistory;
-end;
 -- The contents of this file are subject to the MonetDB Public License
 -- Version 1.1 (the License); you may not use this file except in
 -- compliance with the License. You may obtain a copy of the License at
diff -r 161a673899c4 -r c5073f462198 
sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.stable.out
--- 
a/sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.stable.out
   Wed May 19 21:43:06 2010 +0200
+++ 
b/sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.stable.out
   Wed May 19 21:44:52 2010 +0200
@@ -59,7 +59,7 @@
 [ 5129 ]
 [ 5229 ]
 [ 5243 ]
-[ 5259 ]
+[ 5260 ]
 Drop history
 
 # 23:32:55   
diff -r 161a673899c4 -r c5073f462198 
sql/src/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
---

< 1 2 3

201 - 251 of 251 matches

Mail list logo