subject:"MonetDB\: analytics \- Merge with default."

MonetDB: analytics - Merge with default.

2018-11-23 Thread Pedro Ferreira

Changeset: 940455578dfc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=940455578dfc
Added Files:
sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.sql

sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.err

sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.out
sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.py

sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.err

sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out

sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.stable.err

sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.stable.out

sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.stable.err

sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.stable.out
sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.sql
sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.stable.err
sql/test/BugTracker-2018/Tests/quantile-crash.Bug-6658.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.out.int128
sql/test/testdb-reload/Tests/All
sql/test/testdb-reload/Tests/reload.py
sql/test/testdb-reload/Tests/reload.stable.err
sql/test/testdb-reload/Tests/reload.stable.out
sql/test/testdb-reload/Tests/reload.timeout
sql/test/testdb/Tests/dump-nogeom.reqtests
sql/test/testdb/Tests/dump-nogeom.sql
sql/test/testdb/Tests/dump-nogeom.stable.err
sql/test/testdb/Tests/dump-nogeom.stable.out
sql/test/testdb/Tests/dump.reqtests
sql/test/testdb/Tests/dump.sql
sql/test/testdb/Tests/dump.stable.err
sql/test/testdb/Tests/dump.stable.out
sql/test/testdb/Tests/dump.timeout
sql/test/testdb/Tests/load-geom.reqtests
sql/test/testdb/Tests/load-geom.sql
sql/test/testdb/Tests/load-geom.stable.err
sql/test/testdb/Tests/load-geom.stable.out
sql/test/testdb/Tests/load.sql
sql/test/testdb/Tests/load.stable.err
sql/test/testdb/Tests/load.stable.out
sql/test/testdb/Tests/load.timeout
sql/test/testdb/Tests/package-hge.py
sql/test/testdb/Tests/package-hge.stable.err
sql/test/testdb/Tests/package-hge.stable.out.int128
sql/test/testdb/Tests/package.py
sql/test/testdb/Tests/package.reqtests
sql/test/testdb/Tests/package.stable.err
sql/test/testdb/Tests/package.stable.out
Removed Files:
sql/test/testdb/Tests/testdb-dump.reqtests
sql/test/testdb/Tests/testdb-dump.sql
sql/test/testdb/Tests/testdb-dump.stable.err
sql/test/testdb/Tests/testdb-dump.stable.out
sql/test/testdb/Tests/testdb-dump.timeout
sql/test/testdb/Tests/testdb-load.sql
sql/test/testdb/Tests/testdb-load.stable.err
sql/test/testdb/Tests/testdb-load.stable.out
sql/test/testdb/Tests/testdb-load.timeout
sql/test/testdb/Tests/testdb-package-hge.py
sql/test/testdb/Tests/testdb-package-hge.stable.err
sql/test/testdb/Tests/testdb-package-hge.stable.out.int128
sql/test/testdb/Tests/testdb-package.py
sql/test/testdb/Tests/testdb-package.reqtests
sql/test/testdb/Tests/testdb-package.stable.err
sql/test/testdb/Tests/testdb-package.stable.out
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
clients/mapiclient/msqldump.c
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_atoms.c
gdk/gdk_atoms.h
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_private.h
gdk/gdk_storage.c
gdk/gdk_string.c
gdk/gdk_system.c
gdk/gdk_utils.c
gdk/gdk_value.c
geom/monetdb5/geom.c
geom/monetdb5/geom.h
geom/sql/conformance/Tests/T13.stable.out
geom/sql/conformance/Tests/T14.stable.out
geom/sql/conformance/Tests/T17.stable.out
geom/sql/conformance/Tests/T18.stable.out
geom/sql/conformance/Tests/T23.stable.out
geom/sql/conformance/Tests/T24.stable.out
geom/sql/conformance/Tests/T27.stable.out
geom/sql/conformance/Tests/T29.stable.out
geom/sql/conformance/Tests/T31.stable.out
geom/sql/conformance/Tests/T34.stable.out
geom/sql/conformance/Tests/T47.stable.out
geom/sql/conformance/Tests/T48.stable.out
geom/sql/conformance/Tests/T49.stable.out
geom/sql/conformance/Tests/T50.stable.out
geom/sql/conformance/Tests/T52.stable.out
geom/sql/conformance/Tests/T8.stable.out

MonetDB: analytics - Merge with default.

2018-11-13 Thread Pedro Ferreira

Changeset: 170de76f8f26 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=170de76f8f26
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
gdk/gdk_calc.c
monetdb5/ChangeLog

monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/mal/Tests/tst1502.malC
monetdb5/mal/Tests/tst233.malC
monetdb5/mal/Tests/tst234.malC
monetdb5/mal/Tests/tst235.malC
monetdb5/mal/Tests/tst903.malC
monetdb5/mal/Tests/tst903.stable.out
monetdb5/modules/atoms/Tests/xml10.malC
monetdb5/modules/kernel/Tests/select.malC
monetdb5/modules/kernel/Tests/time01.malC
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/mal/Tests/inspect05.malC
monetdb5/modules/mal/Tests/orderidx00.malC
monetdb5/modules/mal/Tests/orderidx04.malC
monetdb5/modules/mal/Tests/pqueue.malC
monetdb5/modules/mal/Tests/pqueue2.malC
monetdb5/modules/mal/Tests/pqueue3.malC
monetdb5/optimizer/Tests/DCexample2.malC
monetdb5/optimizer/Tests/reorder00.malC
monetdb5/optimizer/Tests/reorder00.stable.out
monetdb5/optimizer/Tests/tst4700.malC
sql/ChangeLog
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/include/sql_catalog.h
sql/include/sql_relation.h
sql/scripts/75_storagemodel.sql
sql/server/rel_dump.c
sql/server/rel_sequence.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/storage/store.c

sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows

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

sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.stable.out
sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part1.stable.out

sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.sql
sql/test/BugTracker-2016/Tests/storagemodel.stable.out

sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.stable.out

sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Dependencies/Tests/dependency_loop.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out.int128

sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.out

sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.out

sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out

sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out

sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out

sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
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/mergetables/Tests/sqlsmith-apply-outer-join-or.sql
sql/test/orderidx/Tests/simpletable.stable.out
sql/test/orderidx/Tests/simpletable.stable.out.32bit
sql/test/orderidx/Tests/smalltable.stable.out
sql/test/orderidx/Tests/smalltable.stable.out.32bit
sql/test/pg_regress/Tests/vacuum.stable.out
sql/test/pg_regress/Tests/without_oid.stable.out
sql/test/pg_regress/Tests/without_oid.stable.out.32bit
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql

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

Merge with default.


diffs (truncated from 6349 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
@@ -527,12 +527,12 @@

MonetDB: analytics - Merge with default.

2018-10-30 Thread Pedro Ferreira

Changeset: 037390a38e40 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=037390a38e40
Added Files:
gdk/gdk_string.c
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/Tests/mclient--help.stable.err.Windows
clients/mapiclient/mclient.1
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/odbc/driver/ODBCError.c
configure.ag
gdk/ChangeLog
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_calc.h
gdk/gdk_hash.h
gdk/gdk_logger.c
gdk/gdk_private.h
gdk/gdk_select.c
gdk/gdk_value.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/url.c
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/alarm.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/mmath.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/factories.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/mkey.c
sql/ChangeLog.Aug2018
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_bat2time.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast_impl_down_from_flt.h
sql/backends/monet5/sql_cast_impl_int.h
sql/backends/monet5/sql_cast_impl_up_to_flt.h
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/vaults/bam/bam_db_interface.c
sql/backends/monet5/vaults/bam/bam_export.c
sql/storage/bat/bat_storage.c
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.err
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.out
sql/test/group-concat/Tests/groupconcat01.stable.out
sql/test/group-concat/Tests/groupconcat02.stable.out
sql/test/group-concat/Tests/groupconcat03.stable.out
sql/test/group-concat/Tests/groupconcat04.stable.out
sql/test/group-concat/Tests/groupconcat05.stable.out
Branch: analytics
Log Message:

Merge with default.


diffs (truncated from 4998 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
@@ -118,7 +118,7 @@ gdk_return BATextend(BAT *b, BUN newcap)
 void BATfakeCommit(BAT *b);
 gdk_return BATfirstn(BAT **topn, BAT **gids, BAT *b, BAT *cands, BAT *grps, 
BUN n, bool asc, bool distinct) __attribute__((__warn_unused_result__));
 int BATgetaccess(BAT *b);
-PROPrec *BATgetprop(BAT *b, int idx);
+PROPrec *BATgetprop(BAT *b, enum prop_t idx);
 gdk_return BATgroup(BAT **groups, BAT **extents, BAT **histo, BAT *b, BAT *s, 
BAT *g, BAT *e, BAT *h) __attribute__((__warn_unused_result__));
 const char *BATgroupaggrinit(BAT *b, BAT *g, BAT *e, BAT *s, oid *minp, oid 
*maxp, BUN *ngrpp, BUN *startp, BUN *endp, const oid **candp, const oid 
**candendp);
 gdk_return BATgroupavg(BAT **bnp, BAT **cntsp, BAT *b, BAT *g, BAT *e, BAT *s, 
int tp, bool skip_nils, bool abort_on_error, int scale);
@@ -131,7 +131,7 @@ BAT *BATgroupquantile(BAT *b, BAT *g, BA
 BAT *BATgroupsize(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool 
abort_on_error);
 BAT *BATgroupstdev_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool 
skip_nils, bool abort_on_error);
 BAT *BATgroupstdev_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool 
skip_nils, bool abort_on_error);
-BAT *BATgroupstr_group_concat(BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils, 
bool abort_on_error, const str separator);
+BAT *BATgroupstr_group_concat(BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils, 
bool abort_on_error, const char *separator);
 BAT *BATgroupsum(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool 
abort_on_error);
 BAT *BATgroupvariance_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool 
skip_nils, bool abort_on_error);
 BAT *BATgroupvariance_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool 
skip_nils, bool abort_on_error);
@@ -161,7 +161,7 @@ BAT *BATproject(BAT *l, BAT *r);
 BAT *BATprojectchain(BAT **bats);
 gdk_return BATrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT 
*sl, BAT *sr, bool li, bool hi, BUN estimate) 
__attribute__((__warn_unused_result__));
 gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bool force) 
__attribute__((__warn_unused_result__));
-void BATrmprop(BAT *b, int idx);
+void BATrmprop(BAT *b, enum prop_t idx);
 gdk_return BATroles(BAT *b, const char *tnme);
 BAT *BATsample(BAT *b, BUN n);
 BAT *BATsample_with_seed(BAT *b, BUN n, unsigned seed);
@@ -170,10 +170,10 @@ gdk_return

MonetDB: analytics - Merge with default.

2018-10-26 Thread Pedro Ferreira

Changeset: cc8895b12974 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc8895b12974
Added Files:
sql/test/BugTracker-2018/Tests/select_where_true.Bug-6654.sql
sql/test/BugTracker-2018/Tests/select_where_true.Bug-6654.stable.err
sql/test/BugTracker-2018/Tests/select_where_true.Bug-6654.stable.out
Modified Files:
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_firstn.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_tm.c
gdk/gdk_utils.c
geom/monetdb5/geom.c
geom/monetdb5/geomBulk.c
geom/monetdb5/geom_upgrade.c
monetdb5/extras/rapi/converters.c.h
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_debugger.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/url.c
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/wlc.c
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/UDF/udf/udf.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_bat2time.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast_impl_down_from_flt.h
sql/backends/monet5/sql_cast_impl_int.h
sql/backends/monet5/sql_cast_impl_up_to_flt.h
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/bam/bam_db_interface.c
sql/backends/monet5/vaults/bam/bam_export.c
sql/backends/monet5/vaults/bam/bam_lib.c
sql/server/rel_optimizer.c
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_table.c
sql/test/BugTracker-2018/Tests/All
testing/Mtest.py.in
Branch: analytics
Log Message:

Merge with default.


diffs (truncated from 2628 to 300 lines):

diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1229,6 +1229,15 @@ typedef var_t stridx_t;
 #define BUNtvar(bi,p)  (assert((bi).b->ttype && (bi).b->tvarsized), 
Tbase((bi).b)+BUNtvaroff(bi,p))
 #define BUNtail(bi,p)  
((bi).b->ttype?(bi).b->tvarsized?BUNtvar(bi,p):BUNtloc(bi,p):BUNtpos(bi,p))
 
+/* return the oid value at BUN position p from the (v)oid bat b
+ * works with any TYPE_void or TYPE_oid bat */
+#define BUNtoid(b,p)   (assert(ATOMtype((b)->ttype) == TYPE_oid),  \
+(is_oid_nil((b)->tseqbase) \
+ ? ((b)->ttype == TYPE_void\
+? (void) (p), oid_nil  \
+: ((const oid *) (b)->T.heap.base)[p]) \
+ : (oid) ((b)->tseqbase + (BUN) (p
+
 static inline BATiter
 bat_iterator(BAT *b)
 {
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -3327,14 +3327,14 @@ concat_strings(void *res, int what, BAT*
if (cand == NULL) {
if(nonil) {
BATloop(b,p,q) {
-   s = BUNtail(bi, p);
+   s = BUNtvar(bi, p);
next_length = strlen(s);
single_length += next_length + 
separator_length;
single_oid = p;
}
} else {
BATloop(b,p,q) {
-   s = BUNtail(bi, p);
+   s = BUNtvar(bi, p);
if (*s != '\200') {
next_length = strlen(s);
single_length += next_length + 
separator_length;
@@ -3353,7 +3353,7 @@ concat_strings(void *res, int what, BAT*
goto finish;
}
BATloop(b,p,q){
-   s = BUNtail(bi, p);
+   s = BUNtvar(bi, p);
next_length = strlen(s);
memcpy(single_str + offset, s, 
next_length);
offset += next_length;
@@ -3400,7 +3400,7 @@ concat_strings(void *res, int what, BAT*
i = *cand++ - seqb;
if (i >= end)
break;
-   s = BUNtail(bi, i);
+

MonetDB: analytics - Merge with default.

2018-10-24 Thread Pedro Ferreira

Changeset: cc4c301896ee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc4c301896ee
Added Files:

sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5

sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.options5

sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.sql

sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.err

sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.out
Removed Files:

sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.dbinit5

sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.dbinit5
Modified Files:
MonetDB.spec
buildtools/ChangeLog-Archive
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
clients/mapilib/mapi.c
common/stream/stream.c
debian/changelog
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_delta.c
gdk/gdk_firstn.c
gdk/gdk_group.c
gdk/gdk_hash.c
gdk/gdk_hash.h
gdk/gdk_heap.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_orderidx.c
gdk/gdk_private.h
gdk/gdk_storage.c
monetdb5/modules/kernel/logger.c
monetdb5/tools/Tests/mserver5--help.stable.err
monetdb5/tools/Tests/mserver5--help.stable.err.Windows
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast_impl_down_from_flt.h
sql/backends/monet5/sql_round_impl.h
sql/server/sql_mvc.c
sql/server/sql_parser.y
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_logger.h
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/ADT2006/Tests/sander.stable.err
sql/test/BugTracker-2018/Tests/All
testing/Mtest.py.in
testing/README
testing/process.py
tools/mserver/mserver5.1.in
tools/mserver/mserver5.c
Branch: analytics
Log Message:

Merge with default.


diffs (truncated from 3107 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -112,6 +112,7 @@ Vendor: MonetDB BV 
 Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
+BugURL: https://bugs.monetdb.org/
 Source: 
https://www.monetdb.org/downloads/sources/Aug2018-SP1/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
@@ -1080,7 +1081,7 @@ done
 * Wed Oct  3 2018 Sjoerd Mullender  - 11.31.9-20181005
 - buildtools: On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam 
package
   cannot be built because of an incompatibility in the libbam library
-  (it cannot be used in a shared object.
+  (it cannot be used in a shared object).
 
 * Wed Aug 29 2018 Sjoerd Mullender  - 11.31.7-20180829
 - Rebuilt.
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -4,7 +4,7 @@
 * Wed Oct  3 2018 Sjoerd Mullender  - 11.31.9-20181005
 - On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package
   cannot be built because of an incompatibility in the libbam library
-  (it cannot be used in a shared object.
+  (it cannot be used in a shared object).
 
 * Tue Aug 28 2018 Sjoerd Mullender  - 11.31.5-20180829
 - Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio
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
@@ -432,9 +432,8 @@ gdk_return log_tend(logger *lg);
 gdk_return log_tstart(logger *lg);
 gdk_return logger_add_bat(logger *lg, BAT *b, const char *name, char tpe, oid 
id) __attribute__((__warn_unused_result__));
 lng logger_changes(logger *lg);
-gdk_return logger_cleanup(logger *lg, int keep_persisted_log_files);
-logger *logger_create(int debug, const char *fn, const char *logdir, int 
version, preversionfix_fptr prefuncp, postversionfix_fptr postfuncp, int 
keep_persisted_log_files);
-logger *logger_create_shared(int debug, const char *fn, const char *logdir, 
const char *slave_logdir, int version, preversionfix_fptr prefuncp, 
postversionfix_fptr postfuncp);
+gdk_return logger_cleanup(logger *lg);
+logger *logger_create(int debug, const char *fn, const char *logdir, int 
version, preversionfix_fptr prefuncp, postversionfix_fptr postfuncp);
 gdk_return logger_del_bat(logger *lg, log_bid bid) 
__attribute__((__warn_unused_result__));
 void logger_destroy(logger *lg);
 gdk_return logger_exit(logger *lg);
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -685,16 +685,18 @@ static int
 dump_column_definition(Mapi

MonetDB: analytics - Merge with default.

2018-10-18 Thread Pedro Ferreira

Changeset: fed16a283c15 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fed16a283c15
Added Files:
sql/test/rename/Tests/All
sql/test/rename/Tests/rename00.py
sql/test/rename/Tests/rename00.stable.err
sql/test/rename/Tests/rename00.stable.out
sql/test/rename/Tests/rename01.sql
sql/test/rename/Tests/rename01.stable.err
sql/test/rename/Tests/rename01.stable.out
sql/test/rename/Tests/rename02.sql
sql/test/rename/Tests/rename02.stable.err
sql/test/rename/Tests/rename02.stable.out
sql/test/rename/Tests/rename03.sql
sql/test/rename/Tests/rename03.stable.err
sql/test/rename/Tests/rename03.stable.out
sql/test/rename/Tests/rename04.sql
sql/test/rename/Tests/rename04.stable.err
sql/test/rename/Tests/rename04.stable.out
sql/test/rename/Tests/rename05.sql
sql/test/rename/Tests/rename05.stable.err
sql/test/rename/Tests/rename05.stable.out
sql/test/rename/Tests/rename06.sql
sql/test/rename/Tests/rename06.stable.err
sql/test/rename/Tests/rename06.stable.out
Modified Files:
NT/monetdb_config.h.in
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/mapilib/mapi.c
clients/mapilib/mapi.h
common/stream/stream.c
configure.ag
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_session.c
monetdb5/modules/mal/wlc.mal
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_projectionpath.c
sql/ChangeLog
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_cat.h
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sqlcatalog.mal
sql/backends/monet5/vaults/bam/bam_db_interface.c
sql/backends/monet5/wlr.mal
sql/benchmarks/tpch/load-sf-0.01-LOCKED.sql
sql/benchmarks/tpch/load-sf-0.01.sql
sql/benchmarks/tpch/load-sf-1.sql
sql/common/sql_changeset.c
sql/common/sql_list.c
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/include/sql_list.h
sql/include/sql_relation.h
sql/server/rel_optimizer.c
sql/server/rel_schema.c
sql/server/rel_semantic.c
sql/server/rel_sequence.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.h
sql/server/sql_parser.y
sql/server/sql_partition.c
sql/server/sql_partition.h
sql/server/sql_scan.c
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/storage/store_sequence.c
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/Users/Tests/copyinto.stable.err
sql/test/Users/Tests/copyinto.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
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/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/alter_table.stable.out
sql/test/pg_regress/Tests/drop.stable.err
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
testing/exportutils.py
Branch: analytics
Log Message:

Merge with default.


diffs (truncated from 8275 to 300 lines):

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
@@ -910,5 +910,6 @@ typedef __uint128_t uhge;
 
 #define PROMPT1"\001\001\n"/* prompt: ready for new query 
*/
 #define PROMPT2"\001\002\n"/* prompt: more data needed */
+#define PROMPT3"\001\003\n"/* prompt: get file content */
 
 #endif /* _SEEN_MONETDB_CONFIG_H */
diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
---

MonetDB: analytics - Merge with default

2018-10-16 Thread Pedro Ferreira

Changeset: f8174cbbe776 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8174cbbe776
Added Files:
sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.sql
sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.err
sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.out
sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.sql
Modified Files:
MonetDB.spec
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_qsort.c
gdk/gdk_qsort_impl.h
sql/server/sql_parser.y
sql/test/BugTracker-2018/Tests/All
testing/Mtest.py.in
testing/listexports.py.in
tools/mserver/monet_version.c.in
Branch: analytics
Log Message:

Merge with default


diffs (truncated from 835 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -878,10 +878,10 @@ Group: Applications/Databases
 %if "%{?_selinux_policy_version}" != ""
 Requires:   selinux-policy >= %{?_selinux_policy_version}
 %endif
-Requires(post):   MonetDB5-server = %{version}-%{release}
-Requires(postun): MonetDB5-server
-Requires(post):   %{name}-SQL-server5 = %{version}-%{release}
-Requires(postun): %{name}-SQL-server5
+Requires(post):   MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires(postun): MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires(post):   %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Requires(postun): %{name}-SQL-server5%{?_isa} = %{version}-%{release}
 Requires(post):   /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
 Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
 BuildArch: noarch
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -936,8 +936,6 @@ tr_commit(logger *lg, trans *tr)
return tr_destroy(tr);
 }
 
-static gdk_return log_sequence_nrs(logger *lg);
-
 #ifdef _MSC_VER
 #define access(file, mode) _access(file, mode)
 #endif
@@ -991,7 +989,6 @@ logger_open(logger *lg)
 {
char id[BUFSIZ];
char *filename;
-   bat bid;
 
snprintf(id, sizeof(id), LLFMT, lg->id);
filename = GDKfilepath(BBPselectfarm(lg->dbfarm_role, 0, offheap), 
lg->dir, LOGFILE, id);
@@ -1003,36 +1000,12 @@ logger_open(logger *lg)
}
lg->end = 0;
 
-   if (lg->log == NULL || mnstr_errnr(lg->log) || log_sequence_nrs(lg) != 
GDK_SUCCEED) {
+   if (lg->log == NULL || mnstr_errnr(lg->log)) {
fprintf(stderr, "!ERROR: logger_open: creating %s failed\n", 
filename);
GDKfree(filename);
return GDK_FAIL;
}
GDKfree(filename);
-   if ((bid = logger_find_bat(lg, "seqs_id", 0, 0)) != 0) {
-   int dbg = GDKdebug;
-   BAT *b;
-   GDKdebug &= ~CHECKMASK;
-   if ((b = BATdescriptor(bid)) == NULL ||
-   BATmode(b, TRANSIENT) != GDK_SUCCEED ||
-   logger_del_bat(lg, bid) != GDK_SUCCEED) {
-   logbat_destroy(b);
-   return GDK_FAIL;
-   }
-   logbat_destroy(b);
-   b = NULL;
-   if ((bid = logger_find_bat(lg, "seqs_val", 0, 0)) == 0 ||
-   (b = BATdescriptor(bid)) == NULL ||
-   BATmode(b, TRANSIENT) != GDK_SUCCEED ||
-   logger_del_bat(lg, bid) != GDK_SUCCEED) {
-   logbat_destroy(b);
-   return GDK_FAIL;
-   }
-   logbat_destroy(b);
-   GDKdebug = dbg;
-   if (bm_commit(lg) != GDK_SUCCEED)
-   return GDK_FAIL;
-   }
return GDK_SUCCEED;
 }
 
@@ -1044,7 +1017,7 @@ logger_close(logger *lg)
 }
 
 static gdk_return
-logger_readlog(logger *lg, char *filename)
+logger_readlog(logger *lg, char *filename, bool *filemissing)
 {
trans *tr = NULL;
logformat l;
@@ -1067,6 +1040,7 @@ logger_readlog(logger *lg, char *filenam
close_stream(lg->log);
lg->log = NULL;
GDKdebug = dbg;
+   *filemissing = true;
return GDK_SUCCEED;
}
short byteorder;
@@ -1276,7 +1250,7 @@ logger_readlogs(logger *lg, FILE *fp, ch
fprintf(stderr, "#logger_readlogs logger id is " LLFMT "\n", 
lg->id);
}
 
-   while (fgets(id, sizeof(id), fp) != NULL) {
+   if (fgets(id, sizeof(id), fp) != NULL) {
char log_filename[FILENAME_MAX];
lng lid = strtoll(id, NULL, 10);
 
@@ -1285,13 +1259,20 @@ logger_readlogs(logger *lg, FILE *fp, ch
}
 
if (!lg->shared && lid >= lg->id) {
+   bool filemissing = false;
+
lg->id = lid;
-   snprintf(log_filename, sizeof(log_filename), "%s." 
LLFMT, filename, lg->id);
-

MonetDB: analytics - Merge with default.

2018-10-12 Thread Pedro Ferreira

Changeset: 04c5f03a4924 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=04c5f03a4924
Removed Files:
buildtools/autogen/setup.py
Modified Files:
.hgtags
ChangeLog-Archive
ChangeLog.Aug2018
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/ChangeLog
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/libbat.rc
libversions
monetdb5/tools/libmonetdb5.rc
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out

sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD

sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows
vertoo.data
Branch: analytics
Log Message:

Merge with default.


diffs (truncated from 606 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -714,3 +714,6 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655
 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release
 a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_9
 a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release
+24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_11
+a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release
+24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_SP1_release
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,9 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Wed Oct 10 2018 Sjoerd Mullender  - 11.31.11-20181011
+- Some subtle dependencies between RPMs have been fixed.
+
 * Wed Feb 14 2018 Stefan Manegold  - 11.29.1-20180315
 - mclient's execution time profiling options and output format have
   been changed. Instead of implicitly via the "--interactive"/"-i"
diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018
--- a/ChangeLog.Aug2018
+++ b/ChangeLog.Aug2018
@@ -1,5 +1,3 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
 * Wed Oct 10 2018 Sjoerd Mullender 
-- Some subtle dependencies between RPMs have been fixed.
-
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1062,6 +1062,14 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 11 2018 Sjoerd Mullender  - 11.31.11-20181011
+- Rebuilt.
+- BZ#6648: key property potentially wrong after type conversion
+- BZ#6649: Projection inside within transaction gives wrong results
+
+* Wed Oct 10 2018 Sjoerd Mullender  - 11.31.11-20181011
+- MonetDB: Some subtle dependencies between RPMs have been fixed.
+
 * Fri Oct 05 2018 Sjoerd Mullender  - 11.31.9-20181005
 - Rebuilt.
 - BZ#6640: timestamp_to_str returning incorrectly adjusted results
diff --git a/buildtools/autogen/setup.py b/buildtools/autogen/setup.py
deleted file mode 100755
--- a/buildtools/autogen/setup.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-
-# 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.
-
-from distutils.core import setup
-
-setup(name = "autogen",
-  version = "1.0",
-  description = "MonetDB autogen script",
-  author = "MonetDB Team, CWI",
-  author_email = "i...@monetdb.org",
-  url = "https://www.monetdb.org/;,
-  maintainer = "Sjoerd Mullender",
-  maintainer_email = "i...@monetdb.org",
-  license = "Mozilla Public License, v. 2.0",
-  packages = ['autogen'],
-  scripts = ['autogen.py'])
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,3 +1,8 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
+* Thu Oct 11 2018 Martin van Dinther 
+- The mclient program can now be quit by typing quit or exit on the
+  command-line.  This makes it easier for novice users to quit the program
+  if they do not know that the standard command to quit is \q.
+
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -58,22 +58,20 @@ get_with_comments_as_clause(Mapi mid)
"WHERE id = language_id"
 ")";
 
-   MapiHdl hdl;
-   const char *comments_clause;
-
-   hdl = mapi_query(mid, query);
-   if (mapi_error(mid)) {
-   if (hdl) {
+   bool has_sys_comments = false;
+   MapiHdl hdl = mapi_query(mid, query);
+   if (hdl) {
+

MonetDB: analytics - Merge with default

2018-10-10 Thread Pedro Ferreira

Changeset: e197f8eee297 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e197f8eee297
Modified Files:
ChangeLog.Aug2018
MonetDB.spec
clients/mapiclient/mhelp.c
rpm.mk.in
testing/Mtest.py.in
Branch: analytics
Log Message:

Merge with default


diffs (truncated from 376 to 300 lines):

diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018
--- a/ChangeLog.Aug2018
+++ b/ChangeLog.Aug2018
@@ -1,2 +1,5 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
+* Wed Oct 10 2018 Sjoerd Mullender 
+- Some subtle dependencies between RPMs have been fixed.
+
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -14,6 +14,10 @@
 
 %global release %{buildno}%{?dist}
 
+# This package contains monetdbd which is a (long running) daemon, so
+# we need to harden:
+%global _hardened_build 1
+
 # On RedHat Enterprise Linux and derivatives, if the Extra Packages
 # for Enterprise Linux (EPEL) repository is available, you can enable
 # its use by providing rpmbuild or mock with the "--with epel" option.
@@ -739,10 +743,6 @@ used from the MAL level.
 Summary: MonetDB5 SQL server modules
 Group: Applications/Databases
 Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release}
-%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-# RHEL >= 7, and all current Fedora
-Requires(post): %{_bindir}/systemd-tmpfiles
-%endif
 %if (0%{?fedora} >= 22)
 %if %{with hugeint}
 Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release}
@@ -759,11 +759,6 @@ accelerators.  It also has an SQL fronte
 This package contains the SQL frontend for MonetDB.  If you want to
 use SQL with MonetDB, you will need to install this package.
 
-%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-%post SQL-server5
-systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/monetdbd.conf
-%endif
-
 %files SQL-server5
 %defattr(-,root,root)
 %{_bindir}/monetdb
@@ -771,7 +766,8 @@ systemd-tmpfiles --create %{_sysconfdir}
 %dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
 # RHEL >= 7, and all current Fedora
-%{_sysconfdir}/tmpfiles.d/monetdbd.conf
+%dir %attr(775,monetdb,monetdb) /run/monetdb
+%{_tmpfilesdir}/monetdbd.conf
 %{_unitdir}/monetdbd.service
 %else
 # RedHat Enterprise Linux < 7
@@ -908,6 +904,8 @@ do
   /usr/sbin/semodule -s ${selinuxvariant} -i \
 %{_datadir}/selinux/${selinuxvariant}/monetdb.pp &> /dev/null || :
 done
+# use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems,
+# %{_localstatedir}/run is a symlink to /run
 /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb 
%{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 
%{_unitdir}/monetdbd.service &> /dev/null || :
 /usr/bin/systemctl try-restart monetdbd.service
 
@@ -921,6 +919,8 @@ if [ $1 -eq 0 ] ; then
   do
 /usr/sbin/semodule -s ${selinuxvariant} -r monetdb &> /dev/null || :
   done
+  # use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems,
+  # %{_localstatedir}/run is a symlink to /run
   /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb 
%{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 
%{_unitdir}/monetdbd.service &> /dev/null || :
   if [ $active = active ]; then
 /usr/bin/systemctl start monetdbd.service
@@ -943,11 +943,18 @@ fi
 # that causes it to report an internal error when compiling
 # testing/difflib.c.  The work around is to not use -fstack-protector-strong.
 # The bug exhibits itself on CentOS 7 on AArch64.
-if [ `gcc -v 2>&1 | grep -c 'Target: aarch64\|gcc version 4\.'` -eq 2 ]; then
-   # set CFLAGS before configure, so that this value gets used
-   CFLAGS='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions 
--param=ssp-buffer-size=4 -grecord-gcc-switches  '
-   export CFLAGS
-fi
+# Everywhere else, add -Wno-format-truncation to the compiler options
+# to reduce the number of warnings during compilation.
+%ifarch aarch64
+if gcc -v 2>&1 | grep -q 'gcc version 4\.'; then
+   CFLAGS="${CFLAGS:-$(echo %optflags | sed 
's/-fstack-protector-strong//')"
+else
+   CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}"
+fi
+%else
+CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}"
+%endif
+export CFLAGS
 %{configure} \
--enable-assert=no \
--enable-console=yes \
@@ -1017,10 +1024,23 @@ cd -
 %install
 %make_install
 
-mkdir -p %{buildroot}%{_localstatedir}/MonetDB
-mkdir -p %{buildroot}%{_localstatedir}/monetdb5/dbfarm
-mkdir -p %{buildroot}%{_localstatedir}/log/monetdb
-mkdir -p %{buildroot}%{_localstatedir}/run/monetdb
+# move file to correct location
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
+mkdir -p %{buildroot}%{_tmpfilesdir}
+mv %{buildroot}%{_sysconfdir}/tmpfiles.d/monetdbd.conf 
%{buildroot}%{_tmpfilesdir}
+rmdir %{buildroot}%{_sysconfdir}/tmpfiles.d
+%endif
+
+install -d -m 0750 %{buildroot}%{_localstatedir}/MonetDB
+install -d -m

MonetDB: analytics - Merge with default.

2018-10-10 Thread Pedro Ferreira

Changeset: d026fdc8dcfc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d026fdc8dcfc
Added Files:
gdk/xoshiro256starstar.h
sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.sql
sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.err
sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.out
sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.sql

sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.err

sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.out
sql/test/sample/Tests/All
sql/test/sample/Tests/sample.1.sql
sql/test/sample/Tests/sample.1.stable.err
sql/test/sample/Tests/sample.1.stable.out
sql/test/sample/Tests/sample.10.sql
sql/test/sample/Tests/sample.10.stable.err
sql/test/sample/Tests/sample.10.stable.out
sql/test/sample/Tests/sample.11.sql
sql/test/sample/Tests/sample.11.stable.err
sql/test/sample/Tests/sample.11.stable.out
sql/test/sample/Tests/sample.12.sql
sql/test/sample/Tests/sample.12.stable.err
sql/test/sample/Tests/sample.12.stable.out
sql/test/sample/Tests/sample.13.sql
sql/test/sample/Tests/sample.13.stable.err
sql/test/sample/Tests/sample.13.stable.out
sql/test/sample/Tests/sample.14.sql
sql/test/sample/Tests/sample.14.stable.err
sql/test/sample/Tests/sample.14.stable.out
sql/test/sample/Tests/sample.15.sql
sql/test/sample/Tests/sample.15.stable.err
sql/test/sample/Tests/sample.15.stable.out
sql/test/sample/Tests/sample.2.sql
sql/test/sample/Tests/sample.2.stable.err
sql/test/sample/Tests/sample.2.stable.out
sql/test/sample/Tests/sample.3.sql
sql/test/sample/Tests/sample.3.stable.err
sql/test/sample/Tests/sample.3.stable.out
sql/test/sample/Tests/sample.4.sql
sql/test/sample/Tests/sample.4.stable.err
sql/test/sample/Tests/sample.4.stable.out
sql/test/sample/Tests/sample.5.sql
sql/test/sample/Tests/sample.5.stable.err
sql/test/sample/Tests/sample.5.stable.out
sql/test/sample/Tests/sample.6.sql
sql/test/sample/Tests/sample.6.stable.err
sql/test/sample/Tests/sample.6.stable.out
sql/test/sample/Tests/sample.7.sql
sql/test/sample/Tests/sample.7.stable.err
sql/test/sample/Tests/sample.7.stable.out
sql/test/sample/Tests/sample.8.sql
sql/test/sample/Tests/sample.8.stable.err
sql/test/sample/Tests/sample.8.stable.out
sql/test/sample/Tests/sample.9.sql
sql/test/sample/Tests/sample.9.stable.err
sql/test/sample/Tests/sample.9.stable.out
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/ReadlineTools.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_calc.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_sample.c
gdk/libbat.rc
geom/monetdb5/geom_upgrade.c
libversions
monetdb5/modules/mal/sample.c
monetdb5/modules/mal/sample.h
monetdb5/modules/mal/sample.mal
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/include/sql_catalog.h
sql/server/rel_select.c
sql/server/sql_parser.h
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2018/Tests/All
sql/test/BugTracker/Tests/drop_sequence_crash.SF-1505973.sql
sql/test/BugTracker/Tests/drop_sequence_crash_2.SF-1505973.sql
sql/test/group-concat/Tests/groupconcat01.sql
sql/test/group-concat/Tests/groupconcat01.stable.out
sql/test/group-concat/Tests/groupconcat05.sql
sql/test/group-concat/Tests/groupconcat05.stable.out
tools/mserver/monet_version.c.in
tools/mserver/mserver5.c
vertoo.data
Branch: analytics
Log Message:

Merge with default.


diffs (truncated from 6209 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -712,3 +712,5 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655
 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_7
 3aaf6c916bd870cc478d3973241bc24cafbe1655

MonetDB: analytics - Merge with default

2018-10-05 Thread Pedro Ferreira

Changeset: ccde0156d9aa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccde0156d9aa
Modified Files:
buildtools/ChangeLog.Aug2018
clients/Tests/MAL-signatures.stable.out
debian/compat
debian/control
debian/fix-deb.sh
debian/libmonetdb-client-dev.install
debian/libmonetdb-client-odbc.install
debian/libmonetdb-client10.install
debian/libmonetdb-dev.install
debian/libmonetdb-stream-dev.install
debian/libmonetdb-stream11.install
debian/libmonetdb17.install
debian/libmonetdb5-server-bam.install
debian/libmonetdb5-server-cfitsio.install
debian/libmonetdb5-server-geom.install
debian/libmonetdb5-server-lidar.install
debian/monetdb-python2.install
debian/monetdb-python3.install
debian/monetdb-r.install
debian/monetdb5-server-dev.install
debian/monetdb5-server-hugeint.install
debian/monetdb5-server.install
debian/monetdb5-sql-hugeint.install
debian/monetdb5-sql.install
Branch: analytics
Log Message:

Merge with default


diffs (truncated from 426 to 300 lines):

diff --git a/buildtools/ChangeLog.Aug2018 b/buildtools/ChangeLog.Aug2018
--- a/buildtools/ChangeLog.Aug2018
+++ b/buildtools/ChangeLog.Aug2018
@@ -1,3 +1,8 @@
 # ChangeLog file for buildtools
 # This file is updated with Maddlog
 
+* Wed Oct  3 2018 Sjoerd Mullender 
+- On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package
+  cannot be built because of an incompatibility in the libbam library
+  (it cannot be used in a shared object.
+
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
@@ -5,10 +5,10 @@ stdout of test 'MAL-signatures` in direc
 # 21:44:50 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=33053" "--set" 
"mapi_usock=/var/tmp/mtest-13793/.s.monetdb.33053" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/home/sjoerd/Monet-devel/var/MonetDB/mTests_clients" "--set" 
"mal_listing=2" "--set" "embedded_r=yes"
 # 21:44:50 >  
 
-# MonetDB 5 server v11.20.0
+# MonetDB 5 server v11.32.0
 # This is an unreleased version
 # Serving database 'mTests_clients', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Compiled for x86_64-unknown-linux-gnu/64bit
 # Found 15.386 GiB available main-memory.
 # Copyright (c) 1993 - July 2008 CWI.
 # Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
@@ -5511,26 +5511,50 @@ Ready.
 [ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:bte]):dbl ",
"CMDcalcavg;",  "average of non-nil values of B with candidates list"   ]
 [ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:bte], s:bat[:oid]) 
(X_0:dbl, X_1:lng) ","CMDcalcavg;",  "average and number of non-nil values 
of B with candidates list"]
 [ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:bte], s:bat[:oid]):dbl ",   
"CMDcalcavg;",  "average of non-nil values of B"]
+[ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:bte], s:bat[:oid], 
scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;",  "average and number of non-nil 
values of B with candidates list"]
+[ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:bte], s:bat[:oid], 
scale:int):dbl ","CMDcalcavg;",  "average of non-nil values of B"   
 ]
+[ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:bte], scale:int) (X_0:dbl, 
X_1:lng) ",  "CMDcalcavg;",  "average and number of non-nil values of B"
 ]
+[ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:bte], scale:int):dbl ", 
"CMDcalcavg;",  "average of non-nil values of B with candidates list"   ]
 [ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:dbl]) (X_0:dbl, X_1:lng) ", 
"CMDcalcavg;",  "average and number of non-nil values of B" ]
 [ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:dbl]):dbl ",
"CMDcalcavg;",  "average of non-nil values of B with candidates list"   ]
 [ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid]) 
(X_0:dbl, X_1:lng) ","CMDcalcavg;",  "average and number of non-nil values 
of B with candidates list"]
 [ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid]):dbl ",   
"CMDcalcavg;",  "average of non-nil values of B"]
+[ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid], 
scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;",  "average and number of non-nil 
values of B with candidates list"]
+[ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid], 
scale:int):dbl ","CMDcalcavg;",  "average of non-nil values of B"   
 ]
+[ "batcalc",   "avg",  "pattern batcalc.avg(b:bat[:dbl], scale:int) (X_0:dbl, 
X_1:lng) ",  "CMDcalcavg;",  "average and number of non-nil values of B"
 ]
+[ "batcalc",

MonetDB: analytics - Merge with default.

2018-10-03 Thread Pedro Ferreira

Changeset: 0a79c50ecff4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a79c50ecff4
Modified Files:
monetdb5/mal/mal_linker.c
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/UDF/pyapi/type_conversion.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/shp/shp.c
testing/exportutils.py
Branch: analytics
Log Message:

Merge with default.


diffs (193 lines):

diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -233,6 +233,7 @@ loadLibrary(str filename, int flag)
 
MT_lock_set(_contextLock);
if (lastfile == maxfiles) {
+   MT_lock_unset(_contextLock);
if (handle)
dlclose(handle);
throw(MAL,"mal.linker", "loadModule internal error, too many 
modules loaded");
diff --git a/sql/backends/monet5/UDF/pyapi/type_conversion.c 
b/sql/backends/monet5/UDF/pyapi/type_conversion.c
--- a/sql/backends/monet5/UDF/pyapi/type_conversion.c
+++ b/sql/backends/monet5/UDF/pyapi/type_conversion.c
@@ -18,7 +18,7 @@
 #define PyString_CheckExact PyUnicode_CheckExact
 #endif
 
-bool string_copy(char *source, char *dest, size_t max_size, bool allow_unicode)
+bool string_copy(const char *source, char *dest, size_t max_size, bool 
allow_unicode)
 {
size_t i;
for (i = 0; i < max_size; i++) {
@@ -175,7 +175,7 @@ str pyobject_to_str(PyObject **ptr, size
ucs2_to_utf8(0, ((PyUnicodeObject *)obj)->length, utf8_string, 
str);
 #endif
 #else
-   char *str = PyUnicode_AsUTF8(obj);
+   const char *str = PyUnicode_AsUTF8(obj);
if (!string_copy(str, utf8_string, len-1, true)) {
msg = createException(MAL, "pyapi.eval",
  
SQLSTATE(PY000) "Invalid string encoding used. Please return "
@@ -206,7 +206,7 @@ wrapup:
 }
 
 #define STRING_TO_NUMBER_FACTORY(tpe)  
\
-   str str_to_##tpe(char *ptr, size_t maxsize, tpe *value) 
   \
+   str str_to_##tpe(const char *ptr, size_t maxsize, tpe *value)   
   \
{   
   \
size_t len = sizeof(tpe);   
   \
char buf[256];  
   \
diff --git a/sql/backends/monet5/UDF/pyapi/type_conversion.h 
b/sql/backends/monet5/UDF/pyapi/type_conversion.h
--- a/sql/backends/monet5/UDF/pyapi/type_conversion.h
+++ b/sql/backends/monet5/UDF/pyapi/type_conversion.h
@@ -24,12 +24,12 @@
 //! Copies the string of size up to max_size from the source to the 
destination,
 //! returns FALSE if "source" is not a legal ASCII string (i.e. a character is
 //! >= 128)
-bool string_copy(char *source, char *dest, size_t max_size, bool 
allow_unicode);
+bool string_copy(const char *source, char *dest, size_t max_size, bool 
allow_unicode);
 #ifdef HAVE_HGE
 //! Converts a hge to a string and writes it into the string "str"
 int hge_to_string(char *str, hge);
 //! Converts a base-10 string to a hge value
-str str_to_hge(char *ptr, size_t maxsize, hge *value);
+str str_to_hge(const char *ptr, size_t maxsize, hge *value);
 //! Converts a base-10 utf32-encoded string to a hge value
 str unicode_to_hge(Py_UNICODE *utf32, size_t maxsize, hge *value);
 //! Converts a PyObject to a hge value
@@ -48,7 +48,7 @@ str pyobject_to_blob(PyObject **ptr, siz
 
 //using macros, create a number of str_to_, unicode_to_ and 
pyobject_to_ functions (we are Java now)
 #define CONVERSION_FUNCTION_HEADER_FACTORY(tpe)  \
-str str_to_##tpe(char *ptr, size_t maxsize, tpe *value);  \
+str str_to_##tpe(const char *ptr, size_t maxsize, tpe *value);  \
 str unicode_to_##tpe(Py_UNICODE *ptr, size_t maxsize, tpe *value); 
 \
 str pyobject_to_##tpe(PyObject **ptr, size_t maxsize, tpe *value);
 
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
@@ -403,9 +403,9 @@ exp_bin(backend *be, sql_exp *e, stmt *l
(void)stmt_control_end(be, wstmt);
return stmt_control_end(be, ifstmt);
} else if (e->flag & PSM_IF) {
-   stmt *cond = exp_bin(be, e->l, left, right, grp, cnt, 
ext, sel);
+   stmt *cond = exp_bin(be, e->l, left, right, grp, ext, 
cnt, sel);
stmt *ifstmt = stmt_cond(be, cond, NULL, 0, 0), *res;
-   (void)exp_list(be, e->r, left, right, grp, cnt, ext, 
sel);
+   (void)exp_list(be, e->r, left, right, grp, ext, cnt, 
sel);
res

MonetDB: analytics - Merge with default

2018-10-01 Thread Pedro Ferreira

Changeset: 243bf58a8094 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=243bf58a8094
Added Files:
clients/R/Tests/deps-install.timeout
Modified Files:
clients/R/Tests/dbapply.R
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/deps-test.timeout
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.stable.err
clients/R/Tests/install.R
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_profiler.c
monetdb5/optimizer/opt_querylog.c
sql/common/sql_types.c
sql/server/rel_updates.c
sql/storage/store.c
sql/test/Tests/seq-default.stable.out
sql/test/seq-default.sql
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
Branch: analytics
Log Message:

Merge with default


diffs (truncated from 361 to 300 lines):

diff --git a/clients/R/Tests/dbapply.R b/clients/R/Tests/dbapply.R
--- a/clients/R/Tests/dbapply.R
+++ b/clients/R/Tests/dbapply.R
@@ -1,3 +1,5 @@
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+
 if (Sys.getenv("TSTTRGDIR") != "") {
.libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
 }
@@ -81,4 +83,6 @@ print(res)
 dbRemoveTable(con,tname)
 stopifnot(identical(FALSE, dbExistsTable(con,tname)))
 
+cat("#~EndProfilingOutput~#\n", file=stderr())
+
 print("SUCCESS")
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -1,6 +1,6 @@
 # autoinstall DBI and digest, we need those to install MonetDB.R
 options(warn = -1)
-packages_required <- c("digest", "DBI")
+packages_required <- c("digest", "DBI", "devtools")
 
 cat("#~BeginProfilingOutput~#\n", file=stderr())
 cat("#~BeginProfilingOutput~#\n", file=stdout())
diff --git a/clients/R/Tests/deps-install.timeout 
b/clients/R/Tests/deps-install.timeout
new file mode 100644
--- /dev/null
+++ b/clients/R/Tests/deps-install.timeout
@@ -0,0 +1,1 @@
+2
diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R
--- a/clients/R/Tests/deps-test.R
+++ b/clients/R/Tests/deps-test.R
@@ -1,4 +1,4 @@
-packages_required <- 
c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","devtools","DBItest")
+packages_required <- 
c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","DBItest")
 
 install_or_upgrade_packages <- function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
diff --git a/clients/R/Tests/deps-test.timeout 
b/clients/R/Tests/deps-test.timeout
--- a/clients/R/Tests/deps-test.timeout
+++ b/clients/R/Tests/deps-test.timeout
@@ -1,1 +1,1 @@
-5
+20
diff --git a/clients/R/Tests/dplyr-flights.R b/clients/R/Tests/dplyr-flights.R
--- a/clients/R/Tests/dplyr-flights.R
+++ b/clients/R/Tests/dplyr-flights.R
@@ -1,3 +1,5 @@
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+
 ff <- textConnection("asdf", open="w")
 # hide output from connect and attach since it would blow up the test output
 # dangerous since it might hide useful warnings
@@ -118,5 +120,6 @@ so(flights %>%
   ) %>%
   filter(arr > 30 | dep > 30))
 
+cat("#~EndProfilingOutput~#\n", file=stderr())
 
 print("SUCCESS")
diff --git a/clients/R/Tests/dplyr-flights.stable.err 
b/clients/R/Tests/dplyr-flights.stable.err
--- a/clients/R/Tests/dplyr-flights.stable.err
+++ b/clients/R/Tests/dplyr-flights.stable.err
@@ -30,7 +30,6 @@ stderr of test 'dplyr-flights` in direct
 # 11:44:05 >  "R" "--vanilla" "--slave" "--args" "30588"
 # 11:44:05 >  
 
-Identifier(s) "year", "month", "day", "hour", "minute" are reserved SQL 
keywords and need(s) to be quoted in queries.
 
 # 11:44:15 >  
 # 11:44:15 >  "Done."
diff --git a/clients/R/Tests/install.R b/clients/R/Tests/install.R
--- a/clients/R/Tests/install.R
+++ b/clients/R/Tests/install.R
@@ -2,13 +2,7 @@ options(warn = -1)
 cat("#~BeginProfilingOutput~#\n", file=stderr())
 cat("#~BeginProfilingOutput~#\n", file=stdout())
 
-install_submodule_git <- function(x, ...) {
-  install_dir <- tempfile()
-  system(paste("git clone --recursive --depth 1", shQuote(x), 
-shQuote(install_dir)))
-  devtools::install(install_dir, ...)
-}
-install_submodule_git("https://github.com/hannesmuehleisen/MonetDBLite-R;)
+devtools::install_github("hannesmuehleisen/MonetDBLite-R")
 
 cat("#~EndProfilingOutput~#\n", file=stderr())
 cat("#~EndProfilingOutput~#\n", file=stdout())
diff --git a/monetdb5/optimizer/opt_candidates.c 
b/monetdb5/optimizer/opt_candidates.c
--- a/monetdb5/optimizer/opt_candidates.c
+++ b/monetdb5/optimizer/opt_candidates.c
@@ -82,11 +82,11 @@ OPTcandidatesImplementation(Client cntxt
//chkTypes(cntxt->usermodule, mb, FALSE);
//chkFlow(mb);
//chkDeclarations(mb);
-/* keep all actions taken as a post block comment */
+
+   /* keep all actions taken as a post block

MonetDB: analytics - Merge with default

2018-09-27 Thread Pedro Ferreira

Changeset: 1d86620d42de for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d86620d42de
Added Files:
sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat
sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh
sql/jdbc/tests/Tests/SQLcopyinto.stable.err
sql/jdbc/tests/Tests/SQLcopyinto.stable.out
Modified Files:
clients/mapiclient/tachograph.c
common/utils/mcrypt.c
configure.ag
gdk/gdk_utils.c
sql/jdbc/tests/Tests/All
Branch: analytics
Log Message:

Merge with default


diffs (290 lines):

diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -204,7 +204,7 @@ showBar(int level, int64_t clk, char *st
nl = level/2-prevlevel/2;
if( level != 100 && (nl == 0 ||  level/2 <= prevlevel/2))
return;
-   assert(MSGLEN < BUFSIZ);
+   static_assert(MSGLEN < BUFSIZ, "MSGLEN too small");
if(prevlevel == 0)
printf("[");
else
diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -76,7 +76,7 @@ mcrypt_MD5Sum(const char *string, size_t
unsigned char md[MD5_DIGEST_LENGTH];
char *ret;
 
-   assert(MD5_DIGEST_LENGTH == 16);
+   static_assert(MD5_DIGEST_LENGTH == 16, "MD5_DIGEST_LENGTH should be 
16");
MD5_Init();
MD5_Update(, string, len);
MD5_Final(md, );
@@ -114,7 +114,7 @@ mcrypt_SHA1Sum(const char *string, size_
unsigned char md[SHA_DIGEST_LENGTH];
char *ret;
 
-   assert(SHA_DIGEST_LENGTH == 20);
+   static_assert(SHA_DIGEST_LENGTH == 20, "SHA_DIGEST_LENGTH should be 
20");
SHA1_Init();
SHA1_Update(, string, len);
SHA1_Final(md, );
@@ -152,7 +152,7 @@ mcrypt_SHA224Sum(const char *string, siz
unsigned char md[SHA224_DIGEST_LENGTH];
char *ret;
 
-   assert(SHA224_DIGEST_LENGTH == 28);
+   static_assert(SHA224_DIGEST_LENGTH == 28, "SHA224_DIGEST_LENGTH should 
be 28");
SHA224_Init();
SHA224_Update(, string, len);
SHA224_Final(md, );
@@ -193,7 +193,7 @@ mcrypt_SHA256Sum(const char *string, siz
unsigned char md[SHA256_DIGEST_LENGTH];
char *ret;
 
-   assert(SHA256_DIGEST_LENGTH == 32);
+   static_assert(SHA256_DIGEST_LENGTH == 32, "SHA256_DIGEST_LENGTH should 
be 32");
SHA256_Init();
SHA256_Update(, string, len);
SHA256_Final(md, );
@@ -236,7 +236,7 @@ mcrypt_SHA384Sum(const char *string, siz
unsigned char md[SHA384_DIGEST_LENGTH];
char *ret;
 
-   assert(SHA384_DIGEST_LENGTH == 48);
+   static_assert(SHA384_DIGEST_LENGTH == 48, "SHA384_DIGEST_LENGTH should 
be 48");
SHA384_Init();
SHA384_Update(, string, len);
SHA384_Final(md, );
@@ -283,7 +283,7 @@ mcrypt_SHA512Sum(const char *string, siz
unsigned char md[SHA512_DIGEST_LENGTH];
char *ret;
 
-   assert(SHA512_DIGEST_LENGTH == 64);
+   static_assert(SHA512_DIGEST_LENGTH == 64, "SHA512_DIGEST_LENGTH should 
be 64");
SHA512_Init();
SHA512_Update(, string, len);
SHA512_Final(md, );
@@ -335,7 +335,7 @@ mcrypt_RIPEMD160Sum(const char *string, 
unsigned char md[RIPEMD160_DIGEST_LENGTH];
char *ret;
 
-   assert(RIPEMD160_DIGEST_LENGTH == 20);
+   static_assert(RIPEMD160_DIGEST_LENGTH == 20, "RIPEMD160_DIGEST_LENGTH 
should be 20");
RIPEMD160_Init();
RIPEMD160_Update(, string, len);
RIPEMD160_Final(md, );
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2848,6 +2848,12 @@ typedef enum {
 @%:@include 
 @%:@include 
 
+@%:@ifndef static_assert
+/* static_assert is a C11 feature, defined in assert.h which also exists
+ * in many other compilers we ignore it if the compiler doesn't support it */
+@%:@define static_assert(expr, mesg)   ((void) 0)
+@%:@endif
+
 @%:@if defined(HAVE___INT128)
 typedef __int128 hge;
 typedef unsigned __int128 uhge;
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -443,18 +443,18 @@ GDKinit(opt *set, int setlen)
char buf[16];
 
/* some sanity checks (should also find if symbols are not defined) */
-   assert(sizeof(char) == SIZEOF_CHAR);
-   assert(sizeof(short) == SIZEOF_SHORT);
-   assert(sizeof(int) == SIZEOF_INT);
-   assert(sizeof(long) == SIZEOF_LONG);
-   assert(sizeof(lng) == SIZEOF_LNG);
+   static_assert(sizeof(char) == SIZEOF_CHAR, "error in configure: bad 
value for SIZEOF_CHAR");
+   static_assert(sizeof(short) == SIZEOF_SHORT, "error in configure: bad 
value for SIZEOF_SHORT");
+   static_assert(sizeof(int) == SIZEOF_INT, "error in configure: bad value 
for SIZEOF_INT");
+   static_assert(sizeof(long) == SIZEOF_LONG, "error in configure: bad 
value for SIZEOF_LONG");
+

MonetDB: analytics - Merge with default

2018-09-21 Thread Pedro Ferreira

Changeset: 697402c96124 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=697402c96124
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/eventparser.c
clients/mapiclient/mnc.c
clients/mapiclient/stethoscope.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
clients/mapilib/mapi.c
clients/mapilib/mapi.h
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/ODBCDesc.c
common/stream/ChangeLog
common/stream/stream.c
common/stream/stream.h
common/stream/stream_socket.h
common/utils/msabaoth.c
common/utils/mutils.c
configure.ag
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_logger.c
gdk/gdk_utils.c
monetdb5/mal/Tests/tst1150.malC
monetdb5/mal/mal_client.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/streams.c
monetdb5/modules/atoms/url.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/optimizer/opt_pushselect.c
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/bam/bam_export.c
sql/backends/monet5/vaults/bam/bam_globals.c
sql/backends/monet5/vaults/bam/bam_globals.h
sql/backends/monet5/vaults/bam/bam_loader.c
sql/backends/monet5/vaults/bam/bam_wrapper.c
sql/backends/monet5/wlr.c
sql/server/rel_optimizer.c
sql/server/rel_sequence.c
sql/server/sql_atom.c
sql/server/sql_partition.c
sql/storage/store.c
sql/test/BugTracker-2012/Tests/update_crash.Bug-2655.sql
sql/test/BugTracker-2012/Tests/update_crash.Bug-2655.stable.out
sql/test/Tests/seq-default.stable.out
sql/test/seq-default.sql
tools/merovingian/daemon/client.c
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/proxy.c
tools/merovingian/utils/control.c
Branch: analytics
Log Message:

Merge with default


diffs (truncated from 4111 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
@@ -2727,7 +2727,6 @@ size_t getFileSize(stream *s);
 stream *iconv_rstream(stream *restrict ss, const char *restrict charset, const 
char *restrict name);
 stream *iconv_wstream(stream *restrict ss, const char *restrict charset, const 
char *restrict name);
 bool isa_block_stream(stream *s);
-int mnstr_byteorder(stream *s);
 void mnstr_clearerr(stream *s);
 void mnstr_close(stream *s);
 void mnstr_destroy(stream *s);
@@ -2738,8 +2737,10 @@ int mnstr_flush(stream *s);
 int mnstr_fsetpos(stream *restrict s, fpos_t *restrict p);
 int mnstr_fsync(stream *s);
 buffer *mnstr_get_buffer(stream *s);
+bool mnstr_get_swapbytes(stream *s);
 int mnstr_init(void);
 int mnstr_isalive(stream *s);
+bool mnstr_isbinary(stream *s);
 char *mnstr_name(stream *s);
 int mnstr_printf(stream *restrict s, _In_z_ _Printf_format_string_ const char 
*restrict format, ...) __attribute__((__format__(__printf__, 2, 3)));
 ssize_t mnstr_read(stream *restrict s, void *restrict buf, size_t elmsize, 
size_t cnt);
@@ -2757,9 +2758,8 @@ int mnstr_readShtArray(stream *restrict 
 int mnstr_readStr(stream *restrict s, char *restrict val);
 ssize_t mnstr_read_block(stream *restrict s, void *restrict buf, size_t 
elmsize, size_t cnt);
 ssize_t mnstr_readline(stream *restrict s, void *restrict buf, size_t maxcnt);
-void mnstr_set_byteorder(stream *s, char bigendian);
+void mnstr_set_bigendian(stream *s, bool bigendian);
 void mnstr_settimeout(stream *s, unsigned int ms, bool( *func)(void));
-int mnstr_type(stream *s);
 ssize_t mnstr_write(stream *restrict s, const void *restrict buf, size_t 
elmsize, size_t cnt);
 int mnstr_writeBte(stream *s, int8_t val);
 int mnstr_writeBteArray(stream *restrict s, const int8_t *restrict val, size_t 
cnt);
@@ -2780,9 +2780,7 @@ stream *open_rstream(const char *filenam
 stream *open_urlstream(const char *url);
 stream *open_wastream(const char *filename);
 stream *open_wstream(const char *filename);
-stream *socket_rastream(SOCKET socket, const char *name);
 stream *socket_rstream(SOCKET socket, const char *name);
-stream *socket_wastream(SOCKET socket, const char *name);
 stream *socket_wstream(SOCKET socket, const char *name);
 stream *stream_blackhole_create(void);
 stream *stream_fwf_create(stream *restrict s, size_t num_fields, size_t 
*restrict widths, char filler);
diff --git

MonetDB: analytics - Merge with default.

2018-09-17 Thread Pedro Ferreira

Changeset: e0b8002b6702 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0b8002b6702
Modified Files:
sql/server/sql_parser.y
Branch: analytics
Log Message:

Merge with default.


diffs (23 lines):

diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -6392,6 +6392,7 @@ char *token2string(int token)
TR(MODE);
SQL(INSERT);
SQL(DELETE);
+   SQL(TRUNCATE);
SQL(UPDATE);
SQL(CROSS);
SQL(JOIN);
@@ -6463,6 +6464,11 @@ char *token2string(int token)
SQL(XMLTEXT);
SQL(XMLVALIDATE);
SQL(XMLNAMESPACES);
+   SQL(MERGE_PARTITION);
+   SQL(PARTITION_LIST);
+   SQL(PARTITION_RANGE);
+   SQL(PARTITION_COLUMN);
+   SQL(PARTITION_EXPRESSION);
SQL(PRECEDING);
SQL(FOLLOWING);
SQL(CURRENT_ROW);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: analytics - Merge with default

2018-09-12 Thread Pedro Ferreira

Changeset: c323fb1e3d7f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c323fb1e3d7f
Added Files:
sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.sql
sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.err
sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.out
sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.sql
sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.err
sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.out
Modified Files:
clients/Tests/exports.stable.out
clients/examples/C/sample0.c
clients/examples/C/sample1.c
clients/examples/C/sample4.c
clients/examples/C/smack00.c
clients/examples/C/smack01.c
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/mapiclient/msqldump.c
clients/mapilib/ChangeLog
clients/mapilib/mapi.c
clients/mapilib/mapi.h
clients/odbc/driver/SQLExecute.c
clients/odbc/driver/SQLGetTypeInfo.c
common/stream/stream.c
common/stream/stream.h
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_cross.c
gdk/gdk_heap.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_orderidx.c
gdk/gdk_posix.c
gdk/gdk_project.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_tm.c
gdk/gdk_unique.c
gdk/gdk_utils.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_import.c
monetdb5/mal/mal_readline.c
monetdb5/mal/mal_session.c
monetdb5/mal/mal_session.h
monetdb5/modules/atoms/mtime.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/projectionpath.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_dataflow.c
sql/backends/monet5/mal_backend.c
sql/backends/monet5/mal_backend.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/include/sql_hash.h
sql/server/rel_select.c
sql/server/sql_scan.c
sql/storage/bat/bat_logger.c
sql/test/BugTracker-2018/Tests/All
tools/merovingian/daemon/client.c
tools/merovingian/daemon/config/monetdbd.in
tools/merovingian/daemon/multiplex-funnel.c
Branch: analytics
Log Message:

Merge with default


diffs (truncated from 6464 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
@@ -479,7 +479,6 @@ MapiMsg mapi_bind_numeric(MapiHdl hdl, i
 MapiMsg mapi_bind_var(MapiHdl hdl, int fnr, int type, void *ptr);
 MapiMsg mapi_cache_freeup(MapiHdl hdl, int percentage);
 MapiMsg mapi_cache_limit(Mapi mid, int limit);
-MapiMsg mapi_cache_shuffle(MapiHdl hdl, int percentage);
 MapiMsg mapi_clear_bindings(MapiHdl hdl);
 MapiMsg mapi_clear_params(MapiHdl hdl);
 MapiMsg mapi_close_handle(MapiHdl hdl);
@@ -500,19 +499,19 @@ MapiMsg mapi_fetch_reset(MapiHdl hdl);
 int mapi_fetch_row(MapiHdl hdl);
 MapiMsg mapi_finish(MapiHdl hdl);
 MapiHdl mapi_get_active(Mapi mid);
-int mapi_get_autocommit(Mapi mid);
-char *mapi_get_dbname(Mapi mid);
+bool mapi_get_autocommit(Mapi mid);
+const char *mapi_get_dbname(Mapi mid);
 int mapi_get_digits(MapiHdl hdl, int fnr);
 int mapi_get_field_count(MapiHdl hdl);
 stream *mapi_get_from(Mapi mid);
-char *mapi_get_host(Mapi mid);
-char *mapi_get_lang(Mapi mid);
+const char *mapi_get_host(Mapi mid);
+const char *mapi_get_lang(Mapi mid);
 int64_t mapi_get_last_id(MapiHdl hdl);
 int mapi_get_len(MapiHdl hdl, int fnr);
 int64_t mapi_get_maloptimizertime(MapiHdl hdl);
-char *mapi_get_mapi_version(Mapi mid);
-char *mapi_get_monet_version(Mapi mid);
-char *mapi_get_motd(Mapi mid);
+const char *mapi_get_mapi_version(Mapi mid);
+const char *mapi_get_monet_version(Mapi mid);
+const char *mapi_get_motd(Mapi mid);
 char *mapi_get_name(MapiHdl hdl, int fnr);
 char *mapi_get_query(MapiHdl hdl);
 int64_t mapi_get_querytime(MapiHdl hdl);
@@ -523,19 +522,19 @@ int64_t mapi_get_sqloptimizertime(MapiHd
 char *mapi_get_table(MapiHdl hdl, int fnr);
 int mapi_get_tableid(MapiHdl hdl);
 stream *mapi_get_to(Mapi mid);
-int mapi_get_trace(Mapi mid);
+bool mapi_get_trace(Mapi mid);
 char *mapi_get_type(MapiHdl hdl, int fnr);
-char *mapi_get_uri(Mapi mid);
-char *mapi_get_user(Mapi mid);
-int mapi_is_connected(Mapi mid);
+const char *mapi_get_uri(Mapi mid);
+const char *mapi_get_user(Mapi mid);
+bool mapi_is_connected(Mapi mid);
 MapiMsg mapi_log(Mapi mid, const char *nme);
 Mapi mapi_mapi(const char *host, int port, const char *username, const char 
*password, const char *lang, const char *dbname);
 Mapi mapi_mapiuri(const char *url, const char

MonetDB: analytics - Merge with default.

2018-09-07 Thread Pedro Ferreira

Changeset: 839a24349c2b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=839a24349c2b
Modified Files:
MonetDB.spec
buildtools/autogen/autogen/msc.py
buildtools/doc/windowsbuild.rst
clients/mapilib/mapi.c
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/ODBCUtil.h
clients/odbc/driver/SQLError.c
clients/odbc/driver/SQLGetDescRec.c
clients/odbc/driver/SQLGetDiagField.c
clients/odbc/driver/SQLGetDiagRec.c
common/stream/stream.c
common/utils/msabaoth.c
configure.ag
gdk/gdk_atoms.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_parser.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/color.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/txtsim.c
sql/backends/monet5/sql_assert.c
sql/backends/monet5/sql_result.c
sql/server/sql_decimal.c
sql/server/sql_parser.y
tools/merovingian/daemon/config/monetdbd.in
tools/merovingian/utils/database.c
tools/merovingian/utils/properties.c
tools/merovingian/utils/utils.c
Branch: analytics
Log Message:

Merge with default.


diffs (truncated from 2040 to 300 lines):

diff --git a/buildtools/autogen/autogen/msc.py 
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -326,18 +326,16 @@ def msc_dep(fd, tar, deplist, msc):
 fd.write(getsrc)
 x, de = split_filename(deplist[0])
 of = b + '.' + de
-of = msc_translate_file(of, msc)
 fd.write('\t$(YACC) $(YFLAGS) $(AM_YFLAGS) "%s"\n' % of)
-if ext == "tab.c":
+elif ext == "tab.c":
 fd.write(getsrc)
 x, de = split_filename(deplist[0])
 of = b + '.' + de
-of = msc_translate_file(of, msc)
 fd.write('\t$(YACC) $(YFLAGS) $(AM_YFLAGS) "%s"\n' % of)
-if ext == "yy.c":
+elif ext == "yy.c":
 fd.write(getsrc)
 fd.write('\t$(LEX) $(LFLAGS) $(AM_LFLAGS) "%s.l"\n' % b)
-if ext in ("obj", "tab.obj", "yy.obj"):
+elif ext in ("obj", "tab.obj", "yy.obj"):
 target, name = msc_find_target(tar, msc)
 if name[0] == '_':
 name = name[1:]
@@ -346,7 +344,7 @@ def msc_dep(fd, tar, deplist, msc):
 if dext in ("c", "cpp", "yy.c", "tab.c"):
 fd.write('\t$(CC) /EHsc $(CFLAGS) $(%s_CFLAGS) $(GENDLL) 
-D_CRT_SECURE_NO_WARNINGS -DLIB%s "-Fo%s" -c "%s"\n' %
  (split_filename(msc_basename(src))[0], name, t, src))
-if ext == 'res':
+elif ext == 'res':
 fd.write("\t$(RC) -fo%s %s\n" % (t, src))
 
 def msc_deps(fd, deps, objext, msc):
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -805,7 +805,7 @@ The contents of the file referred to wit
 parameter may contain something like::
 
  bits=32
-  LIBPCRE=C:\Program Files\PCRE
+ LIBPCRE=C:\Program Files\PCRE
  LIBICONV=C:\Libraries\iconv-1.11.win32
  LIBZLIB=C:\Libraries\zlib-1.2.8.win32
  LIBXML2=C:\Libraries\libxml2-2.9.2.win32
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -1598,15 +1598,15 @@ add_error(struct MapiResultSet *result, 
size_t size = result->errorstr ? strlen(result->errorstr) : 0;
 
if (strlen(error) > 6 && error[5] == '!' &&
-   ((error[0] >= '0' && error[0] <= '9') ||
+   (isdigit((unsigned char) error[0]) ||
 (error[0] >= 'A' && error[0] <= 'Z')) &&
-   ((error[1] >= '0' && error[1] <= '9') ||
+   (isdigit((unsigned char) error[1]) ||
 (error[1] >= 'A' && error[1] <= 'Z')) &&
-   ((error[2] >= '0' && error[2] <= '9') ||
+   (isdigit((unsigned char) error[2]) ||
 (error[2] >= 'A' && error[2] <= 'Z')) &&
-   ((error[3] >= '0' && error[3] <= '9') ||
+   (isdigit((unsigned char) error[3]) ||
 (error[3] >= 'A' && error[3] <= 'Z')) &&
-   ((error[4] >= '0' && error[4] <= '9') ||
+   (isdigit((unsigned char) error[4]) ||
 (error[4] >= 'A' && error[4] <= 'Z'))) {
if (result->errorstr == NULL) {
/* remeber SQLSTATE for first error */
diff --git a/clients/odbc/driver/ODBCConvert.c 
b/clients/odbc/driver/ODBCConvert.c
--- a/clients/odbc/driver/ODBCConvert.c
+++ b/clients/odbc/driver/ODBCConvert.c
@@ -88,7 +88,7 @@ parseint(const char *data, bignum_t *nva
while (*data && *data != 'e' && *data != 'E' && !space(*data)) {
if (*data == '.')
fraction =

MonetDB: analytics - Merge with default

2018-09-03 Thread Pedro Ferreira

Changeset: da0ca3cf5baa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da0ca3cf5baa
Added Files:
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
Modified Files:
buildtools/doc/windowsbuild.rst
clients/mapiclient/dump.c
gdk/gdk_aggr.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/include/sql_catalog.h
sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out

sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.stable.out
sql/scripts/51_sys_schema_extension.sql
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/storage/bat/bat_logger.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.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.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/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/pg_regress/Tests/update.stable.out
sql/test/sys-schema/Tests/check_Not_Nullable_columns.sql
sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out
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: analytics
Log Message:

Merge with default


diffs (truncated from 53447 to 300 lines):

diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -813,50 +813,24 @@ parameter may contain something like::
 Building Installers
 ~~~
 
-Installers can be built either using the full-blown Visual Studio user
-interface or on the command line.  To use the user interface, open one
-or more of the files ``MonetDB5-SQL-Installer.sln``,
-``MonetDB-ODBC-Driver.sln``, and ``MonetDB5-Geom-Module.sln`` in the
-installation folder and select ``Build`` -> ``Build Solution``.  To use
-the command line, execute one or more of the commands in the
-installation folder::
+The installers are built using the WiX Toolset.  The WiX Toolset can
+be installed using Chocolatey.
 
- devenv MonetDB5-SQL-Installer.sln /build
- devenv MonetDB-ODBC-Driver.sln /build
- devenv MonetDB5-Geom-Module.sln /build
+The Python scripts ``mksqlwxs.py`` and ``mkodbcwxs.py`` in the ``NT``
+subdirectory are used to create the files
+``MonetDB5-SQL-Installer.wxs`` and ``MonetDB-ODBC-Installer.wxs``.
+This happens as part of the normal build process.
 
-In both cases, use the solutions (``.sln`` files) that are
-appropriate.
+These files then need to be processed using the ``candle`` command
+from the WiX Toolset::
 
-There is an annoying bug in Visual Studio on Windows64 that affects
-the MonetDB5-Geom-Module installer.  The installer contains code to
-check the registry to find out where MonetDB5/SQL is installed.  The
-bug is that the 64 bit installer will check the 32-bit section of the
-registry.  The code can be fixed by editing the generated installer
-(``.msi`` file) using e.g. the program ``orca`` from Microsoft.  Open
-the installer in ``orca`` and locate the table ``RegLocator``.  In the
-Type column, change the value from ``2`` to ``18`` and save the file.
-Alternatively, use the following Python script to fix the ``.msi``
-file::
+  candle.exe -nologo -arch x64 MonetDB5-SQL-Installer.wxs
+
+Use ``-arch x86`` for 32 bit Windows.
 
- # Fix a .msi (Windows Installer) file for a 64-bit registry search.
- # Microsoft refuses to fix a bug in Visual Studio so that for a 64-bit
- # build, the registry search will look in the 32-bit part of the
- # registry instead of the 64-bit part of the registry.  This script
- # fixes the .msi to

MonetDB: analytics - Merge with default.

2018-08-29 Thread Pedro Ferreira

Changeset: 9e7752ffe37d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e7752ffe37d
Added Files:
debian/libmonetdb5-server-cfitsio.install
debian/monetdb-python3.install
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
buildtools/doc/windowsbuild.rst
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
debian/control
debian/fix-deb.sh
debian/rules
gdk/libbat.rc
libversions

monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/modules/mal/pcre.c
monetdb5/tools/libmonetdb5.rc
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Aug2018
vertoo.config
vertoo.data
Branch: analytics
Log Message:

Merge with default.


diffs (truncated from 1058 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -706,3 +706,9 @@ 9c824ea44063e239b7251dce71f9af741c682211
 2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_3
 9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release
 2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release
+3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_5
+2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release
+3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release
+a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_7
+3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release
+a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -83,12 +83,17 @@
 # On Fedora and RHEL 7, create the MonetDB-python2 package.
 # On RHEL 6, numpy is too old.
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-%bcond_without pyintegration
+%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).
+%bcond_without py3integration
 %endif
 
 %if %{fedpkgs}
-# By default, do not create the MonetDB-cfitsio package.
-%bcond_with fits
+# By default, create the MonetDB-cfitsio package.
+%bcond_without fits
 %endif
 
 %{!?__python2: %global __python2 %__python}
@@ -151,7 +156,7 @@ BuildRequires: pkgconfig(zlib)
 %if %{with samtools}
 BuildRequires: samtools-devel
 %endif
-%if %{with pyintegration}
+%if %{with py2integration}
 BuildRequires: python-devel
 %if %{?rhel:1}%{!?rhel:0}
 # RedHat Enterprise Linux calls it simply numpy
@@ -165,6 +170,10 @@ BuildRequires: numpy
 %endif
 %endif
 %endif
+%if %{with py3integration}
+BuildRequires: python3-devel >= 3.5
+BuildRequires: python3-numpy
+%endif
 %if %{with rintegration}
 BuildRequires: R-core-devel
 %endif
@@ -508,7 +517,7 @@ install it.
 %{_libdir}/monetdb5/lib_rapi.so
 %endif
 
-%if %{with pyintegration}
+%if %{with py2integration}
 %package python2
 Summary: Integration of MonetDB and Python, allowing use of Python from within 
SQL
 Group: Applications/Databases
@@ -534,6 +543,32 @@ install it.
 %{_libdir}/monetdb5/lib_pyapi.so
 %endif
 
+%if %{with py3integration}
+%package python3
+Summary: Integration of MonetDB and Python, allowing use of Python from within 
SQL
+Group: Applications/Databases
+Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
+
+%description python3
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators.  It also has an SQL frontend.
+
+This package contains the interface to use the Python language from
+within SQL queries.  This package is for Python 3.
+
+NOTE: INSTALLING THIS PACKAGE OPENS UP SECURITY ISSUES.  If you don't
+know how this package affects the security of your system, do not
+install it.
+
+%files python3
+%defattr(-,root,root)
+%{_libdir}/monetdb5/pyapi3.*
+%{_libdir}/monetdb5/autoload/*_pyapi3.mal
+%{_libdir}/monetdb5/lib_pyapi3.so
+%endif
+
 %if %{with fits}
 %package cfitsio
 Summary: MonetDB: Add on module that provides support for FITS files
@@ -609,9 +644,12 @@ exit 0
 %if %{with lidar}
 %exclude %{_libdir}/monetdb5/lidar.mal
 %endif
-%if %{with pyintegration}
+%if %{with py2integration}
 %exclude %{_libdir}/monetdb5/pyapi.mal
 %endif
+%if %{with py3integration}
+%exclude %{_libdir}/monetdb5/pyapi3.mal
+%endif
 %if %{with rintegration}
 %exclude %{_libdir}/monetdb5/rapi.mal
 %endif
@@ -627,9 +665,12 @@ exit 0
 %if %{with lidar}
 %exclude %{_libdir}/monetdb5/autoload/*_lidar.mal
 %endif
-%if %{with pyintegration}
+%if %{with py2integration}
 %exclude %{_libdir}/monetdb5/autoload/*_pyapi.mal
 %endif
+%if %{with py3integration}
+%exclude %{_libdir}/monetdb5/autoload/*_pyapi3.mal
+%endif
 %if %{with

MonetDB: analytics - Merge with default.

2018-08-27 Thread Pedro Ferreira

Changeset: eaa5d8fea598 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eaa5d8fea598
Added Files:
sql/test/miscellaneous/Tests/declared_tables.sql
sql/test/miscellaneous/Tests/declared_tables.stable.err
sql/test/miscellaneous/Tests/declared_tables.stable.out
sql/test/sys-schema/Tests/bam_tables_checks.sql
sql/test/sys-schema/Tests/bam_tables_checks.stable.err
sql/test/sys-schema/Tests/bam_tables_checks.stable.out
sql/test/sys-schema/Tests/check_Not_Nullable_columns.sql
sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.err
sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out
sql/test/sys-schema/Tests/geom_tables_checks.sql
sql/test/sys-schema/Tests/geom_tables_checks.stable.err
sql/test/sys-schema/Tests/geom_tables_checks.stable.out
tools/merovingian/daemon/config/.merovingian_properties.in
tools/merovingian/daemon/config/Makefile.ag
tools/merovingian/daemon/config/monetdbd.in
tools/merovingian/daemon/config/monetdbd.service.in
Removed Files:
tools/merovingian/daemon/.merovingian_properties.in
tools/merovingian/daemon/monetdbd.service.in
Modified Files:
MonetDB.spec
debian/monetdb5-sql.install
debian/rules
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/optimizer/opt_pipes.c
sql/backends/monet5/sql_cat.c
sql/server/rel_schema.c
sql/server/rel_semantic.c
sql/test/Tests/setoptimizer.stable.out
sql/test/miscellaneous/Tests/All
sql/test/sys-schema/Tests/All
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
tools/merovingian/ChangeLog.Aug2018
tools/merovingian/daemon/Makefile.ag
tools/mserver/mserver5.1.in
tools/mserver/shutdowntest.c
Branch: analytics
Log Message:

Merge with default.


diffs (truncated from 1794 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,9 +1,9 @@
-%define name MonetDB
-%define version 11.32.0
+%global name MonetDB
+%global version 11.32.0
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
-# Use %bcond_with to add a --with option; i.e., "without" is default.
-# Use %bcond_without to add a --without option; i.e., "with" is default.
+# Use bcond_with to add a --with option; i.e., "without" is default.
+# Use bcond_without to add a --without option; i.e., "with" is default.
 # The --with OPTION and --without OPTION arguments can be passed on
 # the commandline of both rpmbuild and mock.
 
@@ -12,12 +12,12 @@
 %bcond_without hugeint
 %endif
 
-%define release %{buildno}%{?dist}
+%global release %{buildno}%{?dist}
 
 # On RedHat Enterprise Linux and derivatives, if the Extra Packages
 # for Enterprise Linux (EPEL) repository is available, you can enable
 # its use by providing rpmbuild or mock with the "--with epel" option.
-# If the EPEL repository is availabe, or if building for Fedora, all
+# If the EPEL repository is availabe, or if building for Fedora, most
 # optional sub packages can be built.  We indicate that here by
 # setting the macro fedpkgs to 1.  If the EPEL repository is not
 # available and we are not building for Fedora, we set fedpkgs to 0.
@@ -26,14 +26,14 @@
 %bcond_with epel
 %if %{with epel}
 # EPEL is enabled through the command line
-%define fedpkgs 1
+%global fedpkgs 1
 %else
 # EPEL is not enabled
-%define fedpkgs 0
+%global fedpkgs 0
 %endif
 %else
 # Not RHEL (so presumably Fedora)
-%define fedpkgs 1
+%global fedpkgs 1
 %endif
 
 # On Fedora, the geos library is available, and so we can require it
@@ -45,6 +45,7 @@
 # up-to-date version of RHEL.
 %if %{fedpkgs}
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
+# By default create the MonetDB-geom-MonetDB5 package on Fedora and RHEL 7
 %bcond_without geos
 %endif
 %endif
@@ -75,7 +76,7 @@
 %bcond_without pcre
 
 %if %{fedpkgs}
-# By default, create teh MonetDB-R package.
+# By default, create the MonetDB-R package.
 %bcond_without rintegration
 %endif
 
@@ -93,13 +94,6 @@
 %{!?__python2: %global __python2 %__python}
 %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from 
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
-# python3 option not currently used
-# %if 0%{?fedora}
-# %bcond_without python3
-# %else
-# %bcond_with python3
-# %endif
-
 Name: %{name}
 Version: %{version}
 Release: %{release}
@@ -425,8 +419,6 @@ developer.
 Summary: MonetDB5 SQL GIS support module
 Group: Applications/Databases
 Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
-Obsoletes: %{name}-geom
-Obsoletes: %{name}-geom-devel
 
 %description geom-MonetDB5
 MonetDB is a database management system that is developed from a
@@ -593,22 +585,10 @@ to use the SQL frontend, you also need %
 %pre -n MonetDB5-server
 getent group monetdb >/dev/null || groupadd -r monetdb
 getent passwd monetdb

MonetDB: analytics - Merge with default

2018-08-24 Thread Pedro Ferreira

Changeset: 5a23b1f40497 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a23b1f40497
Added Files:
sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.sql

sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.err

sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.out
sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.sql

sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err

sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.out
Modified Files:
MonetDB.spec
NT/rules.msc
clients/examples/C/Makefile.ag
clients/mapiclient/Makefile.ag
common/stream/Makefile.ag
common/stream/monetdb-stream.pc.in
configure.ag
geom/lib/Makefile.ag
geom/monetdb5/Makefile.ag
monetdb5/tools/monetdb5.pc.in
sql/test/BugTracker-2018/Tests/All
tools/merovingian/client/Makefile.ag
tools/merovingian/daemon/Makefile.ag
tools/mserver/Makefile.ag
Branch: analytics
Log Message:

Merge with default


diffs (truncated from 1465 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -2,29 +2,29 @@
 %define version 11.32.0
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
-# groups of related archs
-%define all_x86 i386 i586 i686
-
-%ifarch %{all_x86}
-%define bits 32
-%else
-%define bits 64
-%define with_int128 1
+# Use %bcond_with to add a --with option; i.e., "without" is default.
+# Use %bcond_without to add a --without option; i.e., "with" is default.
+# The --with OPTION and --without OPTION arguments can be passed on
+# the commandline of both rpmbuild and mock.
+
+# On 64 bit architectures we build "hugeint" packages.
+%if "%{?_lib}" == "lib64"
+%bcond_without hugeint
 %endif
 
 %define release %{buildno}%{?dist}
 
 # On RedHat Enterprise Linux and derivatives, if the Extra Packages
-# for Enterprise Linux (EPEL) repository is available, you can define
-# the _with_epel macro.  When using mock to build the RPMs, this can
-# be done using the --with=epel option to mock.
+# for Enterprise Linux (EPEL) repository is available, you can enable
+# its use by providing rpmbuild or mock with the "--with epel" option.
 # If the EPEL repository is availabe, or if building for Fedora, all
 # optional sub packages can be built.  We indicate that here by
 # setting the macro fedpkgs to 1.  If the EPEL repository is not
 # available and we are not building for Fedora, we set fedpkgs to 0.
 %if %{?rhel:1}%{!?rhel:0}
 # RedHat Enterprise Linux (or CentOS or Scientific Linux)
-%if %{?_with_epel:1}%{!?_with_epel:0}
+%bcond_with epel
+%if %{with epel}
 # EPEL is enabled through the command line
 %define fedpkgs 1
 %else
@@ -45,7 +45,7 @@
 # up-to-date version of RHEL.
 %if %{fedpkgs}
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-%define with_geos 1
+%bcond_without geos
 %endif
 %endif
 
@@ -55,73 +55,50 @@
 # available if EPEL is enabled, and then only on version 7.
 %if %{fedpkgs}
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-# If the _without_lidar macro is not set, the MonetDB-lidar RPM will
-# be created.  The macro can be set when using mock by passing it the
-# flag --without=lidar.
-%if %{?_without_lidar:0}%{!?_without_lidar:1}
-%define with_lidar 1
-%endif
+# By default create the MonetDB-lidar package on Fedora and RHEL 7
+%bcond_without lidar
 %endif
 %endif
 
 %if %{?rhel:0}%{!?rhel:1}
-# If the _without_samtools macro is not set, the MonetDB-bam-MonetDB5
-# RPM will be created.  The macro can be set when using mock by
-# passing it the flag --without=samtools.
+# By default create the MonetDB-bam-MonetDB5 package.
 # Note that the samtools-devel RPM is not available on RedHat
 # Enterprise Linux and derivatives, even with EPEL availabe.
 # (Actually, at the moment of writing, samtools-devel is available in
 # EPEL for RHEL 6, but not for RHEL 7.  We don't make the distinction
 # here and just not build the MonetDB-bam-MonetDB5 RPM.)
-%if %{?_without_samtools:0}%{!?_without_samtools:1}
-%define with_samtools 1
-%endif
+%bcond_without samtools
 %endif
 
-# If the _without_pcre macro is not set, the PCRE library is used for
-# the implementation of the SQL LIKE and ILIKE operators.  Otherwise
-# the POSIX regex functions are used.  The macro can be set when using
-# mock by passing it the flag --without=pcre.
-%if %{?_without_pcre:0}%{!?_without_pcre:1}
-%define with_pcre 1
+# By default use PCRE for the implementation of the SQL LIKE and ILIKE
+# operators.  Otherwise the POSIX regex functions are used.
+%bcond_without pcre
+
+%if %{fedpkgs}
+# By default, create teh MonetDB-R package.
+%bcond_without rintegration
+%endif
+
+# On Fedora and RHEL 7, create the MonetDB-python2 package.
+# On RHEL 6, numpy is too old.
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
+%bcond_without pyintegration
 %endif
 
 %if

MonetDB: analytics - Merge with default

2018-08-22 Thread Pedro Ferreira

Changeset: fb5e798b348a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb5e798b348a
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
NT/mksqlwxs.py
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
clients/ChangeLog-Archive
clients/ChangeLog.Aug2018
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/ChangeLog-Archive
common/stream/ChangeLog.Aug2018
common/stream/stream.c
common/stream/stream.h
configure.ag
debian/changelog
debian/control
gdk/ChangeLog
gdk/ChangeLog-Archive
gdk/ChangeLog.Aug2018
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc.h
gdk/gdk_hash.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_tm.c
gdk/gdk_utils.c
gdk/gdk_utils.h
gdk/libbat.rc
geom/monetdb5/geom_upgrade.c
libversions
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Aug2018
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/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/00_batcalc_hge.mal
monetdb5/modules/mal/00_batcalc_hge.mal.sh
monetdb5/modules/mal/01_batcalc.mal
monetdb5/modules/mal/01_batcalc.mal.sh
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
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog-Archive
sql/ChangeLog.Aug2018
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/server/rel_psm.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_utils.c
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql

sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
testing/ChangeLog-Archive
testing/ChangeLog.Aug2018
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Aug2018
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
vertoo.data
Branch: analytics
Log Message:

Merge with default


diffs (truncated from 6532 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -701,3 +701,8 @@ e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b
 ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_SP1_release
 e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b Mar2018_SP1_release
 44182a802530768278cf750fd93c829acdde29f1 Aug2018_root
+9c824ea44063e239b7251dce71f9af741c682211 Aug2018_1
+9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release
+2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_3
+9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release
+2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd 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:

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 - Merge with default.

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default

MonetDB: analytics - Merge with default

MonetDB: analytics - Merge with default

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default.

MonetDB: analytics - Merge with default

MonetDB: analytics - Merge with default

MonetDB: analytics - Merge with default

24 matches

Site Navigation

Mail list logo

Footer information