MonetDB: Nov2019 - Build py3integration on RHEL 7.

2020-01-29 Thread Sjoerd Mullender
Changeset: 5560e86e5fdf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5560e86e5fdf
Modified Files:
MonetDB.spec
Branch: Nov2019
Log Message:

Build py3integration on RHEL 7.
It can be done because the default Python 3 is 3.6.


diffs (16 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -90,9 +90,9 @@
 %if 0%{?rhel} == 7 || %{!?fedora:1000}%{?fedora} <= 30
 %bcond_without py2integration
 %endif
-%if %{?rhel:0}%{!?rhel:1}
-# On RHEL 6, Python 3 is too old, and on RHEL 7, the default Python 3
-# is too old (in both cases 3.4).
+%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
+# On RHEL 6, Python 3 is too old.  On RHEL 7, Python 3 was too old
+# when RHEL 7 was released, but now it is ok.
 %bcond_without py3integration
 %endif
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: Nov2019 - Use correct size.

2020-01-29 Thread Sjoerd Mullender
Changeset: 32a6ece8e57c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=32a6ece8e57c
Modified Files:
monetdb5/modules/mal/mal_mapi.c
Branch: Nov2019
Log Message:

Use correct size.


diffs (12 lines):

diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -932,7 +932,7 @@ SERVERlisten(int port, const char *usock
throw(MAL, "mal_mapi.listen", OPERATION_FAILED ": starting 
thread failed");
}
 #ifdef DEBUG_SERVER
-   gethostname(host, (int) 512);
+   gethostname(host, sizeof(host));
snprintf(msg, (int) 512, "#Ready to accept connections on %s:%d\n", 
host, port);
fprintf(stderr, "%s", msg);
 #endif
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: mosaic - Update TODO's.

2020-01-29 Thread Aris Koning
Changeset: deaf3219b04a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=deaf3219b04a
Modified Files:
monetdb5/modules/mosaic/TODO_MOSAIC.txt
Branch: mosaic
Log Message:

Update TODO's.


diffs (18 lines):

diff --git a/monetdb5/modules/mosaic/TODO_MOSAIC.txt 
b/monetdb5/modules/mosaic/TODO_MOSAIC.txt
--- a/monetdb5/modules/mosaic/TODO_MOSAIC.txt
+++ b/monetdb5/modules/mosaic/TODO_MOSAIC.txt
@@ -1,6 +1,5 @@
 technical depth
 
-Expand the select interface to handle boolean unknown parameter.
 Add layout summary in analysis.
 Fix/check/test MOSlayout.
 Add the compression on OID heap for string valued columns too.
@@ -27,6 +26,7 @@ Find a more 'generic' model to estimate 
 Create a plug-in estimation model framework.
 
 code issues
+Straighten out semantics MOSselect. Make them exact to BATselect.
 See if the iteration algorithms can be improved.
 Use GDK naming conventions, e.g. o for stuff coming out if canditer_next.
 Update copyright in 2020.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: mosaic - Implement + test 'unknown' parameter in mosaic...

2020-01-29 Thread Aris Koning
Changeset: 195bcc26340b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=195bcc26340b
Modified Files:
monetdb5/modules/mosaic/Tests/mosaic_bit.delta.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit.dict.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit.dict256.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit.frame.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit.linear.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit.mal
monetdb5/modules/mosaic/Tests/mosaic_bit.prefix.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit.raw.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit.runlength.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit_with_nils.delta.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit_with_nils.dict.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit_with_nils.dict256.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit_with_nils.frame.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit_with_nils.linear.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit_with_nils.mal
monetdb5/modules/mosaic/Tests/mosaic_bit_with_nils.prefix.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit_with_nils.raw.stable.out
monetdb5/modules/mosaic/Tests/mosaic_bit_with_nils.runlength.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date.delta.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date.dict.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date.dict256.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date.frame.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date.linear.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date.mal
monetdb5/modules/mosaic/Tests/mosaic_date.prefix.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date.raw.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date.runlength.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date_with_nils.delta.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date_with_nils.dict.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date_with_nils.dict256.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date_with_nils.frame.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date_with_nils.linear.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date_with_nils.mal
monetdb5/modules/mosaic/Tests/mosaic_date_with_nils.prefix.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date_with_nils.raw.stable.out
monetdb5/modules/mosaic/Tests/mosaic_date_with_nils.runlength.stable.out
monetdb5/modules/mosaic/Tests/mosaic_dbl.dict.stable.out
monetdb5/modules/mosaic/Tests/mosaic_dbl.dict256.stable.out
monetdb5/modules/mosaic/Tests/mosaic_dbl.mal
monetdb5/modules/mosaic/Tests/mosaic_dbl.raw.stable.out
monetdb5/modules/mosaic/Tests/mosaic_dbl.runlength.stable.out
monetdb5/modules/mosaic/Tests/mosaic_dbl_with_nils.dict.stable.out
monetdb5/modules/mosaic/Tests/mosaic_dbl_with_nils.dict256.stable.out
monetdb5/modules/mosaic/Tests/mosaic_dbl_with_nils.mal
monetdb5/modules/mosaic/Tests/mosaic_dbl_with_nils.raw.stable.out
monetdb5/modules/mosaic/Tests/mosaic_dbl_with_nils.runlength.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng.delta.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng.dict.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng.dict256.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng.frame.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng.linear.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng.mal
monetdb5/modules/mosaic/Tests/mosaic_lng.prefix.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng.raw.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng.runlength.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng_with_nils.delta.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng_with_nils.dict.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng_with_nils.dict256.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng_with_nils.frame.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng_with_nils.linear.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng_with_nils.mal
monetdb5/modules/mosaic/Tests/mosaic_lng_with_nils.prefix.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng_with_nils.raw.stable.out
monetdb5/modules/mosaic/Tests/mosaic_lng_with_nils.runlength.stable.out
monetdb5/modules/mosaic/Tests/mosaic_oid.delta.stable.out
monetdb5/modules/mosaic/Tests/mosaic_oid.dict.stable.out
monetdb5/modules/mosaic/Tests/mosaic_oid.dict256.stable.out
monetdb5/modules/mosaic/Tests/mosaic_oid.frame.stable.out
monetdb5/modules/mosaic/Tests/mosaic_oid.linear.stable.out

MonetDB: mosaic - Approve test output.

2020-01-29 Thread Aris Koning
Changeset: 9d04a82a7ce6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d04a82a7ce6
Modified Files:
sql/test/mosaic/Tests/analysis.stable.out
Branch: mosaic
Log Message:

Approve test output.


diffs (80 lines):

diff --git a/sql/test/mosaic/Tests/analysis.stable.out 
b/sql/test/mosaic/Tests/analysis.stable.out
--- a/sql/test/mosaic/Tests/analysis.stable.out
+++ b/sql/test/mosaic/Tests/analysis.stable.out
@@ -31,19 +31,20 @@ stdout of test 'analysis` in directory '
 % .%4, .%4 # table_name
 % technique,   factor # name
 % clob,double # type
-% 18,  24 # length
+% 15,  24 # length
 [ "delta ",15.998  ]
 [ "dict ", 0.571   ]
 [ "dict frame ",   0.572   ]
 [ "dict prefix ",  0.572   ]
-[ "dict256 dict ", 0.571   ]
+[ "dict256 ",  0.571   ]
+[ "dict256 frame ",0.572   ]
+[ "dict256 prefix ",   0.572   ]
 [ "frame ",2.132   ]
 [ "linear ",   188679.25   ]
 [ "prefix ",   2.132   ]
 [ "raw dict ", 0.571   ]
-[ "raw dict256 ",  0.999   ]
+[ "raw dict256 ",  0.571   ]
 [ "runlength ",0.333   ]
-[ "runlength dict256 ",0.333   ]
 #insert into tmp4 select 1000 from tmp4;
 [ 1000 ]
 #select technique, factor from mosaic.analysis('sys', 'tmp4', 'i') order by 
factor desc, technique;
@@ -58,18 +59,21 @@ stdout of test 'analysis` in directory '
 [ "dict delta ",   1.485   ]
 [ "dict frame ",   0.882   ]
 [ "dict prefix ",  0.882   ]
-[ "dict256 delta ",17.401  ]
-[ "dict256 dict ", 0.881   ]
+[ "dict256 ",  0.799   ]
+[ "dict256 delta ",1.485   ]
+[ "dict256 dict ", 0.571   ]
+[ "dict256 frame ",0.882   ]
+[ "dict256 prefix ",   0.882   ]
 [ "frame ",2.285   ]
 [ "linear ",   350877.187  ]
 [ "prefix ",   2.285   ]
 [ "raw dict ", 0.775   ]
-[ "raw dict256 ",  1.56]
+[ "raw dict256 ",  0.775   ]
 [ "raw runlength ",1.999   ]
 [ "runlength ",0.666   ]
 [ "runlength delta ",  19.072  ]
 [ "runlength dict ",   0.885   ]
-[ "runlength dict256 ",0.609   ]
+[ "runlength dict256 ",0.885   ]
 [ "runlength linear ", 357142.843  ]
 #select technique, factor from mosaic.analysis('sys', 'tmp4', 'i', 'linear, 
runlength') order by technique, factor desc;
 % .%5, .%5 # table_name
@@ -93,18 +97,21 @@ stdout of test 'analysis` in directory '
 [ "dict delta ",   1.485   ]
 [ "dict frame ",   0.882   ]
 [ "dict prefix ",  0.882   ]
-[ "dict256 delta ",17.401  ]
-[ "dict256 dict ", 0.881   ]
+[ "dict256 ",  0.799   ]
+[ "dict256 delta ",1.485   ]
+[ "dict256 dict ", 0.571   ]
+[ "dict256 frame ",0.882   ]
+[ "dict256 prefix ",   0.882   ]
 [ "frame ",2.285   ]
 [ "linear ",   350877.187  ]
 [ "prefix ",   2.285   ]
 [ "raw dict ", 0.775   ]
-[ "raw dict256 ",  1.56]
+[ "raw dict256 ",  0.775   ]
 [ "raw runlength ",1.999   ]
 [ "runlength ",0.666   ]
 [ "runlength delta ",  19.072  ]
 [ "runlength dict ",   0.885   ]
-[ "runlength dict256 ",0.609   ]
+[ "runlength dict256 ",0.885   ]
 [ "runlength linear ", 357142.843  ]
 #select technique, factor from mosaic.analysis('sys', 'tmp4', 'i', 'linear, 
runlength') order by technique, factor desc;
 % .%5, .%5 # table_name
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: mosaic - Mosaic optimizer may only touche operators wit...

2020-01-29 Thread Aris Koning
Changeset: 96fef98cfc39 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=96fef98cfc39
Modified Files:
monetdb5/optimizer/opt_mosaic.c
Branch: mosaic
Log Message:

Mosaic optimizer may only touche operators with operands of allowed type.


diffs (30 lines):

diff --git a/monetdb5/optimizer/opt_mosaic.c b/monetdb5/optimizer/opt_mosaic.c
--- a/monetdb5/optimizer/opt_mosaic.c
+++ b/monetdb5/optimizer/opt_mosaic.c
@@ -33,7 +33,6 @@ static int OPTmosaicType(MalBlkPtr mb, I
case TYPE_oid:
case TYPE_flt:
case TYPE_dbl:
-   case TYPE_str:
return 1;
default:
if( type == TYPE_date)
@@ -107,15 +106,15 @@ OPTmosaicImplementationInternal(Client c
// actual conversion
 for( i=0; i < limit; i++){
 p = old[i];
-if ( getModuleId(p) == algebraRef && (getFunctionId(p) == selectRef || 
getFunctionId(p) == thetaselectRef)){
+if ( getModuleId(p) == algebraRef && (getFunctionId(p) == selectRef || 
getFunctionId(p) == thetaselectRef) && OPTmosaicType(mb,p,1)){
setModuleId(p, mosaicRef);
actions++;
} else
-if ( getModuleId(p) == algebraRef && getFunctionId(p) == 
projectionRef){
+if ( getModuleId(p) == algebraRef && getFunctionId(p) == projectionRef 
&& OPTmosaicType(mb,p,2)){
setModuleId(p, mosaicRef);
actions++;
} else
-if ( getModuleId(p) == algebraRef && getFunctionId(p) == joinRef && 
p->argc ==8){
+if ( getModuleId(p) == algebraRef && getFunctionId(p) == joinRef && 
p->argc ==8 && OPTmosaicType(mb,p,2)){
setModuleId(p, mosaicRef);
if (coui) {
/*This will push and set the COUI flag true.*/
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: mosaic - Fix a small bug in projection loop.

2020-01-29 Thread Aris Koning
Changeset: 18f8adf45014 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=18f8adf45014
Modified Files:
monetdb5/modules/mosaic/mosaic_projection_template.h
Branch: mosaic
Log Message:

Fix a small bug in projection loop.


diffs (20 lines):

diff --git a/monetdb5/modules/mosaic/mosaic_projection_template.h 
b/monetdb5/modules/mosaic/mosaic_projection_template.h
--- a/monetdb5/modules/mosaic/mosaic_projection_template.h
+++ b/monetdb5/modules/mosaic/mosaic_projection_template.h
@@ -29,8 +29,6 @@ MOSprojection_SIGNATURE(NAME, TPE)
 
ASSERT_ALIGNMENT_BLOCK_HEADER(task->blk, NAME, TPE);
 
-   TPE* bt= (TPE*) task->src;
-
/* Advance the candidate iterator to the first element within
 * the oid range of the current block.
 */
@@ -52,7 +50,6 @@ MOSprojection_SIGNATURE(NAME, TPE)
else {
PROJECTION_LOOP(canditer_next);
}
-   task->src = (char*) bt;
 
if ((c = canditer_peekprev(task->ci)) >= last) {
/*Restore iterator if it went pass the end*/
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: mosaic - Update TODO's.

2020-01-29 Thread Aris Koning
Changeset: 8cd342e7dd82 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8cd342e7dd82
Modified Files:
monetdb5/modules/mosaic/TODO_MOSAIC.txt
Branch: mosaic
Log Message:

Update TODO's.


diffs (31 lines):

diff --git a/monetdb5/modules/mosaic/TODO_MOSAIC.txt 
b/monetdb5/modules/mosaic/TODO_MOSAIC.txt
--- a/monetdb5/modules/mosaic/TODO_MOSAIC.txt
+++ b/monetdb5/modules/mosaic/TODO_MOSAIC.txt
@@ -1,11 +1,15 @@
 technical depth
+
+Expand the select interface to handle boolean unknown parameter.
+Add layout summary in analysis.
+Fix/check/test MOSlayout.
+Add the compression on OID heap for string valued columns too.
+Figure out why mix compression don't seem to work that well.
+benchmark using TPC-H
 Refactor macro-ised functions to real functions in header files and apply the 
include trick
-benchmark using TPC-H
-Fix/check/test MOSlayout.
 Add negative values to tests
 Add test for huge
 create mix compression test cases particularly for dict/dict256 combo.
-Introduce a custom pre-processor to expand macro's efficiently for debugging 
purposes.
 Introduce mosaic into gdk: create hooks in scanselect functions/macro's, joins 
and projections.
 make mitosis work with mosaic and see how this relates to the previous 
landmark stuff.
 Transform control dependency into data dependency select loops.
@@ -18,7 +22,7 @@ consider packing mosaic_block_header's m
 Add asserts on type degeneration for bit => bte daytime => lng timestmap => 
lng date => int.
 DO nil checking more efficient similar to gdk_select
 Timing in the context of MOSanalysis
-Add the compression on OID heap for string valued columns too.
+
 Find a more 'generic' model to estimate and explore compression space perhaps 
Monte Carlo based.
 Create a plug-in estimation model framework.
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: mosaic - We don't support str type (yet) in mosaic.

2020-01-29 Thread Aris Koning
Changeset: 3cbfcdc4ccec for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3cbfcdc4ccec
Modified Files:
monetdb5/modules/mosaic/mosaic.mal
Branch: mosaic
Log Message:

We don't support str type (yet) in mosaic.


diffs (53 lines):

diff --git a/monetdb5/modules/mosaic/mosaic.mal 
b/monetdb5/modules/mosaic/mosaic.mal
--- a/monetdb5/modules/mosaic/mosaic.mal
+++ b/monetdb5/modules/mosaic/mosaic.mal
@@ -36,9 +36,6 @@ address MOSselect;
 pattern select(b:bat[:dbl], low:dbl, high:dbl, li:bit, hi:bit, anti:bit) 
:bat[:oid]
 address MOSselect;
 
-pattern select(b:bat[:str], low:str, high:str, li:bit, hi:bit, anti:bit) 
:bat[:oid]
-address MOSselect;
-
 pattern select(b:bat[:timestamp], low:timestamp, high:timestamp, li:bit, 
hi:bit, anti:bit) :bat[:oid]
 address MOSselect
 comment "Overloaded selection routine";
@@ -75,9 +72,6 @@ address MOSselect;
 pattern select(b:bat[:dbl], cand:bat[:oid], low:dbl, high:dbl, li:bit, hi:bit, 
anti:bit) :bat[:oid]
 address MOSselect;
 
-pattern select(b:bat[:str], cand:bat[:oid], low:str, high:str, li:bit, hi:bit, 
anti:bit) :bat[:oid]
-address MOSselect;
-
 pattern select(b:bat[:timestamp], cand:bat[:oid], low:timestamp, 
high:timestamp, li:bit, hi:bit, anti:bit) :bat[:oid]
 address MOSselect
 comment "Overloaded selection routine";
@@ -114,9 +108,6 @@ address MOSthetaselect;
 pattern thetaselect(b:bat[:dbl], low:dbl, oper:str) :bat[:oid]
 address MOSthetaselect;
 
-pattern thetaselect(b:bat[:str], low:str, oper:str) :bat[:oid]
-address MOSthetaselect;
-
 pattern thetaselect(b:bat[:timestamp], low:timestamp, oper:str) :bat[:oid]
 address MOSthetaselect
 comment "Overloaded selection routine";
@@ -153,9 +144,6 @@ address MOSthetaselect;
 pattern thetaselect(b:bat[:dbl], c:bat[:oid], low:dbl, oper:str) :bat[:oid]
 address MOSthetaselect;
 
-pattern thetaselect(b:bat[:str], c:bat[:oid], low:str, oper:str) :bat[:oid]
-address MOSthetaselect;
-
 pattern thetaselect(b:bat[:timestamp], c:bat[:oid], low:timestamp, oper:str) 
:bat[:oid]
 address MOSthetaselect
 comment "Overloaded selection routine";
@@ -192,9 +180,6 @@ address MOSprojection;
 pattern projection(b:bat[:oid], cand:bat[:dbl]) :bat[:dbl]
 address MOSprojection;
 
-pattern projection(b:bat[:oid], cand:bat[:str]) :bat[:str]
-address MOSprojection;
-
 pattern projection(b:bat[:oid], cand:bat[:timestamp]) :bat[:timestamp]
 address MOSprojection
 comment "Overloaded projection operation";
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: Nov2019 - Bug fix: compare values not pointers.

2020-01-29 Thread Aris Koning
Changeset: c83d9b19d8be for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c83d9b19d8be
Modified Files:
monetdb5/modules/kernel/algebra.c
Branch: Nov2019
Log Message:

Bug fix: compare values not pointers.


diffs (12 lines):

diff --git a/monetdb5/modules/kernel/algebra.c 
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -310,7 +310,7 @@ ALGselect2nil(bat *result, const bat *bi
low = high; 
else if (*hi == 1 && ATOMcmp(b->ttype, high, nilptr) == 0)
high = low;
-   if (low == high && ATOMcmp(b->ttype, high, nilptr) == 0) /* ugh sql nil 
!= nil */
+   if (ATOMcmp(b->ttype, low, high) == 0 && ATOMcmp(b->ttype, high, 
nilptr) == 0) /* ugh sql nil != nil */
nanti = !nanti;
bn = BATselect(b, s, low, high, *li, *hi, nanti);
BBPunfix(b->batCacheid);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: default - Removed support for Python 2.

2020-01-29 Thread Sjoerd Mullender
Changeset: d444859a0841 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d444859a0841
Added Files:
sql/backends/monet5/UDF/pyapi3/connection.h
sql/backends/monet5/UDF/pyapi3/conversion.h
sql/backends/monet5/UDF/pyapi3/convert_loops.h
sql/backends/monet5/UDF/pyapi3/emit.h
sql/backends/monet5/UDF/pyapi3/formatinput.h
sql/backends/monet5/UDF/pyapi3/pyapi.h
sql/backends/monet5/UDF/pyapi3/pyheader.h
sql/backends/monet5/UDF/pyapi3/pytypes.h
sql/backends/monet5/UDF/pyapi3/type_conversion.h
sql/backends/monet5/UDF/pyapi3/undef.h
sql/backends/monet5/UDF/pyapi3/unicode.h
Removed Files:
clients/examples/python/mclient-python2.py
debian/monetdb-python2.install
sql/backends/monet5/Tests/createorreplace.sql
sql/backends/monet5/Tests/createorreplace.stable.err
sql/backends/monet5/Tests/createorreplace.stable.out
sql/backends/monet5/Tests/pyapi00.sql
sql/backends/monet5/Tests/pyapi00.stable.err
sql/backends/monet5/Tests/pyapi00.stable.out
sql/backends/monet5/Tests/pyapi01.sql
sql/backends/monet5/Tests/pyapi01.stable.err
sql/backends/monet5/Tests/pyapi01.stable.out
sql/backends/monet5/Tests/pyapi02.sql
sql/backends/monet5/Tests/pyapi02.stable.err
sql/backends/monet5/Tests/pyapi02.stable.out
sql/backends/monet5/Tests/pyapi03.sql
sql/backends/monet5/Tests/pyapi03.stable.err
sql/backends/monet5/Tests/pyapi03.stable.out
sql/backends/monet5/Tests/pyapi04.sql
sql/backends/monet5/Tests/pyapi04.stable.err
sql/backends/monet5/Tests/pyapi04.stable.out
sql/backends/monet5/Tests/pyapi05.sql
sql/backends/monet5/Tests/pyapi05.stable.err
sql/backends/monet5/Tests/pyapi05.stable.out
sql/backends/monet5/Tests/pyapi06.sql
sql/backends/monet5/Tests/pyapi06.stable.err
sql/backends/monet5/Tests/pyapi06.stable.out
sql/backends/monet5/Tests/pyapi07.sql
sql/backends/monet5/Tests/pyapi07.stable.err
sql/backends/monet5/Tests/pyapi07.stable.out
sql/backends/monet5/Tests/pyapi08.sql
sql/backends/monet5/Tests/pyapi08.stable.err
sql/backends/monet5/Tests/pyapi08.stable.out
sql/backends/monet5/Tests/pyapi09.sql
sql/backends/monet5/Tests/pyapi09.stable.err
sql/backends/monet5/Tests/pyapi09.stable.out
sql/backends/monet5/Tests/pyapi10.sql
sql/backends/monet5/Tests/pyapi10.stable.err
sql/backends/monet5/Tests/pyapi10.stable.err.Windows
sql/backends/monet5/Tests/pyapi10.stable.out
sql/backends/monet5/Tests/pyapi11.sql
sql/backends/monet5/Tests/pyapi11.stable.err
sql/backends/monet5/Tests/pyapi11.stable.out
sql/backends/monet5/Tests/pyapi12.sql
sql/backends/monet5/Tests/pyapi12.stable.err
sql/backends/monet5/Tests/pyapi12.stable.out
sql/backends/monet5/Tests/pyapi13.sql
sql/backends/monet5/Tests/pyapi13.stable.err
sql/backends/monet5/Tests/pyapi13.stable.out
sql/backends/monet5/Tests/pyapi14.sql
sql/backends/monet5/Tests/pyapi14.stable.err
sql/backends/monet5/Tests/pyapi14.stable.out
sql/backends/monet5/Tests/pyapi15.sql
sql/backends/monet5/Tests/pyapi16.sql
sql/backends/monet5/Tests/pyapi16.stable.err
sql/backends/monet5/Tests/pyapi16.stable.out
sql/backends/monet5/Tests/pyapi17.sql
sql/backends/monet5/Tests/pyapi17.stable.err
sql/backends/monet5/Tests/pyapi17.stable.out
sql/backends/monet5/Tests/pyapi18.sql
sql/backends/monet5/Tests/pyapi18.stable.err
sql/backends/monet5/Tests/pyapi18.stable.out
sql/backends/monet5/Tests/pyapi19.sql
sql/backends/monet5/Tests/pyapi19.stable.err
sql/backends/monet5/Tests/pyapi19.stable.out
sql/backends/monet5/Tests/pyapi20.sql
sql/backends/monet5/Tests/pyapi20.stable.err
sql/backends/monet5/Tests/pyapi20.stable.out
sql/backends/monet5/Tests/pyapi21.sql
sql/backends/monet5/Tests/pyapi21.stable.err
sql/backends/monet5/Tests/pyapi21.stable.out
sql/backends/monet5/Tests/pyapi23.sql
sql/backends/monet5/Tests/pyapi23.stable.err
sql/backends/monet5/Tests/pyapi23.stable.out
sql/backends/monet5/Tests/pyapi24.sql
sql/backends/monet5/Tests/pyapi24.stable.err
sql/backends/monet5/Tests/pyapi24.stable.out
sql/backends/monet5/Tests/pyapi25.sql
sql/backends/monet5/Tests/pyapi25.stable.err
sql/backends/monet5/Tests/pyapi25.stable.err.Windows
sql/backends/monet5/Tests/pyapi25.stable.out
sql/backends/monet5/Tests/pyapi26.sql
sql/backends/monet5/Tests/pyapi26.stable.err
sql/backends/monet5/Tests/pyapi26.stable.out
sql/backends/monet5/Tests/pyapi27.sql

MonetDB: default - Add upgrade code for logging schema and some ...

2020-01-29 Thread Sjoerd Mullender
Changeset: 0d421f400d17 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d421f400d17
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128

sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:

Add upgrade code for logging schema and some upgrade fixes.


diffs (truncated from 1008 to 300 lines):

diff --git a/sql/backends/monet5/sql_upgrades.c 
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -2820,14 +2820,13 @@ sql_update_default(Client c, mvc *sql, c
}
 #endif
 
-   /* 51_sys_schema_extension.sql */
pos += snprintf(buf + pos, bufsize - pos,
-   "create window group_concat(str STRING) returns STRING\n"
+   "create window sys.group_concat(str STRING) returns STRING\n"
" external name \"sql\".\"str_group_concat\";\n"
-   "GRANT EXECUTE ON WINDOW group_concat(STRING) TO PUBLIC;\n"
-   "create window group_concat(str STRING, sep STRING) returns 
STRING\n"
+   "GRANT EXECUTE ON WINDOW sys.group_concat(STRING) TO PUBLIC;\n"
+   "create window sys.group_concat(str STRING, sep STRING) returns 
STRING\n"
" external name \"sql\".\"str_group_concat\";\n"
-   "GRANT EXECUTE ON WINDOW group_concat(STRING, STRING) TO 
PUBLIC;\n");
+   "GRANT EXECUTE ON WINDOW sys.group_concat(STRING, STRING) TO 
PUBLIC;\n");
 
pos += snprintf(buf + pos, bufsize - pos,
"update sys.functions set system = true where name in"
@@ -2848,6 +2847,35 @@ sql_update_default(Client c, mvc *sql, c
"DROP AGGREGATE var_pop(time);\n"
"DROP AGGREGATE var_pop(timestamp);\n");
 
+   /* 81_tracer.sql */
+   pos += snprintf(buf + pos, bufsize - pos,
+   "CREATE SCHEMA logging;\n"
+   "CREATE PROCEDURE logging.flush()\n"
+   " EXTERNAL NAME logging.flush;\n"
+   "CREATE PROCEDURE logging.setcomplevel(comp_id INT, 
lvl_id INT)\n"
+   " EXTERNAL NAME logging.setcomplevel;\n"
+   "CREATE PROCEDURE logging.resetcomplevel(comp_id INT)\n"
+   " EXTERNAL NAME logging.resetcomplevel;\n"
+   "CREATE PROCEDURE logging.setlayerlevel(layer_id INT, 
lvl_id INT)\n"
+   " EXTERNAL NAME logging.setlayerlevel;\n"
+   "CREATE PROCEDURE logging.resetlayerlevel(layer_id 
INT)\n"
+   " EXTERNAL NAME logging.resetlayerlevel;\n"
+   "CREATE PROCEDURE logging.setflushlevel(lvl_id INT)\n"
+   " EXTERNAL NAME logging.setflushlevel;\n"
+   "CREATE PROCEDURE logging.resetflushlevel()\n"
+   " EXTERNAL NAME logging.resetflushlevel;\n"
+   "CREATE PROCEDURE logging.setadapter(adapter_id INT)\n"
+   " EXTERNAL NAME logging.setadapter;\n"
+   "CREATE PROCEDURE logging.resetadapter()\n"
+   " EXTERNAL NAME logging.resetadapter;\n"
+   "CREATE PROCEDURE logging.showinfo()\n"
+   " EXTERNAL NAME logging.showinfo;\n");
+   pos += snprintf(buf + pos, bufsize - pos,
+   "update sys.schemas set system = true where name = 
'logging';\n"
+   "update sys.functions set system = true where name in"
+   " ('flush', 'setcomplevel', 'resetcomplevel', 
'setlayerlevel', 'resetlayerlevel', 'setflushlevel', 'resetflushlevel', 
'setadapter', 

MonetDB: trails - Approved outputs

2020-01-29 Thread Pedro Ferreira
Changeset: 73c48c79f8fa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=73c48c79f8fa
Modified Files:

sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/DropCascade/Tests/drop_columns_cascade.stable.out
sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out
sql/test/Tests/keys.stable.out
Branch: trails
Log Message:

Approved outputs


diffs (90 lines):

diff --git 
a/sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.stable.out
 
b/sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.stable.out
--- 
a/sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.stable.out
+++ 
b/sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.stable.out
@@ -104,6 +104,7 @@ MERGE TABLE
 REMOTE TABLE
 REPLICA TABLE
 STREAM TABLE
+STREAM TABLE
 SYSTEM TABLE
 SYSTEM VIEW
 TABLE
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
@@ -175,7 +175,6 @@ Dependencies between database objects
 [ "sn","sq_pkey_sn_file_id",   "DEP_KEY"   ]
 [ "srid",  "spatial_ref_sys_srid_pkey","DEP_KEY"   ]
 [ "table_type_id", "table_types_table_type_id_pkey",   "DEP_KEY"   
]
-[ "table_type_name",   "table_types_table_type_name_unique",   "DEP_KEY"   
]
 #SELECT c.name, i.name, 'DEP_INDEX' from columns as c, objects as kc, idxs as 
i where kc."name" = c.name AND kc.id = i.id AND c.table_id = i.table_id AND 
i.name not in (select name from keys) order by c.name, i.name;
 % .c,  .i, .%12 # table_name
 % name,name,   %12 # name
@@ -915,7 +914,6 @@ Cleanup
 [ "sn","sq_pkey_sn_file_id",   "DEP_KEY"   ]
 [ "srid",  "spatial_ref_sys_srid_pkey","DEP_KEY"   ]
 [ "table_type_id", "table_types_table_type_id_pkey",   "DEP_KEY"   
]
-[ "table_type_name",   "table_types_table_type_name_unique",   "DEP_KEY"   
]
 #SELECT c.name, i.name, 'DEP_INDEX' from columns as c, objects as kc, idxs as 
i where kc."name" = c.name AND kc.id = i.id AND c.table_id = i.table_id AND 
i.name not in (select name from keys) order by c.name, i.name;
 % .c,  .i, .%12 # table_name
 % name,name,   %12 # name
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 
b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
@@ -175,7 +175,6 @@ Dependencies between database objects
 [ "sn","sq_pkey_sn_file_id",   "DEP_KEY"   ]
 [ "srid",  "spatial_ref_sys_srid_pkey","DEP_KEY"   ]
 [ "table_type_id", "table_types_table_type_id_pkey",   "DEP_KEY"   
]
-[ "table_type_name",   "table_types_table_type_name_unique",   "DEP_KEY"   
]
 #SELECT c.name, i.name, 'DEP_INDEX' from columns as c, objects as kc, idxs as 
i where kc."name" = c.name AND kc.id = i.id AND c.table_id = i.table_id AND 
i.name not in (select name from keys) order by c.name, i.name;
 % .c,  .i, .%12 # table_name
 % name,name,   %12 # name
@@ -915,7 +914,6 @@ Cleanup
 [ "sn","sq_pkey_sn_file_id",   "DEP_KEY"   ]
 [ "srid",  "spatial_ref_sys_srid_pkey","DEP_KEY"   ]
 [ "table_type_id", "table_types_table_type_id_pkey",   "DEP_KEY"   
]
-[ "table_type_name",   "table_types_table_type_name_unique",   "DEP_KEY"   
]
 #SELECT c.name, i.name, 'DEP_INDEX' from columns as c, objects as kc, idxs as 
i where kc."name" = c.name AND kc.id = i.id AND c.table_id = i.table_id AND 
i.name not in (select name from keys) order by c.name, i.name;
 % .c,  .i, .%12 # table_name
 % name,name,   %12 # name
diff --git a/sql/test/DropCascade/Tests/drop_columns_cascade.stable.out 
b/sql/test/DropCascade/Tests/drop_columns_cascade.stable.out
--- a/sql/test/DropCascade/Tests/drop_columns_cascade.stable.out
+++ b/sql/test/DropCascade/Tests/drop_columns_cascade.stable.out
@@ -62,7 +62,6 @@ stdout of test 'drop_columns_cascade` in
 [ "dependency_types_dependency_type_name_unique"   ]
 [ "keywords_keyword_pkey"  ]
 [ "table_types_table_type_id_pkey" ]
-[ "table_types_table_type_name_unique" ]
 [ "function_types_function_type_id_pkey"   ]
 [ "function_types_function_type_name_unique"   ]
 [ "function_languages_language_id_pkey"]
diff --git a/sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out 
b/sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out
--- a/sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out
+++ b/sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out
@@ -36,7 +36,6 @@ stdout of test 'drop_pkey_cascade` in 

MonetDB: default - Backed out changeset 00d1a186e938: it removes...

2020-01-29 Thread Sjoerd Mullender
Changeset: 2ebb4c92692e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ebb4c92692e
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128

sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:

Backed out changeset 00d1a186e938: it removes too much.


diffs (truncated from 303 to 300 lines):

diff --git a/sql/backends/monet5/sql_upgrades.c 
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -2548,14 +2548,6 @@ sql_update_default(Client c, mvc *sql, c
"update sys._tables set system = true where schema_id = 
(select id from sys.schemas where name = 'sys')"
" and name = 'queue';\n");
 
-   /* fix sql_privileges entries */
-   pos += snprintf(buf + pos, bufsize - pos,
-   "delete from \"privileges\" where\n"
-   "\"obj_id\" not in (select \"id\" from \"functions\" 
union select \"id\" from \"tables\" union select \"id\" from \"columns\" union 
select \"id\" from \"schemas\")\n"
-   "or (\"auth_id\",\"grantor\") not in (select 
\"id\",\"id\" from \"auths\" union select 0,0);\n"
-   "delete from \"auths\" where \"grantor\" not in (select 
\"id\" from \"auths\" union select 0);\n"
-   "delete from \"user_role\" where 
(\"login_id\",\"role_id\") not in (select \"id\",\"id\" from \"auths\" union 
select 0,0);\n");
-
/* 51_sys_schema_extensions */
pos += snprintf(buf + pos, bufsize - pos,
"ALTER TABLE sys.keywords SET READ WRITE;\n"
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -6045,11 +6045,6 @@ external name sql.sysmon_stop;
 update sys.functions set system = true where schema_id = (select id from 
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
 update sys.functions set system = true where schema_id = (select id from 
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and 
type = 2;
 update sys._tables set system = true where schema_id = (select id from 
sys.schemas where name = 'sys') and name = 'queue';
-delete from "privileges" where
-"obj_id" not in (select "id" from "functions" union select "id" from "tables" 
union select "id" from "columns" union select "id" from "schemas")
-or ("auth_id","grantor") not in (select "id","id" from "auths" union select 
0,0);
-delete from "auths" where "grantor" not in (select "id" from "auths" union 
select 0);
-delete from "user_role" where ("login_id","role_id") not in (select "id","id" 
from "auths" union select 0,0);
 ALTER TABLE sys.keywords SET READ WRITE;
 DELETE FROM sys.keywords where "keyword" IN 
('NOCYCLE','NOMAXVALUE','NOMINVALUE');
 insert into sys.keywords values 

MonetDB: default - Compilation fix

2020-01-29 Thread Pedro Ferreira
Changeset: eb2be6a285d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb2be6a285d0
Modified Files:
sql/backends/monet5/sql_rank.c
Branch: default
Log Message:

Compilation fix


diffs (12 lines):

diff --git a/sql/backends/monet5/sql_rank.c b/sql/backends/monet5/sql_rank.c
--- a/sql/backends/monet5/sql_rank.c
+++ b/sql/backends/monet5/sql_rank.c
@@ -1717,7 +1717,7 @@ do_covariance_and_correlation(Client cnt
 
for (BUN i = 0; i < cnt; i++) {
for (lng j = start[i] ; j < end[i] ; j++) {
-   curval = BUNtail(bi, j);
+   curval = BUNtail(bi, (BUN) j);
if (!cmp(curval, nil))
continue;
n++;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: Nov2019 - Typo.

2020-01-29 Thread Sjoerd Mullender
Changeset: 3c83502b606e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3c83502b606e
Modified Files:
NT/rules.msc
Branch: Nov2019
Log Message:

Typo.


diffs (12 lines):

diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -64,7 +64,7 @@ PTHREAD_LIBS =
 ODBCINST_LIBS = odbccp32.lib user32.lib $(LEGACY_STDIO_DEFINITIONS)
 ODBC_LIBS = odbc32.lib
 
-!IFNDEF PY3VER
+!IFNDEF PY2VER
 PY2VER=7
 !ENDIF
 !IFNDEF PYTHON2BASE
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: default - Approve.

2020-01-29 Thread Sjoerd Mullender
Changeset: 9feab9aae4fb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9feab9aae4fb
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128

sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:

Approve.


diffs (truncated from 193934 to 300 lines):

diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -179,5723 +179,5737 @@ insert into sys.functions values (62, 'r
 insert into sys.args values (29851, 62, 'res_0', 'boolean', 1, 0, 0, 0);
 insert into sys.args values (29852, 62, 'arg_1', 'mbr', 0, 0, 1, 1);
 insert into sys.args values (29853, 62, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (63, 'grouping', 'grouping', 'sql', 0, 3, 
false, false, false, 2000, true);
+insert into sys.args values (29854, 63, 'res', 'tinyint', 8, 0, 0, 0);
+insert into sys.args values (29855, 63, 'arg', 'any', 0, 0, 1, 1);
+insert into sys.functions values (64, 'grouping', 'grouping', 'sql', 0, 3, 
false, false, false, 2000, true);
+insert into sys.args values (29856, 64, 'res', 'smallint', 16, 0, 0, 0);
+insert into sys.args values (29857, 64, 'arg', 'any', 0, 0, 1, 1);
+insert into sys.functions values (65, 'grouping', 'grouping', 'sql', 0, 3, 
false, false, false, 2000, true);
+insert into sys.args values (29858, 65, 'res', 'int', 32, 0, 0, 0);
+insert into sys.args values (29859, 65, 'arg', 'any', 0, 0, 1, 1);
+insert into sys.functions values (66, 'grouping', 'grouping', 'sql', 0, 3, 
false, false, false, 2000, true);
+insert into sys.args values (29860, 66, 'res', 'bigint', 64, 0, 0, 0);
+insert into sys.args values (29861, 66, 'arg', 'any', 0, 0, 1, 1);
+insert into sys.functions values (67, 'grouping', 'grouping', 'sql', 0, 3, 
false, false, false, 2000, true);
+insert into sys.args values (29862, 67, 'res', 'hugeint', 128, 0, 0, 0);
+insert into sys.args values (29863, 67, 'arg', 'any', 0, 0, 1, 1);
+insert into sys.functions values (68, 'not_unique', 'not_unique', 'sql', 0, 3, 
false, false, false, 2000, true);
+insert into sys.args values (29864, 68, 'res', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (29865, 68, 'arg', 'oid', 63, 0, 1, 1);
 insert into sys.functions values (69, 'not_uniques', 'not_uniques', 'sql', 0, 
1, false, false, false, 2000, true);
-insert into sys.args values (29854, 69, 'res_0', 'oid', 63, 0, 0, 0);
-insert into sys.args values (29855, 69, 'arg_1', 'bigint', 64, 0, 1, 1);
+insert into sys.args values (29866, 69, 'res_0', 'oid', 63, 0, 0, 0);
+insert into sys.args values (29867, 69, 'arg_1', 'bigint', 64, 0, 1, 1);
 insert into sys.functions values (70, 'not_uniques', 'not_uniques', 'sql', 0, 
1, false, false, false, 2000, true);
-insert into sys.args values (29856, 70, 'res_0', 'oid', 63, 0, 0, 0);
-insert into sys.args values (29857, 70, 'arg_1', 'oid', 63, 0, 1, 1);
+insert into sys.args values (29868, 70, 'res_0', 'oid', 63, 0, 0, 0);
+insert into sys.args values (29869, 70, 'arg_1', 'oid', 63, 0, 1, 1);
 insert into sys.functions values (71, 'hash', 'hash', 'mkey', 0, 1, false, 
false, false, 2000, true);
-insert into sys.args values (29858, 71, 'res_0', 'bigint', 64, 0, 0, 0);
-insert into sys.args values (29859, 71, 'arg_1', 'any', 0, 0, 1, 1);
+insert into sys.args values (29870, 71, 'res_0', 'bigint', 64, 0, 0, 0);
+insert into sys.args values (29871, 71, 'arg_1', 'any', 0, 0, 1, 1);
 insert into sys.functions values (72, 'rotate_xor_hash', 'rotate_xor_hash', 
'calc', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (29860, 72, 'res_0', 'bigint', 64, 0, 

MonetDB: trails - No need for cquery.wait, as the sleep procedur...

2020-01-29 Thread Pedro Ferreira
Changeset: 99b5f68aab32 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99b5f68aab32
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
sql/backends/monet5/Tests/cfunction00.sql
sql/backends/monet5/Tests/cfunction01.sql
sql/backends/monet5/Tests/cfunction02.sql
sql/backends/monet5/Tests/cfunction03.sql
sql/backends/monet5/Tests/cqstream00.sql
sql/backends/monet5/Tests/cqstream01.sql
sql/backends/monet5/Tests/cqstream02.sql
sql/backends/monet5/Tests/cquery02.sql
sql/backends/monet5/Tests/cquery04.sql
sql/backends/monet5/Tests/cquery05.sql
sql/backends/monet5/Tests/cquery06.sql
sql/backends/monet5/Tests/cquery07.sql
sql/backends/monet5/Tests/cquery09.sql
sql/backends/monet5/Tests/cquery10.sql
sql/backends/monet5/Tests/cquery12.sql
sql/backends/monet5/Tests/cquery13.sql
sql/backends/monet5/Tests/cquery14.sql
sql/backends/monet5/Tests/cquery16.sql
sql/backends/monet5/Tests/cquery17.sql
sql/backends/monet5/Tests/cquery18.sql
sql/backends/monet5/Tests/cquery19.sql
sql/backends/monet5/Tests/cquery21.sql
sql/backends/monet5/Tests/cquery22.sql
sql/backends/monet5/cquery.mal
sql/backends/monet5/sql_cquery.c
sql/backends/monet5/sql_cquery.h
sql/scripts/50_cquery.sql
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: trails
Log Message:

No need for cquery.wait, as the sleep procedure is now available at 25_debug.sql


diffs (truncated from 1623 to 300 lines):

diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -10540,7 +10540,6 @@ stdout of test 'MAL-signatures` in direc
 [ "cquery","prelude",  "command cquery.prelude():void ",   
"CQprelude;",   ""  ]
 [ "cquery","show", "pattern cquery.show(alias:str):void ", "CQshow;",  
"Debug a single continuous query"   ]
 [ "cquery","status",   "pattern cquery.status() (tick:bat[:timestamp], 
alias:bat[:str], state:bat[:str], error:bat[:str]) ",   "CQstatus;","Status 
of all registered continuous queries"   ]
-[ "cquery","wait", "pattern cquery.wait(cnt:int):void ",   "CQwait;",  
"Sleep for some time"   ]
 [ "date",  "!=",   "pattern date.!=(v:date, w:date):bit ", "CMDvarNE;",
"Equality of two dates" ]
 [ "date",  "!=",   "pattern date.!=(v:date, w:date, nil_matches:bit):bit 
","CMDvarNE;","Equality of two dates" ]
 [ "date",  "#fromstr", "command date.#fromstr():void ",
"date_fromstr;",""  ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128 
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -14946,7 +14946,6 @@ stdout of test 'MAL-signatures` in direc
 [ "cquery","prelude",  "command cquery.prelude():void ",   
"CQprelude;",   ""  ]
 [ "cquery","show", "pattern cquery.show(alias:str):void ", "CQshow;",  
"Debug a single continuous query"   ]
 [ "cquery","status",   "pattern cquery.status() (tick:bat[:timestamp], 
alias:bat[:str], state:bat[:str], error:bat[:str]) ",   "CQstatus;","Status 
of all registered continuous queries"   ]
-[ "cquery","wait", "pattern cquery.wait(cnt:int):void ",   "CQwait;",  
"Sleep for some time"   ]
 [ "date",  "!=",   "pattern date.!=(v:date, w:date):bit ", "CMDvarNE;",
"Equality of two dates" ]
 [ "date",  "!=",   "pattern date.!=(v:date, w:date, nil_matches:bit):bit 
","CMDvarNE;","Equality of two dates" ]
 [ "date",  "#fromstr", "command date.#fromstr():void ",
"date_fromstr;",""  ]
diff --git a/sql/backends/monet5/Tests/cfunction00.sql 
b/sql/backends/monet5/Tests/cfunction00.sql
--- a/sql/backends/monet5/Tests/cfunction00.sql
+++ b/sql/backends/monet5/Tests/cfunction00.sql
@@ -14,7 +14,7 @@ END;
 -- to call a continuous function in the scheduler, we must pass the keyword 
"function" explicitly
 start continuous function aggr00();
 
-call cquery.wait(1000); #give it time to start
+call sleep(1000); #give it time to start
 select aggr00(); #should return 1
 select aggr00(); #should return 2
 
diff --git a/sql/backends/monet5/Tests/cfunction01.sql 
b/sql/backends/monet5/Tests/cfunction01.sql
--- a/sql/backends/monet5/Tests/cfunction01.sql
+++ 

MonetDB: trails - Merge with default

2020-01-29 Thread Pedro Ferreira
Changeset: 49fcf01b0ec8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=49fcf01b0ec8
Added Files:
sql/test/analytics/Tests/analytics14.sql
sql/test/analytics/Tests/analytics14.stable.err
sql/test/analytics/Tests/analytics14.stable.out
sql/test/analytics/Tests/analytics15.sql
sql/test/analytics/Tests/analytics15.stable.err
sql/test/analytics/Tests/analytics15.stable.out
sql/test/analytics/Tests/analytics16.sql
sql/test/analytics/Tests/analytics16.stable.err
sql/test/analytics/Tests/analytics16.stable.out
sql/test/analytics/Tests/analytics17.sql
sql/test/analytics/Tests/analytics17.stable.err
sql/test/analytics/Tests/analytics17.stable.out
Removed Files:
sql/backends/monet5/sql_aggr_bte.mal
sql/backends/monet5/sql_aggr_dbl.mal
sql/backends/monet5/sql_aggr_flt.mal
sql/backends/monet5/sql_aggr_hge.mal
sql/backends/monet5/sql_aggr_int.mal
sql/backends/monet5/sql_aggr_lng.mal
sql/backends/monet5/sql_aggr_sht.mal
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mhelp.c
clients/odbc/samples/testgetinfo.c
gdk/gdk_aggr.c
gdk/gdk_analytic.h
gdk/gdk_analytic_func.c
gdk/gdk_atoms.h
gdk/gdk_batop.c
gdk/gdk_calc.h
gdk/gdk_cand.c
gdk/gdk_cand.h
gdk/gdk_hash.c
gdk/gdk_hash.h
gdk/gdk_join.c
gdk/gdk_private.h
gdk/gdk_project.c
gdk/gdk_select.c
gdk/gdk_string.c
gdk/gdk_system.c
gdk/gdk_tracer.h
gdk/gdk_unique.c
gdk/gdk_utils.c
geom/lib/libgeom.c
geom/lib/libgeom.h
geom/monetdb5/geom.c
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql

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

monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/mal/Tests/tst002.stable.err
monetdb5/mal/Tests/tst054.stable.err
monetdb5/mal/Tests/tst058.stable.err
monetdb5/mal/mal_function.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/kernel/00_aggr_hge.mal
monetdb5/modules/kernel/00_aggr_hge.mal.sh
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
monetdb5/modules/kernel/alarm.c
monetdb5/modules/kernel/alarm.mal
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/mal/01_batcalc.mal
monetdb5/modules/mal/01_batcalc.mal.sh
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/sysmon.c
monetdb5/optimizer/opt_postfix.c
sql/ChangeLog
sql/backends/monet5/Makefile.ag
sql/backends/monet5/generator/generator.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_gencode.h
sql/backends/monet5/sql_hge.mal
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_rank.h
sql/backends/monet5/sql_rank.mal
sql/backends/monet5/sql_rank.mal.sh
sql/backends/monet5/sql_rank_hge.mal
sql/backends/monet5/sql_rank_hge.mal.sh
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/fits/fits.c
sql/benchmarks/ssbm/Tests/check1.sql
sql/benchmarks/tpcds/Tests/47.stable.out
sql/benchmarks/tpcds/Tests/47.stable.out.int128
sql/benchmarks/tpcds/Tests/53.stable.out
sql/benchmarks/tpcds/Tests/53.stable.out.int128
sql/benchmarks/tpcds/Tests/57.stable.out
sql/benchmarks/tpcds/Tests/57.stable.out.int128
sql/benchmarks/tpcds/Tests/63.stable.out
sql/benchmarks/tpcds/Tests/63.stable.out.int128
sql/benchmarks/tpcds/Tests/79.sql
sql/benchmarks/tpcds/Tests/79.stable.out
sql/benchmarks/tpcds/Tests/79.stable.out.int128
sql/benchmarks/tpcds/Tests/89.stable.out
sql/benchmarks/tpcds/Tests/89.stable.out.int128
sql/benchmarks/tpch/Tests/check1.sql
sql/benchmarks/tpch/Tests/lowcardinality.sql

MonetDB: statistics-analytics - Closing statistics-analytics bra...

2020-01-29 Thread Pedro Ferreira
Changeset: 63a984b2c616 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63a984b2c616
Branch: statistics-analytics
Log Message:

Closing statistics-analytics branch after merge into default

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


MonetDB: default - Updated ChangeLog

2020-01-29 Thread Pedro Ferreira
Changeset: 6904bf4cd5c0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6904bf4cd5c0
Modified Files:
sql/ChangeLog
Branch: default
Log Message:

Updated ChangeLog


diffs (21 lines):

diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
+* Wed Jan 29 2020 Pedro Ferreira 
+- Implemented 'covar_pop' and 'covar_samp' aggregate functions, as well
+  as their window function counterparts. Implemented 'stddev_samp',
+  'stddev_pop', 'var_samp', 'var_pop', 'corr' and 'group_concat'
+  window function correspondents.
+- Extended SQL catalog with CREATE WINDOW syntax for user-defined 
+  SQL:2003 window functions. At the moment, window functions must be
+  defined on the backend engine, ie on this case MAL. At the current
+  implementation, the backend code generation, creates two additional
+  columns of lng type with the start and end offsets for each row.
+
 * Thu Jan 23 2020 Pedro Ferreira 
 - Added sys.sleep(int n) procedure, which makes the client's thread to
   sleep for n milliseconds. Also added the function version, where it
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: default - Approved 32-bit output

2020-01-29 Thread Pedro Ferreira
Changeset: bbccce2c87fc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bbccce2c87fc
Modified Files:
sql/test/emptydb/Tests/check.stable.out
Branch: default
Log Message:

Approved 32-bit output


diffs (12 lines):

diff --git a/sql/test/emptydb/Tests/check.stable.out 
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -2287,7 +2287,7 @@ drop function pcre_replace(string, strin
 % .s,  .f, .,  .,  .f, .fl,.ft,.f, .f, .f, 
.,  .,  .,  .,  .,  .,  .,  .,  .,  .,  
.,  .,  .,  .,  .,  .,  .,  .,  .,  .,  
.,  .,  .,  .,  .,  .,  .,  .,  .,  .,  
.,  .,  .,  .,  .,  .,  .,  .,  .,  .,  
.,  .,  .,  .,  .,  .,  .,  .,  .,  .,  
.,  .,  .,  .,  .,  .,  .,  .,  .,  .,  
.,  .,  .,  .,  .,  .,  .,  .,  .,  .,  
.,  .,  .,  .,  .,  .,  .,  .,  .,  . # 
table_name
 % name,name,   system, query,  mod,language_name,  
function_type_name, side_effect,varres, vararg, name0,  type0,  
type_digits0,   type_scale0,inout0, name1,  type1,  type_digits1,   
type_scale1,inout1, name2,  type2,  type_digits2,   type_scale2,inout2, 
name3,  type3,  type_digits3,   type_scale3,inout3, name4,  type4,  
type_digits4,   type_scale4,inout4, name5,  type5,  type_digits5,   
type_scale5,inout5, name6,  type6,  type_digits6,   type_scale6,inout6, 
name7,  type7,  type_digits7,   type_scale7,inout7, name8,  type8,  
type_digits8,   type_scale8,inout8, name9,  type9,  type_digits9,   
type_scale9,inout9, name10, type10, type_digits10,  type_scale10,   
inout10,name11, type11, type_digits11,  type_scale11,   inout11,
name12, type12, type_digits12,  type_scale12,   inout12,name13, type13, 
type_digits13,  type_scale13,   inout13,name14, type14, type_digits14,  
type_scale14,   inout14,name15, type15, type_digits15,  type_scale15,   
inout15 # name
 % varchar, varchar,char,   varchar,varchar,
varchar,varchar,boolean,boolean,boolean,
varchar,varchar,int,int,char,   varchar,
varchar,int,int,char,   varchar,varchar,int,
int,char,   varchar,varchar,int,int,char,   
varchar,varchar,int,int,char,   varchar,
varchar,int,int,char,   varchar,varchar,int,
int,char,   varchar,varchar,int,int,char,   
varchar,varchar,int,int,char,   varchar,
varchar,int,int,char,   varchar,varchar,int,
int,char,   varchar,varchar,int,int,char,   
varchar,varchar,int,int,char,   varchar,
varchar,int,int,char,   varchar,varchar,int,
int,char,   varchar,varchar,int,int,char # type
-% 8,   24, 6,  1362,   9,  10, 26, 5,  5,  5,  
11, 14, 4,  1,  3,  16, 14, 4,  1,  3,  
16, 14, 4,  1,  3,  27, 12, 4,  1,  3,  
9,  9,  2,  1,  3,  14, 14, 4,  1,  3,  
12, 14, 2,  1,  3,  11, 7,  2,  1,  3,  
11, 7,  2,  1,  3,  8,  6,  2,  1,  3,  
6,  6,  2,  1,  3,  6,  7,  2,  1,  3,  
8,  7,  2,  1,  3,  6,  7,  2,  1,  3,  
9,  7,  1,  1,  3,  6,  7,  1,  1,  3 # 
length
+% 8,   24, 6,  1362,   9,  10, 26, 5,  5,  5,  
11, 14, 4,  1,  3,  16, 14, 4,  1,  3,  
16, 14, 4,  1,  3,  27, 12, 4,  1,  3,  
9,  9,  2,  1,  3,  14, 14, 4,  1,  3,  
12, 14, 2,  1,  3,  11, 7,  2,  1,  3,  
11, 7,  2,  1,  3,  8,  6,  2,  1,  3,  
6,  6,  2,  1,  3,  6,  7,  2,  1,  3,  
8,  7,  2,  1,  3,  6,  7,  1,  1,  3,  
9,  7,  1,  1,  3,  6,  7,  1,  1,  3 # 
length
 [ "bam",   "bam_drop_file","SYSTEM",   "create procedure 
bam.bam_drop_file(file_id bigint, dbschema smallint) external name 

MonetDB: default - Approved output

2020-01-29 Thread Pedro Ferreira
Changeset: 4463996479ab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4463996479ab
Modified Files:
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: default
Log Message:

Approved output


diffs (85 lines):

diff --git a/sql/test/emptydb/Tests/check.stable.out 
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -2457,7 +2457,7 @@ drop function pcre_replace(string, strin
 [ "sys",   "concat",   "SYSTEM",   "+","calc", "Internal C",   
"Scalar function",  false,  false,  false,  "res_0","clob", 0,  
0,  "out",  "arg_1","clob", 0,  0,  "in",   "arg_2",
"clob", 0,  0,  "in",   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL]
 [ "sys",   "concat",   "SYSTEM",   "+","calc", "Internal C",   
"Scalar function",  false,  false,  false,  "res_0","varchar",  
0,  0,  "out",  "arg_1","varchar",  0,  0,  "in",   
"arg_2","varchar",  0,  0,  "in",   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL]
 [ "sys",   "contains", "SYSTEM",   "create function contains(a 
geometry, x double, y double) returns boolean external name 
geom.\"Contains\";","geom", "MAL",  "Scalar function",  false,  false,  
false,  "result",   "boolean",  1,  0,  "out",  "a",
"geometry", 0,  0,  "in",   "x","double",   53, 0,  
"in",   "y","double",   53, 0,  "in",   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL]
-[ "sys",   "copyfrom", "SYSTEM",   "copy_from","sql",  
"Internal C",   "Function returning a table",   false,  true,   false,  
"res_0","table",0,  0,  "out",  "arg_1","ptr",  
0,  0,  "in",   "arg_2","varchar",  0,  0,  "in",   
"arg_3","varchar",  0,  0,  "in",   "arg_4",
"varchar",  0,  0,  "in",   "arg_5","varchar",  0,  
0,  "in",   "arg_6","varchar",  0,  0,  "in",   
"arg_7","bigint",   64, 0,  "in",   "arg_8",
"bigint",   64, 0,  "in",   "arg_9","int",  32, 0,  
"in",   "arg_10",   "int",  32, 0,  "in",   "arg_11",   
"varchar",  0,  0,  "in",   "arg_12",   "int",  32, 0,  
"in",   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL]
+[ "sys",   "copyfrom", "SYSTEM",   "copy_from","sql",  
"Internal C",   "Function returning a table",   false,  true,   false,  
"res_0","table",0,  0,  "out",  "arg_1","ptr",  
0,  0,  "in",   "arg_2","varchar",  0,  0,  "in",   
"arg_3","varchar",  0,  0,  "in",   "arg_4",
"varchar",  0,  0,  "in",   "arg_5","varchar",  0,  
0,  "in",   "arg_6","varchar",  0,  0,  "in",   
"arg_7","varchar",  0,  0,  "in",   "arg_8",
"bigint",   64, 0,  "in",   "arg_9","bigint",   64, 
0,  "in",   "arg_10",   "int",  32, 0,  

MonetDB: default - Merged statistics-analytics into default

2020-01-29 Thread Pedro Ferreira
Changeset: 7d51b712842e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d51b712842e
Added Files:
sql/test/analytics/Tests/analytics14.sql
sql/test/analytics/Tests/analytics14.stable.err
sql/test/analytics/Tests/analytics14.stable.out
sql/test/analytics/Tests/analytics15.sql
sql/test/analytics/Tests/analytics15.stable.err
sql/test/analytics/Tests/analytics15.stable.out
sql/test/analytics/Tests/analytics16.sql
sql/test/analytics/Tests/analytics16.stable.err
sql/test/analytics/Tests/analytics16.stable.out
sql/test/analytics/Tests/analytics17.sql
sql/test/analytics/Tests/analytics17.stable.err
sql/test/analytics/Tests/analytics17.stable.out
Removed Files:
sql/backends/monet5/sql_aggr_bte.mal
sql/backends/monet5/sql_aggr_dbl.mal
sql/backends/monet5/sql_aggr_flt.mal
sql/backends/monet5/sql_aggr_hge.mal
sql/backends/monet5/sql_aggr_int.mal
sql/backends/monet5/sql_aggr_lng.mal
sql/backends/monet5/sql_aggr_sht.mal
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mhelp.c
gdk/gdk_aggr.c
gdk/gdk_analytic.h
gdk/gdk_analytic_func.c
gdk/gdk_calc.h
gdk/gdk_string.c
monetdb5/modules/kernel/00_aggr_hge.mal
monetdb5/modules/kernel/00_aggr_hge.mal.sh
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/mal/calc.c
sql/backends/monet5/Makefile.ag
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_gencode.h
sql/backends/monet5/sql_hge.mal
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_rank.h
sql/backends/monet5/sql_rank.mal
sql/backends/monet5/sql_rank.mal.sh
sql/backends/monet5/sql_rank_hge.mal
sql/backends/monet5/sql_rank_hge.mal.sh
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_upgrades.c
sql/benchmarks/tpcds/Tests/47.stable.out
sql/benchmarks/tpcds/Tests/47.stable.out.int128
sql/benchmarks/tpcds/Tests/53.stable.out
sql/benchmarks/tpcds/Tests/53.stable.out.int128
sql/benchmarks/tpcds/Tests/57.stable.out
sql/benchmarks/tpcds/Tests/57.stable.out.int128
sql/benchmarks/tpcds/Tests/63.stable.out
sql/benchmarks/tpcds/Tests/63.stable.out.int128
sql/benchmarks/tpcds/Tests/89.stable.out
sql/benchmarks/tpcds/Tests/89.stable.out.int128
sql/common/sql_types.c
sql/common/sql_types.h
sql/include/sql_catalog.h
sql/scripts/39_analytics.sql
sql/scripts/39_analytics_hge.sql
sql/scripts/51_sys_schema_extension.sql
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_propagate.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_select.h
sql/server/rel_sequence.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/server/sql_semantic.c
sql/storage/store.c
sql/test/BugTracker-2010/Tests/sum_on_date_crash.Bug-2643.stable.err
sql/test/BugTracker-2012/Tests/create_function.Bug-3172.stable.err

sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err
sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.sql
sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.err
sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.stable.out
sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out
sql/test/BugTracker-2016/Tests/isaUUID_function.Bug-3997.stable.err
sql/test/BugTracker-2017/Tests/corr_coersion.Bug-6287.stable.out
sql/test/Tests/comment-on.stable.err
sql/test/analytics/Tests/All
sql/test/analytics/Tests/analytics00.stable.out
sql/test/analytics/Tests/analytics01.sql
sql/test/analytics/Tests/analytics01.stable.err
sql/test/analytics/Tests/analytics01.stable.out
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/group-concat/Tests/groupconcat05.sql
sql/test/group-concat/Tests/groupconcat05.stable.out

MonetDB: default - Merged with linear-hashing

2020-01-29 Thread Pedro Ferreira
Changeset: 3f102989da46 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3f102989da46
Removed Files:

sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.timeout
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/kernel/alarm.mal
sql/backends/monet5/sql_upgrades.c
sql/benchmarks/tpcds/Tests/79.sql
sql/benchmarks/tpcds/Tests/79.stable.out
sql/benchmarks/tpcds/Tests/79.stable.out.int128
sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql

sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.stable.err

sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.stable.out

sql/test/BugTracker-2009/Tests/union_where_combined.SF-2887282.stable.out

sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: default
Log Message:

Merged with linear-hashing


diffs (truncated from 593 to 300 lines):

diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -760,10 +760,6 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:dbl], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:dbl], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:dbl], 
s:bat[:oid], nil_matches:bit):bat[:bit] ",  "CMDbatNE;","Return B1 != 
B2 with candidates list"  ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], 
b2:bat[:flt]):bat[:bit] ","CMDbatNE;","Return B1 != B2"   ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:flt], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:flt], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:flt], 
s:bat[:oid], nil_matches:bit):bat[:bit] ",  "CMDbatNE;","Return B1 != 
B2 with candidates list"  ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], 
b2:bat[:int]):bat[:bit] ","CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:int], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:int], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
@@ -788,10 +784,6 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:flt], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:flt], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:flt], 
s:bat[:oid], nil_matches:bit):bat[:bit] ",  "CMDbatNE;","Return B1 != 
B2 with candidates list"  ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], 
b2:bat[:int]):bat[:bit] ","CMDbatNE;","Return B1 != B2"   ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:int], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:int], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:int], 
s:bat[:oid], nil_matches:bit):bat[:bit] ",  "CMDbatNE;","Return B1 != 
B2 with candidates list"  ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], 
b2:bat[:lng]):bat[:bit] ","CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:lng], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:lng], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
@@ -908,10 +900,6 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "!=",   "pattern batcalc.!=(b:bat[:flt], v:dbl, 
nil_matches:bit):bat[:bit] ",   

MonetDB: linear-hashing - Backported sleep procedure/function in...

2020-01-29 Thread Pedro Ferreira
Changeset: fc0ca64a3128 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc0ca64a3128
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/kernel/alarm.c
monetdb5/modules/kernel/alarm.mal
sql/ChangeLog
sql/backends/monet5/sql_upgrades.c
sql/scripts/25_debug.sql
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: linear-hashing
Log Message:

Backported sleep procedure/function into linear-hashing


diffs (truncated from 372 to 300 lines):

diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -532,7 +532,9 @@ stdout of test 'MAL-signatures` in direc
 [ "aggr",  "variancep","command aggr.variancep(b:bat[:any_2]):dbl ",   
"ALGvariancep;","Gives the variance of all tail values" ]
 [ "alarm", "ctime","unsafe command alarm.ctime():str ",
"ALARMctime;",  "Return the current time as a C-time string."   ]
 [ "alarm", "epoch","unsafe command alarm.epoch():int ",
"ALARMepoch;",  "Return time since Jan 1, 1970 in seconds." ]
-[ "alarm", "sleep","unsafe command alarm.sleep(secs:int):void ",   
"ALARMsleep;",  "Sleep a few seconds"   ]
+[ "alarm", "sleep","unsafe pattern 
alarm.sleep(msecs:bat[:int]):bat[:int] ",   "ALARMsleep;",  "Sleep a few 
milliseconds and return the slept value"   ]
+[ "alarm", "sleep","unsafe pattern alarm.sleep(msecs:int):int ",   
"ALARMsleep;",  "Sleep a few milliseconds and return the slept value"   ]
+[ "alarm", "sleep","unsafe pattern alarm.sleep(msecs:int):void ",  
"ALARMsleep;",  "Sleep a few milliseconds"  ]
 [ "alarm", "time", "unsafe command alarm.time():int ", "ALARMtime;",   
"Return time since program start in milliseconds."  ]
 [ "alarm", "usec", "unsafe command alarm.usec():lng ", "ALARMusec;",   
"Return time since Jan 1, 1970 in microseconds."]
 [ "algebra",   "antijoin", "function algebra.antijoin(l:bat[:any_1], 
r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng) 
(X_0:bat[:oid], X_1:bat[:oid]);",   "", ""  ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128 
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -636,7 +636,9 @@ stdout of test 'MAL-signatures` in direc
 [ "aggr",  "variancep","command aggr.variancep(b:bat[:any_2]):dbl ",   
"ALGvariancep;","Gives the variance of all tail values" ]
 [ "alarm", "ctime","unsafe command alarm.ctime():str ",
"ALARMctime;",  "Return the current time as a C-time string."   ]
 [ "alarm", "epoch","unsafe command alarm.epoch():int ",
"ALARMepoch;",  "Return time since Jan 1, 1970 in seconds." ]
-[ "alarm", "sleep","unsafe command alarm.sleep(secs:int):void ",   
"ALARMsleep;",  "Sleep a few seconds"   ]
+[ "alarm", "sleep","unsafe pattern 
alarm.sleep(msecs:bat[:int]):bat[:int] ",   "ALARMsleep;",  "Sleep a few 
milliseconds and return the slept value"   ]
+[ "alarm", "sleep","unsafe pattern alarm.sleep(msecs:int):int ",   
"ALARMsleep;",  "Sleep a few milliseconds and return the slept value"   ]
+[ "alarm", "sleep","unsafe pattern alarm.sleep(msecs:int):void ",  
"ALARMsleep;",  "Sleep a few milliseconds"  ]
 [ "alarm", "time", "unsafe command alarm.time():int ", "ALARMtime;",   
"Return time since program start in milliseconds."  ]
 [ "alarm", "usec", "unsafe command alarm.usec():lng ", "ALARMusec;",   
"Return time since Jan 1, 1970 in microseconds."]
 [ "algebra",   "antijoin", "function algebra.antijoin(l:bat[:any_1], 
r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng) 
(X_0:bat[:oid], X_1:bat[:oid]);",   "", ""  ]
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
@@ -707,7 +707,7 @@ str AGGRvariance3_dbl(bat *retval, const
 str AGGRvariancep3_dbl(bat *retval, const bat *bid, const bat *gid, const bat 
*eid);
 str ALARMctime(str *res);
 str ALARMepoch(int *res);
-str ALARMsleep(void *res, int *secs);
+str ALARMsleep(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str ALARMtime(int *res);
 str ALARMusec(lng *ret);
 str ALGbandjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat 
*slid, const bat 

MonetDB: linear-hashing - Approved MAL-signatures on 32-bit

2020-01-29 Thread Pedro Ferreira
Changeset: ab3900a2a837 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab3900a2a837
Modified Files:
clients/Tests/MAL-signatures.stable.out
Branch: linear-hashing
Log Message:

Approved MAL-signatures on 32-bit


diffs (truncated from 351 to 300 lines):

diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -758,10 +758,6 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:dbl], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:dbl], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:dbl], 
s:bat[:oid], nil_matches:bit):bat[:bit] ",  "CMDbatNE;","Return B1 != 
B2 with candidates list"  ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], 
b2:bat[:flt]):bat[:bit] ","CMDbatNE;","Return B1 != B2"   ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:flt], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:flt], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:flt], 
s:bat[:oid], nil_matches:bit):bat[:bit] ",  "CMDbatNE;","Return B1 != 
B2 with candidates list"  ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], 
b2:bat[:int]):bat[:bit] ","CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:int], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:flt], b2:bat[:int], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
@@ -786,10 +782,6 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:flt], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:flt], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:flt], 
s:bat[:oid], nil_matches:bit):bat[:bit] ",  "CMDbatNE;","Return B1 != 
B2 with candidates list"  ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], 
b2:bat[:int]):bat[:bit] ","CMDbatNE;","Return B1 != B2"   ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:int], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:int], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:int], 
s:bat[:oid], nil_matches:bit):bat[:bit] ",  "CMDbatNE;","Return B1 != 
B2 with candidates list"  ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], 
b2:bat[:lng]):bat[:bit] ","CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:lng], 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B1 != B2"   ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b1:bat[:int], b2:bat[:lng], 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B1 != B2 with 
candidates list"  ]
@@ -906,10 +898,6 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "!=",   "pattern batcalc.!=(b:bat[:flt], v:dbl, 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B != V" ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b:bat[:flt], v:dbl, 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B != V with candidates 
list"]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b:bat[:flt], v:dbl, s:bat[:oid], 
nil_matches:bit):bat[:bit] ",  "CMDbatNE;","Return B != V with 
candidates list"]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b:bat[:flt], v:flt):bat[:bit] ",
"CMDbatNE;","Return B != V" ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b:bat[:flt], v:flt, 
nil_matches:bit):bat[:bit] ",   "CMDbatNE;","Return B != V" ]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b:bat[:flt], v:flt, 
s:bat[:oid]):bat[:bit] ",   "CMDbatNE;","Return B != V with candidates 
list"]
-[ "batcalc",   "!=",   "pattern batcalc.!=(b:bat[:flt], v:flt, s:bat[:oid], 
nil_matches:bit):bat[:bit] ",  "CMDbatNE;","Return B != V with 
candidates list"]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b:bat[:flt], v:int):bat[:bit] ",
"CMDbatNE;","Return B != V" ]
 [ "batcalc",   "!=",   "pattern batcalc.!=(b:bat[:flt], v:int, 

MonetDB: linear-hashing - Added another order by column for tpc-...

2020-01-29 Thread Pedro Ferreira
Changeset: d3d83c351adf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d3d83c351adf
Modified Files:
sql/benchmarks/tpcds/Tests/79.sql
sql/benchmarks/tpcds/Tests/79.stable.out
sql/benchmarks/tpcds/Tests/79.stable.out.int128

sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
Branch: linear-hashing
Log Message:

Added another order by column for tpc-ds query 79, because in the previous 
output two rows had the same sorting keys which caused the order to be undefined


diffs (50 lines):

diff --git a/sql/benchmarks/tpcds/Tests/79.sql 
b/sql/benchmarks/tpcds/Tests/79.sql
--- a/sql/benchmarks/tpcds/Tests/79.sql
+++ b/sql/benchmarks/tpcds/Tests/79.sql
@@ -34,6 +34,7 @@ WHERE ss_customer_sk = c_customer_sk
 ORDER BY c_last_name,
  c_first_name,
  SUBSTRING(s_city,1,30),
- profit
+ profit,
+ ss_ticket_number
 LIMIT 100;
 
diff --git a/sql/benchmarks/tpcds/Tests/79.stable.out 
b/sql/benchmarks/tpcds/Tests/79.stable.out
--- a/sql/benchmarks/tpcds/Tests/79.stable.out
+++ b/sql/benchmarks/tpcds/Tests/79.stable.out
@@ -63,8 +63,8 @@ stdout of test '79` in directory 'sql/be
 [ NULL,NULL,   "Fairview", 66717,  1521.09,-2431.95
]
 [ NULL,NULL,   "Fairview", 198542, 1082.91,-1789.20
]
 [ NULL,NULL,   "Fairview", 7153,   9.96,   -984.62 ]
+[ NULL,NULL,   "Midway",   103268, 0.00,   NULL]
 [ NULL,NULL,   "Midway",   113867, NULL,   NULL]
-[ NULL,NULL,   "Midway",   103268, 0.00,   NULL]
 [ NULL,NULL,   "Midway",   9441,   1109.31,-26407.61   
]
 [ NULL,NULL,   "Midway",   24453,  3762.75,-23692.00   
]
 [ NULL,NULL,   "Midway",   2018,   29.76,  -22410.59   ]
diff --git a/sql/benchmarks/tpcds/Tests/79.stable.out.int128 
b/sql/benchmarks/tpcds/Tests/79.stable.out.int128
--- a/sql/benchmarks/tpcds/Tests/79.stable.out.int128
+++ b/sql/benchmarks/tpcds/Tests/79.stable.out.int128
@@ -63,8 +63,8 @@ stdout of test '79` in directory 'sql/be
 [ NULL,NULL,   "Fairview", 66717,  1521.09,-2431.95
]
 [ NULL,NULL,   "Fairview", 198542, 1082.91,-1789.20
]
 [ NULL,NULL,   "Fairview", 7153,   9.96,   -984.62 ]
+[ NULL,NULL,   "Midway",   103268, 0.00,   NULL]
 [ NULL,NULL,   "Midway",   113867, NULL,   NULL]
-[ NULL,NULL,   "Midway",   103268, 0.00,   NULL]
 [ NULL,NULL,   "Midway",   9441,   1109.31,-26407.61   
]
 [ NULL,NULL,   "Midway",   24453,  3762.75,-23692.00   
]
 [ NULL,NULL,   "Midway",   2018,   29.76,  -22410.59   ]
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
@@ -97,7 +97,7 @@ project (
 project (
 | group by (
 | | table(sys.sorted) [ "sorted"."a", "sorted"."b" ] COUNT 
-| ) [ "sorted"."b", "sorted"."a" ] [ "sorted"."b", "sorted"."a" ]
+| ) [ "sorted"."a", "sorted"."b" ] [ "sorted"."b", "sorted"."a" ]
 ) [ "sorted"."a", "sorted"."b" ]
 #drop table unsorted;
 #drop table sorted;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


MonetDB: linear-hashing - Merge with Nov2019

2020-01-29 Thread Pedro Ferreira
Changeset: 038838b9b556 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=038838b9b556
Removed Files:

sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.timeout
Modified Files:
sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql

sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.stable.err

sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.stable.out

sql/test/BugTracker-2009/Tests/union_where_combined.SF-2887282.stable.out
Branch: linear-hashing
Log Message:

Merge with Nov2019


diffs (192 lines):

diff --git 
a/sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql 
b/sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql
--- a/sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql
+++ b/sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql
@@ -1,2 +1,2 @@
 
-select 
1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+
 
1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 
+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+
 
1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 

MonetDB: Nov2019 - Reapproved tests

2020-01-29 Thread Pedro Ferreira
Changeset: 463abbdd5aae for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=463abbdd5aae
Removed Files:

sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.timeout
Modified Files:
sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql

sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.stable.err

sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.stable.out

sql/test/BugTracker-2009/Tests/union_where_combined.SF-2887282.stable.out
Branch: Nov2019
Log Message:

Reapproved tests


diffs (275 lines):

diff --git 
a/sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql 
b/sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql
--- a/sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql
+++ b/sql/test/BugTracker-2008/Tests/too_many_nested_operators.SF-2102167.sql
@@ -1,2 +1,2 @@
 
-select 
1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+
 
1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 
+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+
 
1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1