MonetDB: analytics - Implemented analytical sum in a floating-po...

2018-08-15 Thread Pedro Ferreira 
Changeset: 9c297e31d281 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c297e31d281
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_analytic.c
gdk/gdk_calc_private.h
sql/common/sql_types.c
sql/test/analytics/Tests/analytics00.sql
sql/test/analytics/Tests/analytics00.stable.out
Branch: analytics
Log Message:

Implemented analytical sum in a floating-point window.


diffs (truncated from 367 to 300 lines):

diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -178,7 +178,7 @@ exchange(double *x, double *y)
 }
 
 /* this function was adapted from https://bugs.python.org/file10357/msum4.py */
-static BUN
+BUN
 dofsum(const void *restrict values, oid seqb, BUN start, BUN end,
void *restrict results, BUN ngrp, int tp1, int tp2,
const oid *restrict cand, const oid *candend, const oid *restrict gids,
diff --git a/gdk/gdk_analytic.c b/gdk/gdk_analytic.c
--- a/gdk/gdk_analytic.c
+++ b/gdk/gdk_analytic.c
@@ -9,6 +9,7 @@
 #include "monetdb_config.h"
 #include "gdk.h"
 #include "gdk_analytic.h"
+#include "gdk_calc_private.h"
 
 #define ANALYTICAL_LIMIT_IMP(TPE, OP)\
do { \
@@ -242,20 +243,20 @@ ANALYTICAL_LIMIT(max, MAX, <)
 #define ANALYTICAL_SUM_IMP(TPE1, TPE2)  \
do {\
TPE1 *bp;   \
-   TPE2 *rp, *rb, curval;  \
+   TPE2 *rp, *rb, curval = TPE2##_nil; \
bp = (TPE1*)Tloc(b, 0); \
rb = rp = (TPE2*)Tloc(r, 0);\
-   curval = TPE2##_nil;\
if (p) {\
if (o) {
\
np = (bit*)Tloc(p, 0);  
\
for(i=0; ihttps://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Updated and approved test for "system" column...

2018-08-15 Thread Sjoerd Mullender 
Changeset: 7485ebc35341 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7485ebc35341
Modified Files:
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql

sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
Branch: default
Log Message:

Updated and approved test for "system" column in sys.functions table.
Also make use of "system" column in sys.schemas table.


diffs (66 lines):

diff --git 
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql 
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
--- a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
+++ b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
@@ -23,9 +23,8 @@ SELECT * FROM sys.functions WHERE type N
 SELECT * FROM sys.functions WHERE language NOT IN (SELECT language_id FROM 
sys.function_languages);
 -- SELECT * FROM sys.functions WHERE language NOT IN (0,1,2,3,4,5,6,7);  -- 
old check before table sys.function_languages existed
 
-SELECT * FROM sys.systemfunctions WHERE function_id NOT IN (SELECT id FROM 
sys.functions);
--- systemfunctions should refer only to functions in MonetDB system schemas 
(on Dec2016 these are: sys, json, profiler and bam)
-SELECT * FROM sys.systemfunctions WHERE function_id NOT IN (SELECT id FROM 
sys.functions WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name IN 
('sys','json','profiler','bam')));
+-- system functions should refer only to functions in MonetDB system schemas 
(on Dec2016 these are: sys, json, profiler and bam)
+SELECT * FROM sys.functions WHERE system AND schema_id NOT IN (SELECT id FROM 
sys.schemas WHERE system);
 
 SELECT * FROM sys.args WHERE func_id NOT IN (SELECT id FROM sys.functions);
 SELECT * FROM sys.args WHERE type NOT IN (SELECT sqlname FROM sys.types);
diff --git 
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out 
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
--- 
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
+++ 
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
@@ -95,30 +95,25 @@ Ready.
 % int, varchar,varchar,int,int,int,varchar,
boolean,int,varchar # type
 % 1,   0,  0,  1,  1,  1,  0,  5,  1,  0 # 
length
 #SELECT * FROM sys.functions WHERE schema_id NOT IN (SELECT id FROM 
sys.schemas);
-% sys.functions,   sys.functions,  sys.functions,  sys.functions,  
sys.functions,  sys.functions,  sys.functions,  sys.functions,  sys.functions,  
sys.functions # table_name
-% id,  name,   func,   mod,language,   type,   side_effect,varres, 
vararg, schema_id # name
-% int, varchar,varchar,varchar,int,int,
boolean,boolean,boolean,int # type
-% 1,   0,  0,  0,  1,  1,  5,  5,  5,  1 # 
length
+% sys.functions,   sys.functions,  sys.functions,  sys.functions,  
sys.functions,  sys.functions,  sys.functions,  sys.functions,  sys.functions,  
sys.functions,  sys.functions # table_name
+% id,  name,   func,   mod,language,   type,   side_effect,varres, 
vararg, schema_id,  system # name
+% int, varchar,varchar,varchar,int,int,
boolean,boolean,boolean,int,boolean # type
+% 1,   0,  0,  0,  1,  1,  5,  5,  5,  1,  
5 # length
 #SELECT * FROM sys.functions WHERE type NOT IN (SELECT function_type_id FROM 
sys.function_types);
-% sys.functions,   sys.functions,  sys.functions,  sys.functions,  
sys.functions,  sys.functions,  sys.functions,  sys.functions,  sys.functions,  
sys.functions # table_name
-% id,  name,   func,   mod,language,   type,   side_effect,varres, 
vararg, schema_id # name
-% int, varchar,varchar,varchar,int,int,
boolean,boolean,boolean,int # type
-% 1,   0,  0,  0,  1,  1,  5,  5,  5,  1 # 
length
+% sys.functions,   sys.functions,  sys.functions,  sys.functions,  
sys.functions,  sys.functions,  sys.functions,  sys.functions,  sys.functions,  
sys.functions,  sys.functions # table_name
+% id,  name,   func,   mod,language,   type,   side_effect,varres, 
vararg, schema_id,  system # name
+% int, varchar,varchar,varchar,int,int,
boolean,boolean,boolean,int,boolean # type
+% 1,   0,  0,  0,  1,  1,  5,  5,  5,  1,  
5 # length
 #SELECT * FROM sys.functions WHERE language NOT IN (SELECT language_id FROM 
sys.function_languages);
-% sys.functions,   sys.functions,  sys.functions,  sys.functions,  
sys.functions,  sys.functions,  sys.functions,  sys.functions,  sys.functions,  
sys.functions #

MonetDB: default - Use bool instead of int in a lot of places wh...

2018-08-15 Thread Sjoerd Mullender 
Changeset: 10c76364286c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10c76364286c
Modified Files:
clients/Tests/exports.stable.out
common/stream/stream.c
common/stream/stream.h
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc.h
gdk/gdk_heap.c
gdk/gdk_join.c
gdk/gdk_select.c
gdk/gdk_tm.c
gdk/gdk_utils.c
gdk/gdk_utils.h
monetdb5/extras/rapi/rapi.c
monetdb5/extras/rapi/rapi.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_runtime.c
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/wlc.c
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_utils.c
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: default
Log Message:

Use bool instead of int in a lot of places where it makes sense.


diffs (truncated from 2110 to 300 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -22,41 +22,41 @@ atomDesc BATatoms[];
 BAT *BATattach(int tt, const char *heapfile, int role);
 gdk_return BATbandjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, 
const void *c1, const void *c2, bool li, bool hi, BUN estimate) 
__attribute__((__warn_unused_result__));
 BAT *BATcalcabsolute(BAT *b, BAT *s);
-BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error);
-BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, int 
abort_on_error);
+BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error);
+BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool 
abort_on_error);
 BAT *BATcalcand(BAT *b1, BAT *b2, BAT *s);
 BAT *BATcalcandcst(BAT *b, const ValRecord *v, BAT *s);
 gdk_return BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals);
-BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, int sym);
-BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, int 
sym);
-BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, int 
sym);
-BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi, 
BAT *s, int sym);
+BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, bool sym);
+BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, bool 
sym);
+BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, bool 
sym);
+BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi, 
BAT *s, bool sym);
 BAT *BATcalccmp(BAT *b1, BAT *b2, BAT *s);
 BAT *BATcalccmpcst(BAT *b, const ValRecord *v, BAT *s);
-BAT *BATcalccstadd(const ValRecord *v, BAT *b, BAT *s, int tp, int 
abort_on_error);
+BAT *BATcalccstadd(const ValRecord *v, BAT *b, BAT *s, int tp, bool 
abort_on_error);
 BAT *BATcalccstand(const ValRecord *v, BAT *b, BAT *s);
 BAT *BATcalccstcmp(const ValRecord *v, BAT *b, BAT *s);
-BAT *BATcalccstdiv(const ValRecord *v, BAT *b, BAT *s, int tp, int 
abort_on_error);
+BAT *BATcalccstdiv(const ValRecord *v, BAT *b, BAT *s, int tp, bool 
abort_on_error);
 BAT *BATcalccsteq(const ValRecord *v, BAT *b, BAT *s);
 BAT *BATcalccstge(const ValRecord *v, BAT *b, BAT *s);
 BAT *BATcalccstgt(const ValRecord *v, BAT *b, BAT *s);
 BAT *BATcalccstle(const ValRecord *v, BAT *b, BAT *s);
-BAT *BATcalccstlsh(const ValRecord *v, BAT *b, BAT *s, int abort_on_error);
+BAT *BATcalccstlsh(const ValRecord *v, BAT *b, BAT *s, bool abort_on_error);
 BAT *BATcalccstlt(const ValRecord *v, BAT *b, BAT *s);
 BAT *BATcalccstmax(const ValRecord *v, BAT *b, BAT *s);
 BAT *BATcalccstmax_no_nil(const ValRecord *v, BAT *b, BAT *s);
 BAT *BATcalccstmin(const ValRecord *v, BAT *b, BAT *s);
 BAT *BATcalccstmin_no_nil(const ValRecord *v, BAT *b, BAT *s);
-BAT *BATcalccstmod(const ValRecord *v, BAT *b, BAT *s, int tp, int 
abort_on_error);
-BAT *BATcalccstmul(const ValRecord *v, BAT *b, BAT *s, int tp, int 
abort_on_error);
+BAT *BATcalccstmod(const ValRecord *v, BAT *b, BAT *s, int tp, bool 
abort_on_error);
+BAT *BATcalccstmul(const ValRecord *v, BAT *b, BAT *s, int tp, bool 
abort_on_error);
 BAT *BATcalccstne(const ValRecord *v, BAT *b, BAT *s);
 BAT *BATcalccstor(const ValRecord *v, BAT *b, BAT *s);
-BAT *BATcalccstrsh(const ValRecord *v, BAT *b, BAT *s, int

MonetDB: candidate-type - Merge with default branch.

2018-08-15 Thread Sjoerd Mullender 
-geom=%{?with_geos:yes}%{!?with_geos:no} \
-   --enable-instrument=no \
--enable-int128=%{?with_int128:yes}%{!?with_int128:no} \
--enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \
--enable-mapi=yes \
@@ -969,7 +958,6 @@ fi
--enable-netcdf=no \
--enable-odbc=yes \
--enable-optimize=no \
-   --enable-profile=no \

--enable-pyintegration=%{?with_pyintegration:yes}%{!?with_pyintegration:no} \

--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
--enable-shp=no \
@@ -1044,6 +1032,224 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Aug 15 2018 Sjoerd Mullender  - 11.31.1-20180815
+- Rebuilt.
+- BZ#4020: Importing timestamp with zone from copy into
+- BZ#6564: Changes to the Remote Table definition
+- BZ#6575: Sqlitelogictest crash on groupby query with coalesce call
+- BZ#6579: Sqlitelogic test infinite loop while compiling SQL query
+- BZ#6586: Sqlitelogictest crash on complex aggregation query
+- BZ#6593: Poor performance with like operator and escape clause
+- BZ#6596: Multicolumn aggregation very slow after ANALYZE when persistent
+  hashes are enabled
+- BZ#6605: Sqlitelogictest set queries with wrong results
+- BZ#6610: Sqlitelogictest algebra.rangejoin undefined
+- BZ#6611: Cannot compile with GCC 8.1 and --enable-debug=no
+- BZ#6612: Implement BLOB handling in python UDFs
+- BZ#6614: JDBC 2.35/2.36 throws NullPointerException on getObject(int i)
+  on Timestamp column
+- BZ#6615: JDBC 2.35 returns "false" for Boolean NULL
+- BZ#6616: JDBC 2.35 returns minint (-2147483648) for int NULL
+- BZ#6618: dependency column on sequence violated by DROP SEQUENCE
+- BZ#6621: SELECT FROM REMOTE TABLE WHERE <> returns wrong results
+- BZ#6624: "Cannot use non GROUP BY column in query results without an
+  aggregate function" when using aggregate function in both HAVING and
+  ORDER BY clauses.
+- BZ#6625: OR in subselect causes the server to crash with segmentation
+  fault
+- BZ#6627: stddev_pop inconsistent behaviour
+- BZ#6628: User cannot insert into own local temporary table
+- BZ#6629: CREATE TABLE IF NOT EXISTS returns 42000!
+- BZ#6630: Sqlitelogictest cast NULL to integer failing
+- BZ#6632: Dataflow causes crash when THRnew fails
+- BZ#6633: ILIKE clauses don't work on certain characters
+- BZ#6635: monetdbd exits due to "Too many open files" error
+- BZ#6637: Within a transaction, d after an error causes mclient to exit
+- BZ#6638: (sequences of) mkey.bulk_rotate_xor_hash() can generate NIL
+  from non-NIL making multi-col joins return wrong results
+
+* Thu Aug  2 2018 Martin van Dinther  
- 11.31.1-20180815
+- clients: ODBC SQLGetInfo now returns a positive numeric value for InfoTypes:
+  SQL_MAX_COLUMN_NAME_LEN, SQL_MAX_DRIVER_CONNECTIONS,
+  SQL_MAX_IDENTIFIER_LEN, SQL_MAX_PROCEDURE_NAME_LEN,
+  SQL_MAX_SCHEMA_NAME_LEN, SQL_MAX_TABLE_NAME_LEN and
+  SQL_MAX_USER_NAME_LEN.
+
+* Mon Jul 30 2018 Sjoerd Mullender  - 11.31.1-20180815
+- gdk: Hash indexes are now persistent across server restarts.
+- gdk: The macros bunfastapp and tfastins and variants no longer set the dirty
+  flag of the heap they write to.  This now needs to be done separately
+  (and preferably outside of the inner loop).
+
+* Fri Jul 27 2018 Sjoerd Mullender  - 11.31.1-20180815
+- gdk: Removed batDirty flag from BAT record.  Its function is completely
+  superseded by batDirtydesc and the dirty flags on the various heaps.
+
+* Tue Jul 24 2018 Sjoerd Mullender  - 11.31.1-20180815
+- clients: ODBC: Implemented SQL_ATTR_QUERY_TIMEOUT parameter in 
SQLSetStmtAttr.
+
+* Tue Jul 24 2018 Sjoerd Mullender  - 11.31.1-20180815
+- gdk: Removed "masksize" argument of function BAThash.
+
+* Thu Jun  7 2018 Martin van Dinther  
- 11.31.1-20180815
+- sql: Removed deprecated table producing system functions:
+  sys.dependencies_columns_on_functions()
+  sys.dependencies_columns_on_indexes()
+  sys.dependencies_columns_on_keys()
+  sys.dependencies_columns_on_triggers()
+  sys.dependencies_columns_on_views()
+  sys.dependencies_functions_on_functions()
+  sys.dependencies_functions_on_triggers()
+  sys.dependencies_keys_on_foreignkeys()
+  sys.dependencies_owners_on_schemas()
+  sys.dependencies_schemas_on_users()
+  sys.dependencies_tables_on_foreignkeys()
+  sys.dependencies_tables_on_functions()
+  sys.dependencies_tables_on_indexes()
+  sys.dependencies_tables_on_triggers()
+  sys.dependencies_tables_on_views()
+  sys.dependencies_views_on_functions()
+  sys.dependencies_views_on_triggers()
+  They are replaced by new system dependency_* views:
+  sys.dependency_args_on_types
+  sys.dependency_columns_on_functions
+  sys.dependency_columns_on_indexes
+  sys.dependency_columns_on_keys
+  sys.dependency_columns_on_procedures
+  sys.dependency_columns_on_triggers
+  sys.dependency_columns_on_types
+  sys.dependency_columns_on_views
+  sys.dependency_functions_on_funct

MonetDB: default - Merge heads.

2018-08-15 Thread Sjoerd Mullender 
Changeset: c3923b578a3c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c3923b578a3c
Modified Files:
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
Branch: default
Log Message:

Merge heads.


diffs (truncated from 10537 to 300 lines):

diff --git 
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -53,5244 +53,5242 @@ insert into sys.types values (29, 'wkba'
 insert into sys.types values (30, 'mbr', 'mbr', 0, 0, 0, 16, 2000);
 delete from sys.functions where id < 2000;
 delete from sys.args where func_id not in (select id from sys.functions);
-insert into sys.functions values (31, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 
1, false, false, false, 2000);
-insert into sys.args values (18532, 31, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18533, 31, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18534, 31, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 
1, false, false, false, 2000);
-insert into sys.args values (18535, 32, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18536, 32, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18537, 32, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (33, 'mbr_above', 'mbrAbove', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18538, 33, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18539, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18540, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (34, 'mbr_above', 'mbrAbove', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18541, 34, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18542, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18543, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (35, 'mbr_below', 'mbrBelow', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18544, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18545, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18546, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (36, 'mbr_below', 'mbrBelow', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18547, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18548, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18549, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (37, 'mbr_right', 'mbrRight', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18550, 37, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18551, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18552, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (38, 'mbr_right', 'mbrRight', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18553, 38, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18554, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18555, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (39, 'mbr_left', 'mbrLeft', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18556, 39, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18557, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18558, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (40, 'mbr_left', 'mbrLeft', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18559, 40, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18560, 40, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18561, 40, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (41, 'mbr_overlap_or_above', 
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000);
-insert into sys.args values (18562, 41, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18563, 41, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18564, 41, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (42, 'mbr_overlap_or_above', 
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000);
-insert into sys.args values (18565, 42, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18566, 42, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18567, 42, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (43, 'mbr_overlap_or_below', 
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000);
-insert into sys.args values (18568, 43,

MonetDB: default - Merge with Aug2018 branch, not changing any f...

2018-08-15 Thread Sjoerd Mullender 
Changeset: c971c44c4970 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c971c44c4970
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:

Merge with Aug2018 branch, not changing any files..

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

MonetDB: Aug2018 - Post release build.

2018-08-15 Thread Sjoerd Mullender 
Changeset: d7df890ae991 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d7df890ae991
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Aug2018
Log Message:

Post release build.


diffs (229 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.31.1
+%define version 11.31.2
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # groups of related archs
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -642,7 +642,7 @@
 #define MONETDB5_PASSWDHASH_TOKEN SHA512
 
 /* Release name or "unreleased" */
-#define MONETDB_RELEASE "Aug2018"
+#define MONETDB_RELEASE "unreleased"
 
 /* Define if you do not want assertions */
 /* #undef NDEBUG */
@@ -666,7 +666,7 @@
 #define PACKAGE_URL "https://www.monetdb.org/;
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "11.31.1"
+#define PACKAGE_VERSION "11.31.2"
 
 /* Path separator */
 #define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
 #
 # Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
 
-VERSION=11.31.1
+VERSION=11.31.2
 #   ^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact monetdb-develop...@lists.sourceforge.net for details and/or 
assistance.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 VERSIONINFO
-  FILEVERSION 11,31,1,1
-  PRODUCTVERSION 11,31,1,1
+  FILEVERSION 11,31,2,1
+  PRODUCTVERSION 11,31,2,1
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB Application Interface DLL\0"
-  VALUE "FileVersion", "11.31.1\0"
+  VALUE "FileVersion", "11.31.2\0"
   //
   // Maintained via vertoo. Please don't modify by hand!
   // Contact monetdb-develop...@lists.sourceforge.net for details and/or 
assistance.
@@ -28,7 +28,7 @@ BEGIN
   VALUE "OriginalFilename", "Mapi.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB Client Libraries\0"
-  VALUE "ProductVersion", "11.31.1\0"
+  VALUE "ProductVersion", "11.31.2\0"
   //   
   // Maintained via vertoo. Please don't modify by hand!
   // Contact monetdb-develop...@lists.sourceforge.net for details and/or 
assistance.
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -3,8 +3,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 VERSIONINFO
-  FILEVERSION 11,31,1,1
-  PRODUCTVERSION 11,31,1,1
+  FILEVERSION 11,31,2,1
+  PRODUCTVERSION 11,31,2,1
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
-  VALUE "FileVersion", "11.31.1\0"
+  VALUE "FileVersion", "11.31.2\0"
   //
   // Maintained via vertoo. Please don't modify by hand!
   // Contact monetdb-develop...@lists.sourceforge.net for details and/or 
assistance.
@@ -28,7 +28,7 @@ BEGIN
   VALUE "OriginalFilename", "libMonetODBC.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB SQL Server\0"
-  VALUE "ProductVersion", "11.31.1\0"
+  VALUE "ProductVersion", "11.31.2\0"
   //   
   // Maintained via vertoo. Please don't modify by hand!
   // Contact monetdb-develop...@lists.sourceforge.net for details and/or 
assistance.
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -62,8 +62,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,31,1,1
- PRODUCTVERSION 11,31,1,1
+ FILEVERSION 11,31,2,1
+ PRODUCTVERSION 11,31,2,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
 BEGIN
 VALUE "CompanyName", "MonetDB B.V."
 VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", "11.31.1"
+VALUE "FileVersion", "11.31.2"
 VALUE "InternalName", "libMonetODBCs.dll"
 VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018"
 VALUE "OriginalFilename", "libMonetODBCs.dll"
 VALUE

MonetDB: default - Merge with Aug2018 branch.

2018-08-15 Thread Sjoerd Mullender 
Changeset: 95fa137f8814 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=95fa137f8814
Added Files:
debian/libmonetdb17.install
Removed Files:
ChangeLog.Mar2018
buildtools/ChangeLog.Mar2018
clients/ChangeLog.Mar2018
clients/mapilib/ChangeLog.Mar2018
common/stream/ChangeLog.Mar2018
common/utils/ChangeLog.Mar2018
debian/libmonetdb16.install
gdk/ChangeLog.Mar2018
geom/ChangeLog.Mar2018
monetdb5/ChangeLog.Mar2018
sql/ChangeLog.Mar2018
testing/ChangeLog.Mar2018
tools/merovingian/ChangeLog.Mar2018
Modified Files:
.hgtags
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
clients/ChangeLog-Archive
clients/ChangeLog.Aug2018
common/stream/ChangeLog-Archive
common/stream/ChangeLog.Aug2018
debian/changelog
debian/control
gdk/ChangeLog-Archive
gdk/ChangeLog.Aug2018
libversions
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Aug2018
sql/ChangeLog-Archive
sql/ChangeLog.Aug2018
testing/ChangeLog-Archive
testing/ChangeLog.Aug2018
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Aug2018
Branch: default
Log Message:

Merge with Aug2018 branch.


diffs (truncated from 951 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -701,3 +701,5 @@ e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b
 ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_SP1_release
 e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b Mar2018_SP1_release
 44182a802530768278cf750fd93c829acdde29f1 Aug2018_root
+9c824ea44063e239b7251dce71f9af741c682211 Aug2018_1
+9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release
diff --git a/ChangeLog.Mar2018 b/ChangeLog.Mar2018
deleted file mode 100644
--- a/ChangeLog.Mar2018
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for devel
-# This file is updated with Maddlog
-
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV 
 Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Mar2018-SP1/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Aug2018/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 # we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1032,6 +1032,171 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Aug 15 2018 Sjoerd Mullender  - 11.31.1-20180815
+- Rebuilt.
+- BZ#4020: Importing timestamp with zone from copy into
+- BZ#6564: Changes to the Remote Table definition
+- BZ#6575: Sqlitelogictest crash on groupby query with coalesce call
+- BZ#6579: Sqlitelogic test infinite loop while compiling SQL query
+- BZ#6586: Sqlitelogictest crash on complex aggregation query
+- BZ#6593: Poor performance with like operator and escape clause
+- BZ#6596: Multicolumn aggregation very slow after ANALYZE when persistent
+  hashes are enabled
+- BZ#6605: Sqlitelogictest set queries with wrong results
+- BZ#6610: Sqlitelogictest algebra.rangejoin undefined
+- BZ#6611: Cannot compile with GCC 8.1 and --enable-debug=no
+- BZ#6612: Implement BLOB handling in python UDFs
+- BZ#6614: JDBC 2.35/2.36 throws NullPointerException on getObject(int i)
+  on Timestamp column
+- BZ#6615: JDBC 2.35 returns "false" for Boolean NULL
+- BZ#6616: JDBC 2.35 returns minint (-2147483648) for int NULL
+- BZ#6618: dependency column on sequence violated by DROP SEQUENCE
+- BZ#6621: SELECT FROM REMOTE TABLE WHERE <> returns wrong results
+- BZ#6624: "Cannot use non GROUP BY column in query results without an
+  aggregate function" when using aggregate function in both HAVING and
+  ORDER BY clauses.
+- BZ#6625: OR in subselect causes the server to crash with segmentation
+  fault
+- BZ#6627: stddev_pop inconsistent behaviour
+- BZ#6628: User cannot insert into own local temporary table
+- BZ#6629: CREATE TABLE IF NOT EXISTS returns 42000!
+- BZ#6630: Sqlitelogictest cast NULL to integer failing
+- BZ#6632: Dataflow causes crash when THRnew fails
+- BZ#6633: ILIKE clauses don't work on certain characters
+- BZ#6635: monetdbd exits due to "Too many open files" error
+- BZ#6637: Within a transaction, d after an error causes mclient to exit
+- BZ#6638: (sequences of) mkey.bulk_rotate_xor_hash() can generate NIL
+  from non-NIL making multi-col joins return wrong results
+
+* Thu Aug  2 2018 Martin van Dinther  
- 11.31.1-20180815
+- clients: ODBC SQLGetInfo now returns a positive numeric value for InfoTypes:
+  SQL_MAX_COLUMN_NAME_LEN, SQL_MAX_DRIVER_CONNECTIONS,
+  SQL_MAX_IDENTIFIER_LEN, SQL_MAX_PROCEDURE_NAME_LEN,
+  SQL_MAX_SCHEMA_NAME_LEN, SQL_MAX_TABLE_NAME_LEN and
+  SQL_MAX_USER_NAME_LEN.
+
+* Mon Jul 30 2018 Sjoerd Mullender  - 11.31.1-20180815
+-

MonetDB: Aug2018 - Setting tags Aug2018_1 and Aug2018 for the re...

2018-08-15 Thread Sjoerd Mullender 
Changeset: 86c556fbc59e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86c556fbc59e
Modified Files:
.hgtags
Branch: Aug2018
Log Message:

Setting tags Aug2018_1 and Aug2018 for the release build.


diffs (9 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -701,3 +701,5 @@ e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b
 ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_SP1_release
 e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b Mar2018_SP1_release
 44182a802530768278cf750fd93c829acdde29f1 Aug2018_root
+9c824ea44063e239b7251dce71f9af741c682211 Aug2018_1
+9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Aug2018 - Moved contents of ChangeLog.Mar2018 and Chang...

2018-08-15 Thread Sjoerd Mullender 
Changeset: 9c824ea44063 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c824ea44063
Removed Files:
ChangeLog.Mar2018
buildtools/ChangeLog.Mar2018
clients/ChangeLog.Mar2018
clients/mapilib/ChangeLog.Mar2018
common/stream/ChangeLog.Mar2018
common/utils/ChangeLog.Mar2018
gdk/ChangeLog.Mar2018
geom/ChangeLog.Mar2018
monetdb5/ChangeLog.Mar2018
sql/ChangeLog.Mar2018
testing/ChangeLog.Mar2018
tools/merovingian/ChangeLog.Mar2018
Modified Files:
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
clients/ChangeLog-Archive
clients/ChangeLog.Aug2018
common/stream/ChangeLog-Archive
common/stream/ChangeLog.Aug2018
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Aug2018
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Aug2018
sql/ChangeLog-Archive
sql/ChangeLog.Aug2018
testing/ChangeLog-Archive
testing/ChangeLog.Aug2018
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Aug2018
Branch: Aug2018
Log Message:

Moved contents of ChangeLog.Mar2018 and ChangeLog.Aug2018 to MonetDB.spec, 
debian/changelog and ChangeLog-Archive.


diffs (truncated from 897 to 300 lines):

diff --git a/ChangeLog.Mar2018 b/ChangeLog.Mar2018
deleted file mode 100644
--- a/ChangeLog.Mar2018
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for devel
-# This file is updated with Maddlog
-
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV 
 Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Mar2018-SP1/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Aug2018/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 # we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1032,6 +1032,171 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Aug 15 2018 Sjoerd Mullender  - 11.31.1-20180815
+- Rebuilt.
+- BZ#4020: Importing timestamp with zone from copy into
+- BZ#6564: Changes to the Remote Table definition
+- BZ#6575: Sqlitelogictest crash on groupby query with coalesce call
+- BZ#6579: Sqlitelogic test infinite loop while compiling SQL query
+- BZ#6586: Sqlitelogictest crash on complex aggregation query
+- BZ#6593: Poor performance with like operator and escape clause
+- BZ#6596: Multicolumn aggregation very slow after ANALYZE when persistent
+  hashes are enabled
+- BZ#6605: Sqlitelogictest set queries with wrong results
+- BZ#6610: Sqlitelogictest algebra.rangejoin undefined
+- BZ#6611: Cannot compile with GCC 8.1 and --enable-debug=no
+- BZ#6612: Implement BLOB handling in python UDFs
+- BZ#6614: JDBC 2.35/2.36 throws NullPointerException on getObject(int i)
+  on Timestamp column
+- BZ#6615: JDBC 2.35 returns "false" for Boolean NULL
+- BZ#6616: JDBC 2.35 returns minint (-2147483648) for int NULL
+- BZ#6618: dependency column on sequence violated by DROP SEQUENCE
+- BZ#6621: SELECT FROM REMOTE TABLE WHERE <> returns wrong results
+- BZ#6624: "Cannot use non GROUP BY column in query results without an
+  aggregate function" when using aggregate function in both HAVING and
+  ORDER BY clauses.
+- BZ#6625: OR in subselect causes the server to crash with segmentation
+  fault
+- BZ#6627: stddev_pop inconsistent behaviour
+- BZ#6628: User cannot insert into own local temporary table
+- BZ#6629: CREATE TABLE IF NOT EXISTS returns 42000!
+- BZ#6630: Sqlitelogictest cast NULL to integer failing
+- BZ#6632: Dataflow causes crash when THRnew fails
+- BZ#6633: ILIKE clauses don't work on certain characters
+- BZ#6635: monetdbd exits due to "Too many open files" error
+- BZ#6637: Within a transaction, d after an error causes mclient to exit
+- BZ#6638: (sequences of) mkey.bulk_rotate_xor_hash() can generate NIL
+  from non-NIL making multi-col joins return wrong results
+
+* Thu Aug  2 2018 Martin van Dinther  
- 11.31.1-20180815
+- clients: ODBC SQLGetInfo now returns a positive numeric value for InfoTypes:
+  SQL_MAX_COLUMN_NAME_LEN, SQL_MAX_DRIVER_CONNECTIONS,
+  SQL_MAX_IDENTIFIER_LEN, SQL_MAX_PROCEDURE_NAME_LEN,
+  SQL_MAX_SCHEMA_NAME_LEN, SQL_MAX_TABLE_NAME_LEN and
+  SQL_MAX_USER_NAME_LEN.
+
+* Mon Jul 30 2018 Sjoerd Mullender  - 11.31.1-20180815
+- gdk: Hash indexes are now persistent across server restarts.
+- gdk: The macros bunfastapp and tfastins and variants no longer set the dirty
+  flag of the heap they write to.  This now needs to be done separately
+  (and preferably outside of the inner loop).
+
+* Fri Jul 27 2018 Sjoerd Mullender  - 11.31.1-20180815
+- gdk: Removed batDirty flag from BAT record.  Its function is completely
+  superseded by batDirtydesc and the dirty flags on the various heaps.
+

MonetDB: Aug2018 - Updated library versions.

2018-08-15 Thread Sjoerd Mullender 
Changeset: 72315da603ff for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72315da603ff
Added Files:
debian/libmonetdb17.install
Removed Files:
debian/libmonetdb16.install
Modified Files:
debian/control
libversions
Branch: Aug2018
Log Message:

Updated library versions.


diffs (45 lines):

diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 5), autotoo
 Standards-Version: 3.8.0
 X-Python-Version: >= 2.6
 
-Package: libmonetdb16
+Package: libmonetdb17
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libmonetdb5-server-geom (<< ${source:Version})
@@ -32,7 +32,7 @@ Description: MonetDB core library
 Package: libmonetdb-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libatomic-ops-dev,
- libmonetdb16, libmonetdb-stream-dev
+ libmonetdb17, libmonetdb-stream-dev
 Description: MonetDB development files
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
diff --git a/debian/libmonetdb16.install b/debian/libmonetdb17.install
rename from debian/libmonetdb16.install
rename to debian/libmonetdb17.install
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
-GDK_VERSION=16:2:0
+GDK_VERSION=17:0:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
-MAPI_VERSION=10:1:0
+MAPI_VERSION=11:0:1
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=24:3:0
+MONETDB5_VERSION=25:0:0
 
 # version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=11:1:0
+STREAM_VERSION=12:0:1
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Aug2018 branch, not changing any f...

2018-08-15 Thread Sjoerd Mullender 
Changeset: 6d92992820d5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d92992820d5
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:

Merge with Aug2018 branch, not changing any files.

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

MonetDB: Aug2018 - Pre-release version number update.

2018-08-15 Thread Sjoerd Mullender 
Changeset: 4497ad63242a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4497ad63242a
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Aug2018
Log Message:

Pre-release version number update.


diffs (228 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.31.0
+%define version 11.31.1
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # groups of related archs
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -642,7 +642,7 @@
 #define MONETDB5_PASSWDHASH_TOKEN SHA512
 
 /* Release name or "unreleased" */
-#define MONETDB_RELEASE "unreleased"
+#define MONETDB_RELEASE "Aug2018"
 
 /* Define if you do not want assertions */
 /* #undef NDEBUG */
@@ -666,7 +666,7 @@
 #define PACKAGE_URL "https://www.monetdb.org/;
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "11.31.0"
+#define PACKAGE_VERSION "11.31.1"
 
 /* Path separator */
 #define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
 #
 # Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
 
-VERSION=11.31.0
+VERSION=11.31.1
 #   ^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact monetdb-develop...@lists.sourceforge.net for details and/or 
assistance.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 VERSIONINFO
-  FILEVERSION 11,31,0,1
-  PRODUCTVERSION 11,31,0,1
+  FILEVERSION 11,31,1,1
+  PRODUCTVERSION 11,31,1,1
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB Application Interface DLL\0"
-  VALUE "FileVersion", "11.31.0\0"
+  VALUE "FileVersion", "11.31.1\0"
   //
   // Maintained via vertoo. Please don't modify by hand!
   // Contact monetdb-develop...@lists.sourceforge.net for details and/or 
assistance.
@@ -28,7 +28,7 @@ BEGIN
   VALUE "OriginalFilename", "Mapi.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB Client Libraries\0"
-  VALUE "ProductVersion", "11.31.0\0"
+  VALUE "ProductVersion", "11.31.1\0"
   //   
   // Maintained via vertoo. Please don't modify by hand!
   // Contact monetdb-develop...@lists.sourceforge.net for details and/or 
assistance.
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -3,8 +3,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 VERSIONINFO
-  FILEVERSION 11,31,0,1
-  PRODUCTVERSION 11,31,0,1
+  FILEVERSION 11,31,1,1
+  PRODUCTVERSION 11,31,1,1
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
-  VALUE "FileVersion", "11.31.0\0"
+  VALUE "FileVersion", "11.31.1\0"
   //
   // Maintained via vertoo. Please don't modify by hand!
   // Contact monetdb-develop...@lists.sourceforge.net for details and/or 
assistance.
@@ -28,7 +28,7 @@ BEGIN
   VALUE "OriginalFilename", "libMonetODBC.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB SQL Server\0"
-  VALUE "ProductVersion", "11.31.0\0"
+  VALUE "ProductVersion", "11.31.1\0"
   //   
   // Maintained via vertoo. Please don't modify by hand!
   // Contact monetdb-develop...@lists.sourceforge.net for details and/or 
assistance.
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -62,8 +62,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,31,0,1
- PRODUCTVERSION 11,31,0,1
+ FILEVERSION 11,31,1,1
+ PRODUCTVERSION 11,31,1,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
 BEGIN
 VALUE "CompanyName", "MonetDB B.V."
 VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", "11.31.0"
+VALUE "FileVersion", "11.31.1"
 VALUE "InternalName", "libMonetODBCs.dll"
 VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018"
 VALUE "OriginalFilename", "libMonetODBCs.dll"

MonetDB: analytics - Merge with default

2018-08-15 Thread Pedro Ferreira 
Changeset: 904f2e10388d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=904f2e10388d
Modified Files:
clients/mapiclient/mclient.c
gdk/gdk_project.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_session.c
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_jit.c
monetdb5/optimizer/opt_macro.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_transaction.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/wlr.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/test/BugTracker-2009/Tests/rollback_bug.stable.err

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

sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out
sql/test/BugTracker/Tests/crash_on_fkey_update2.SF-1703497.stable.err
sql/test/Tests/All
sql/test/bugs/Tests/savepoint_rollback-bug-sf-953553.stable.err
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
testing/Mtest.py.in
Branch: analytics
Log Message:

Merge with default


diffs (truncated from 11804 to 300 lines):

diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -404,7 +404,7 @@ utf8strlenmax(char *s, char *e, size_t m
 * /usr/share/unicode/emoji/emoji-data.txt
 * and code points marked either F or
 * W in EastAsianWidth.txt; this list
-* is up-to-date with Unicode 9.0 */
+* is up-to-date with Unicode 11.0 */
if ((0x1100 <= c && c <= 0x115F) ||
(0x231A <= c && c <= 0x231B) ||
(0x2329 <= c && c <= 0x232A) ||
@@ -447,7 +447,7 @@ utf8strlenmax(char *s, char *e, size_t m
(0x3000 <= c && c <= 0x303E) ||
(0x3041 <= c && c <= 0x3096) ||
(0x3099 <= c && c <= 0x30FF) ||
-   (0x3105 <= c && c <= 0x312D) ||
+   (0x3105 <= c && c <= 0x312F) ||
(0x3131 <= c && c <= 0x318E) ||
(0x3190 <= c && c <= 0x31BA) ||
(0x31C0 <= c && c <= 0x31E3) ||
@@ -466,19 +466,20 @@ utf8strlenmax(char *s, char *e, size_t m
(0xFE68 <= c && c <= 0xFE6B) ||
(0xFF01 <= c && c <= 0xFF60) ||
(0xFFE0 <= c && c <= 0xFFE6) ||
-   c == 0x16FE0 ||
-   (0x17000 <= c && c <= 0x187EC) ||
+   (0x16FE0 <= c && c <= 0x16FE1) ||
+   (0x17000 <= c && c <= 0x187F1) ||
(0x18800 <= c && c <= 0x18AF2) ||
-   (0x1B000 <= c && c <= 0x1B001) ||
+   (0x1B000 <= c && c <= 0x1B11E) ||
+   (0x1B170 <= c && c <= 0x1B2FB) ||
c == 0x1F004 ||
c == 0x1F0CF ||
c == 0x1F18E ||
(0x1F191 <= c && c <= 0x1F19A) ||
-   /* removed 0x1F1E6..0x1F1FF */
(0x1F200 <= c && c <= 0x1F202) ||
(0x1F210 <= c && c <= 0x1F23B) ||
(0x1F240 <= c && c <= 0x1F248) ||
(0x1F250 <= c && c <= 0x1F251) ||
+   (0x1F260 <= c && c <= 0x1F265) ||
(0x1F300 <= c && c <= 0x1F320) ||
(0x1F32D <= c && c <= 0x1F335) ||
(0x1F337 <= c && c <= 0x1F37C) ||
@@ -501,15 +502,15 @@ utf8strlenmax(char *s, char *e, size_t m
c == 0x1F6CC ||
(0x1F6D0 <= c && c <= 0x1F6D2) ||
(0x1F6EB <= c && c <= 0x1F6EC) ||
-   (0x1F6F4 <= c && c <= 0x1F6F6) ||
-   (0x1F910 <= c && c <= 0x1F91E) ||
-   (0x1F920 <= c && c <= 0x1F927) ||
-   c == 0x1F930 ||
-   (0x1F933 <= c && c <= 0x1F93E) ||
-

MonetDB: analytics - First implementation for sum analytical fun...

2018-08-15 Thread Pedro Ferreira 
Changeset: 1bdd5b492adc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1bdd5b492adc
Added Files:
gdk/gdk_analytic.c
gdk/gdk_analytic.h
sql/backends/monet5/sql_rank.mal.sh
sql/backends/monet5/sql_rank_hge.mal
sql/backends/monet5/sql_rank_hge.mal.sh
Modified Files:
gdk/Makefile.ag
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_rank.h
sql/backends/monet5/sql_rank.mal
sql/common/sql_types.c
sql/test/analytics/Tests/analytics00.sql
sql/test/analytics/Tests/analytics00.stable.out
Branch: analytics
Log Message:

First implementation for sum analytical function over a window. Also moved 
analytical functions implementation to the GDK layer.

Still missing floating-point sum implementation, it's complex :(


diffs (truncated from 1432 to 300 lines):

diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -34,6 +34,7 @@ lib_gdk = {
gdk_unique.c \
gdk_interprocess.c gdk_interprocess.h \
gdk_firstn.c \
+   gdk_analytic.c gdk_analytic.h \
libbat.rc
LIBS = ../common/options/libmoptions \
../common/utils/libmutils \
@@ -52,6 +53,7 @@ headers_h = {
HEADERS = h
SOURCES = \
gdk.h \
+   gdk_analytic.h \
gdk_atomic.h \
gdk_atoms.h \
gdk_bbp.h \
diff --git a/gdk/gdk_analytic.c b/gdk/gdk_analytic.c
new file mode 100644
--- /dev/null
+++ b/gdk/gdk_analytic.c
@@ -0,0 +1,441 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0.  If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
+ */
+
+#include "monetdb_config.h"
+#include "gdk.h"
+#include "gdk_analytic.h"
+
+#define ANALYTICAL_LIMIT_IMP(TPE, OP)\
+   do { \
+   TPE *rp, *rb, *bp, curval;   \
+   rb = rp = (TPE*)Tloc(r, 0);  \
+   bp = (TPE*)Tloc(b, 0);   \
+   curval = *bp;\
+   if (p) { \
+   if (o) { \
+   np = (bit*)Tloc(p, 0);   \
+   for(i=0; itnonil = !has_nils;  
\
+   r->tnil = has_nils; 
\
+   return gdk_res; 
\
+}
+
+ANALYTICAL_LIMIT(min, MIN, >)
+ANALYTICAL_LIMIT(max, MAX, <)
+
+#undef ANALYTICAL_LIMIT
+#undef ANALYTICAL_LIMIT_IMP_HUGE
+#undef ANALYTICAL_LIMIT_IMP
+
+#define ANALYTICAL_ADD_WITH_CHECK(lft, rgt, TPE2, dst, max, on_overflow) \
+   do {\
+   if ((rgt) < 1) {\
+   if (-(max) - (rgt) > (lft)) {   \
+   on_overflow;\
+   } else {\
+   (dst) = (TPE2) (lft) + (rgt);   \
+   }   \
+   } else {\
+   if ((max) - (rgt) < (lft)) {\
+   on_overflow;\
+   } else {\
+   (dst) = (TPE2) (lft) + (rgt);   \
+   }   \
+   }   \
+   } while (0);
+
+#define ANALYTICAL_SUM_IMP(TPE1, TPE2)  \
+   do {\
+   TPE1 *bp;   \
+   TPE2 *rp, *rb, curval;  \
+   bp = (TPE1*)Tloc(b, 0); \
+   rb = rp = (TPE2*)Tloc(r, 0);\
+   curval = TPE2##_nil;\
+   if (p) {\
+   if (o) {
\
+

MonetDB: default - Approved.

2018-08-15 Thread Sjoerd Mullender 
Changeset: 40a5e9651cfc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40a5e9651cfc
Modified Files:
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
Branch: default
Log Message:

Approved.


diffs (truncated from 10537 to 300 lines):

diff --git 
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -53,5244 +53,5242 @@ insert into sys.types values (29, 'wkba'
 insert into sys.types values (30, 'mbr', 'mbr', 0, 0, 0, 16, 2000);
 delete from sys.functions where id < 2000;
 delete from sys.args where func_id not in (select id from sys.functions);
-insert into sys.functions values (31, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 
1, false, false, false, 2000);
-insert into sys.args values (18532, 31, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18533, 31, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18534, 31, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 
1, false, false, false, 2000);
-insert into sys.args values (18535, 32, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18536, 32, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18537, 32, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (33, 'mbr_above', 'mbrAbove', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18538, 33, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18539, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18540, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (34, 'mbr_above', 'mbrAbove', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18541, 34, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18542, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18543, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (35, 'mbr_below', 'mbrBelow', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18544, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18545, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18546, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (36, 'mbr_below', 'mbrBelow', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18547, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18548, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18549, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (37, 'mbr_right', 'mbrRight', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18550, 37, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18551, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18552, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (38, 'mbr_right', 'mbrRight', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18553, 38, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18554, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18555, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (39, 'mbr_left', 'mbrLeft', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18556, 39, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18557, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18558, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (40, 'mbr_left', 'mbrLeft', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18559, 40, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18560, 40, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18561, 40, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (41, 'mbr_overlap_or_above', 
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000);
-insert into sys.args values (18562, 41, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18563, 41, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18564, 41, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (42, 'mbr_overlap_or_above', 
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000);
-insert into sys.args values (18565, 42, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18566, 42, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18567, 42, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (43, 'mbr_overlap_or_below', 
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000);
-insert into sys.args values (18568, 43,

MonetDB: default - Merge with Aug2018 branch.

2018-08-15 Thread Sjoerd Mullender 
Changeset: 1897d55de6c6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1897d55de6c6
Modified Files:
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_statement.c

sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out
sql/test/Tests/All
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
testing/Mtest.py.in
Branch: default
Log Message:

Merge with Aug2018 branch.


diffs (truncated from 9464 to 300 lines):

diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1607,6 +1607,7 @@ rel2bin_hash_lookup(backend *be, sql_rel
sql_exp *l = e->l;
stmt *idx = bin_find_column(be, left, l->l, sa_strconcat(sql->sa, "%", 
i->base.name));
int swap_exp = 0, swap_rel = 0;
+   comp_type comp = cmp_equal;
 
if (!idx) {
swap_exp = 1;
@@ -1647,6 +1648,7 @@ rel2bin_hash_lookup(backend *be, sql_rel
 
h = stmt_Nop(be, stmt_list(be, list_append( list_append(
list_append(sa_list(sql->sa), h), bits), s)), 
xor);
+   comp = cmp_equal_nil;
} else {
sql_subfunc *hf = sql_bind_func_result(sql->sa, 
sql->session->schema, "hash", tail_type(s), NULL, lng);
 
@@ -1655,12 +1657,12 @@ rel2bin_hash_lookup(backend *be, sql_rel
}
if (h && h->nrcols) {
if (!swap_rel) {
-   return stmt_join(be, idx, h, 0, cmp_equal);
+   return stmt_join(be, idx, h, 0, comp);
} else {
-   return stmt_join(be, h, idx, 0, cmp_equal);
+   return stmt_join(be, h, idx, 0, comp);
}
} else {
-   return stmt_uselect(be, idx, h, cmp_equal, NULL, 0);
+   return stmt_uselect(be, idx, h, comp, NULL, 0);
}
 }
 
@@ -1714,7 +1716,7 @@ releqjoin( backend *be, list *l1, list *
} else { /* need hash */
l = join_hash_key(be, l1);
r = join_hash_key(be, l2);
-   res = stmt_join(be, l, r, 0, cmp_op);
+   res = stmt_join(be, l, r, 0, cmp_op == cmp_equal ? 
cmp_equal_nil : cmp_op);
}
if (need_left) 
res->flag = cmp_left;
@@ -3117,7 +3119,7 @@ insert_check_ukey(backend *be, list *ins
if (s->key && s->nrcols == 0) {
s = NULL;
if (k->idx && hash_index(k->idx->type))
-   s = stmt_uselect(be, stmt_idx(be, k->idx, 
dels), idx_inserts, cmp_equal, s, 0);
+   s = stmt_uselect(be, stmt_idx(be, k->idx, 
dels), idx_inserts, cmp_equal_nil, s, 0);
for (m = k->columns->h; m; m = m->next) {
sql_kc *c = m->data;
stmt *cs = list_fetch(inserts, c->c->colnr); 
diff --git a/sql/backends/monet5/sql_statement.c 
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -1404,6 +1404,7 @@ stmt_uselect(backend *be, stmt *op1, stm
 
switch (cmptype) {
case cmp_equal:
+   case cmp_equal_nil:
op = "=";
break;
case cmp_notequal:
@@ -1443,35 +1444,47 @@ stmt_uselect(backend *be, stmt *op1, stm
k = getDestVar(q);
} else {
assert (cmptype != cmp_filter);
-   q = newStmt(mb, algebraRef, thetaselectRef);
-   q = pushArgument(mb, q, l);
-   if (sub)
-   q = pushArgument(mb, q, sub->nr);
-   q = pushArgument(mb, q, r);
-   switch (cmptype) {
-   case cmp_equal:
-   q = pushStr(mb, q, anti?"!=":"==");
-   break;
-   case cmp_notequal:
-   q = pushStr(mb, q, anti?"==":"!=");
-   break;
-   case cmp_lt:
-   q = pushStr(mb, q, anti?">=":"<");
-   break;
-   case cmp_lte:
-   q = pushStr(mb, q, anti?">":"<=");
-   break;
-   case cmp_gt:
-   q = pushStr(mb, q, anti?"<=":">");
-   break;
-   case cmp_gte:
-   q = pushStr(mb, q, anti?"<":">=");
-   break;
-   default:
-   showException(GDKout, SQL, "sql", "SQL2MAL: error 
impossible select compare\n");
-   if (q)
-   freeInstruction(q);
-   q = NULL;
+   if (cmptype == cmp_equal_nil) {
+   q =

MonetDB: Aug2018 - Approved.

2018-08-15 Thread Sjoerd Mullender 
Changeset: c495a64dab0d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c495a64dab0d
Modified Files:
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
Branch: Aug2018
Log Message:

Approved.


diffs (truncated from 9123 to 300 lines):

diff --git 
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -54,5241 +54,5241 @@ insert into sys.types values (30, 'mbr',
 delete from sys.functions where id < 2000;
 delete from sys.args where func_id not in (select id from sys.functions);
 insert into sys.functions values (31, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 
1, false, false, false, 2000);
-insert into sys.args values (18511, 31, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18512, 31, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18513, 31, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18532, 31, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18533, 31, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18534, 31, 'arg_2', 'geometry', 0, 0, 1, 2);
 insert into sys.functions values (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 
1, false, false, false, 2000);
-insert into sys.args values (18514, 32, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18515, 32, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18516, 32, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18535, 32, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18536, 32, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18537, 32, 'arg_2', 'mbr', 0, 0, 1, 2);
 insert into sys.functions values (33, 'mbr_above', 'mbrAbove', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18517, 33, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18518, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18519, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18538, 33, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18539, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18540, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
 insert into sys.functions values (34, 'mbr_above', 'mbrAbove', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18520, 34, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18521, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18522, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18541, 34, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18542, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18543, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
 insert into sys.functions values (35, 'mbr_below', 'mbrBelow', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18523, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18524, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18525, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18544, 35, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18545, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18546, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
 insert into sys.functions values (36, 'mbr_below', 'mbrBelow', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18526, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18527, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18528, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18547, 36, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18548, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18549, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
 insert into sys.functions values (37, 'mbr_right', 'mbrRight', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18529, 37, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18530, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18531, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18550, 37, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18551, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18552, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
 insert into sys.functions values (38, 'mbr_right', 'mbrRight', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18532, 38, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18533, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18534, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18553, 38,

MonetDB: Aug2018 - Added test conditionals.

2018-08-15 Thread Sjoerd Mullender 
Changeset: ad418d2d66cc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad418d2d66cc
Modified Files:
sql/test/Tests/All
testing/Mtest.py.in
Branch: Aug2018
Log Message:

Added test conditionals.


diffs (23 lines):

diff --git a/sql/test/Tests/All b/sql/test/Tests/All
--- a/sql/test/Tests/All
+++ b/sql/test/Tests/All
@@ -117,7 +117,7 @@ str-trim
 alastair_udf_mergetable_bug
 
 copy-into-fwf
-copy-from-compressed
+HAVE_LIBZ_LIBBZ2_LIBLZMA?copy-from-compressed
 
 truncate-statements
 truncate-statements-extra
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -374,6 +374,7 @@ CONDITIONALS = {
 'HAVE_HGE' : "@HAVE_HGE_FALSE@",
 'HAVE_LIBBZ2'  : "@HAVE_LIBBZ2_FALSE@",
 'HAVE_LIBLZ4'  : "@HAVE_LIBLZ4_FALSE@",
+'HAVE_LIBLZMA' : "@HAVE_LIBLZMA_FALSE@",
 'HAVE_LIBR': "@HAVE_LIBR_FALSE@",
 'HAVE_LIBPY'   : "@HAVE_LIBPY_FALSE@",
 'HAVE_LIBPY3'  : "@HAVE_LIBPY3_FALSE@",
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list