MonetDB: default - Merge with Aug2018 branch.

2018-10-08 Thread Sjoerd Mullender 
Changeset: dac95afa6436 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dac95afa6436
Added Files:
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
Modified Files:
clients/mapiclient/ReadlineTools.c
sql/backends/monet5/sql.c
sql/test/BugTracker-2018/Tests/All
Branch: default
Log Message:

Merge with Aug2018 branch.


diffs (truncated from 324 to 300 lines):

diff --git a/clients/mapiclient/ReadlineTools.c 
b/clients/mapiclient/ReadlineTools.c
--- a/clients/mapiclient/ReadlineTools.c
+++ b/clients/mapiclient/ReadlineTools.c
@@ -136,7 +136,7 @@ sql_completion(const char *text, int sta
 
 /* The MAL completion help */
 
-static char *mal_commands[] = {
+static const char *mal_commands[] = {
"address",
"atom",
"barrier",
@@ -209,7 +209,8 @@ mal_command_generator(const char *text, 
static int64_t seekpos, rowcount;
static size_t len;
static MapiHdl table_hdl;
-   char *name, *buf;
+   const char *name;
+   char *buf;
 
/* we pick our own portion of the linebuffer */
text = rl_line_buffer + strlen(rl_line_buffer) - 1;
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -1768,58 +1768,42 @@ DELTAproject(bat *result, const bat *sub
}
 
if (BATcount(u_val)) {
-   BAT *o, *nu_id, *nu_val;
-   /* create subsets of u_id and u_val where the tail
-* values of u_id are also in s, and where those tail
-* values occur as head value in res */
-   if ((o = BATintersect(u_id, s, NULL, NULL, false, BUN_NONE)) == 
NULL) {
+   BAT *os, *ou;
+   /* figure out the positions in res that we have to
+* replace with values from u_val */
+   if (BATsemijoin(&ou, &os, u_id, s, NULL, NULL, false, BUN_NONE) 
!= GDK_SUCCEED) {
BBPunfix(s->batCacheid);
BBPunfix(res->batCacheid);
BBPunfix(u_id->batCacheid);
BBPunfix(u_val->batCacheid);
throw(MAL, "sql.delta", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
}
-   nu_id = BATproject(o, u_id);
-   nu_val = BATproject(o, u_val);
-   BBPunfix(u_id->batCacheid);
-   BBPunfix(u_val->batCacheid);
-   BBPunfix(o->batCacheid);
-   tres = BATdense(res->hseqbase, res->hseqbase, BATcount(res));
-   if (nu_id == NULL ||
-   nu_val == NULL ||
-   tres == NULL ||
-   (o = BATintersect(nu_id, tres, NULL, NULL, false, 
BUN_NONE)) == NULL) {
-   BBPunfix(s->batCacheid);
-   BBPunfix(res->batCacheid);
-   BBPreclaim(nu_id);
-   BBPreclaim(nu_val);
-   BBPreclaim(tres);
-   throw(MAL, "sql.delta", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
+   /* BATcount(ou) == BATcount(os) */
+   if (BATcount(ou) != 0) {
+   /* ou contains the position in u_id/u_val that
+* contain the new values */
+   BAT *nu_val = BATproject(ou, u_val);
+   BBPunfix(ou->batCacheid);
+   /* os contains the corresponding positions in
+* res that need to be replaced with those new
+* values */
+   if ((res = setwritable(res)) == NULL ||
+   BATreplace(res, os, nu_val, false) != GDK_SUCCEED) {
+   if (res)
+   BBPunfix(res->batCacheid);
+   BBPunfix(os->batCacheid);
+   BBPunfix(s->batCacheid);
+   BBPunfix(u_id->batCacheid);
+   BBPunfix(u_val->batCacheid);
+   BBPunfix(nu_val->batCacheid);
+   throw(MAL, "sql.delta", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
+   }
+   BBPunfix(nu_val->batCacheid);
+   } else {
+   /* nothing to replace */
+   BBPunfix(ou->batCacheid);
}
-   BBPunfix(tres->batCacheid);
-   u_id = BATproject(o, nu_id);
-   u_val = BATproject(o, nu_val);
-   BBPunfix(nu_id->batCacheid);
-   BBPunfix(nu_val->batCacheid);
-   BBPunfix(o->batCacheid);
-   if (u_id == NULL || u_val == NULL) {
-   B

MonetDB: Aug2018 - Fix a thinko in sql.projectdelta.

2018-10-08 Thread Sjoerd Mullender 
Changeset: 633eafe2042a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=633eafe2042a
Modified Files:
sql/backends/monet5/sql.c
Branch: Aug2018
Log Message:

Fix a thinko in sql.projectdelta.
This fixes bug 6649.


diffs (91 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -1709,58 +1709,42 @@ DELTAproject(bat *result, const bat *sub
}
 
if (BATcount(u_val)) {
-   BAT *o, *nu_id, *nu_val;
-   /* create subsets of u_id and u_val where the tail
-* values of u_id are also in s, and where those tail
-* values occur as head value in res */
-   if ((o = BATintersect(u_id, s, NULL, NULL, false, BUN_NONE)) == 
NULL) {
+   BAT *os, *ou;
+   /* figure out the positions in res that we have to
+* replace with values from u_val */
+   if (BATsemijoin(&ou, &os, u_id, s, NULL, NULL, false, BUN_NONE) 
!= GDK_SUCCEED) {
BBPunfix(s->batCacheid);
BBPunfix(res->batCacheid);
BBPunfix(u_id->batCacheid);
BBPunfix(u_val->batCacheid);
throw(MAL, "sql.delta", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
}
-   nu_id = BATproject(o, u_id);
-   nu_val = BATproject(o, u_val);
-   BBPunfix(u_id->batCacheid);
-   BBPunfix(u_val->batCacheid);
-   BBPunfix(o->batCacheid);
-   tres = BATdense(res->hseqbase, res->hseqbase, BATcount(res));
-   if (nu_id == NULL ||
-   nu_val == NULL ||
-   tres == NULL ||
-   (o = BATintersect(nu_id, tres, NULL, NULL, false, 
BUN_NONE)) == NULL) {
-   BBPunfix(s->batCacheid);
-   BBPunfix(res->batCacheid);
-   BBPreclaim(nu_id);
-   BBPreclaim(nu_val);
-   BBPreclaim(tres);
-   throw(MAL, "sql.delta", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
+   /* BATcount(ou) == BATcount(os) */
+   if (BATcount(ou) != 0) {
+   /* ou contains the position in u_id/u_val that
+* contain the new values */
+   BAT *nu_val = BATproject(ou, u_val);
+   BBPunfix(ou->batCacheid);
+   /* os contains the corresponding positions in
+* res that need to be replaced with those new
+* values */
+   if ((res = setwritable(res)) == NULL ||
+   BATreplace(res, os, nu_val, false) != GDK_SUCCEED) {
+   if (res)
+   BBPunfix(res->batCacheid);
+   BBPunfix(os->batCacheid);
+   BBPunfix(s->batCacheid);
+   BBPunfix(u_id->batCacheid);
+   BBPunfix(u_val->batCacheid);
+   BBPunfix(nu_val->batCacheid);
+   throw(MAL, "sql.delta", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
+   }
+   BBPunfix(nu_val->batCacheid);
+   } else {
+   /* nothing to replace */
+   BBPunfix(ou->batCacheid);
}
-   BBPunfix(tres->batCacheid);
-   u_id = BATproject(o, nu_id);
-   u_val = BATproject(o, nu_val);
-   BBPunfix(nu_id->batCacheid);
-   BBPunfix(nu_val->batCacheid);
-   BBPunfix(o->batCacheid);
-   if (u_id == NULL || u_val == NULL) {
-   BBPunfix(s->batCacheid);
-   BBPunfix(res->batCacheid);
-   BBPreclaim(u_id);
-   BBPreclaim(u_val);
-   throw(MAL, "sql.delta", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
-   }
-   /* now update res with the subset of u_id and u_val we
-* calculated */
-   if ((res = setwritable(res)) == NULL ||
-   BATreplace(res, u_id, u_val, false) != GDK_SUCCEED) {
-   if (res)
-   BBPunfix(res->batCacheid);
-   BBPunfix(s->batCacheid);
-   BBPunfix(u_id->batCacheid);
-   BBPunfix(u_val->batCacheid);
-   throw(MAL, "sql.delta", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
-   }
+   BBPunfix(os->batCacheid);
}
BBPunfix(s->batCacheid);
BBPunfix(u_id->batCacheid);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/m

MonetDB: Aug2018 - const char *.

2018-10-08 Thread Sjoerd Mullender 
Changeset: 7eaf5adbf9be for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7eaf5adbf9be
Modified Files:
clients/mapiclient/ReadlineTools.c
Branch: Aug2018
Log Message:

const char *.


diffs (22 lines):

diff --git a/clients/mapiclient/ReadlineTools.c 
b/clients/mapiclient/ReadlineTools.c
--- a/clients/mapiclient/ReadlineTools.c
+++ b/clients/mapiclient/ReadlineTools.c
@@ -136,7 +136,7 @@ sql_completion(const char *text, int sta
 
 /* The MAL completion help */
 
-static char *mal_commands[] = {
+static const char *mal_commands[] = {
"address",
"atom",
"barrier",
@@ -209,7 +209,8 @@ mal_command_generator(const char *text, 
static int64_t seekpos, rowcount;
static size_t len;
static MapiHdl table_hdl;
-   char *name, *buf;
+   const char *name;
+   char *buf;
 
/* we pick our own portion of the linebuffer */
text = rl_line_buffer + strlen(rl_line_buffer) - 1;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: rename-sql - Small cleanup.

2018-10-08 Thread Pedro Ferreira 
Changeset: 66b722f968c9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66b722f968c9
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql_cat.c
sql/server/sql_mvc.c
sql/storage/store.c
Branch: rename-sql
Log Message:

Small cleanup.


diffs (240 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -273,7 +273,7 @@ SQLshutdown_wrap(Client cntxt, MalBlkPtr
 }
 
 str
-create_table_or_view(mvc *sql, char* sname, char *tname, sql_table *t, int 
temp, sqlid reuse, bool rename)
+create_table_or_view(mvc *sql, char* sname, char *tname, sql_table *t, int 
temp, sqlid reuse)
 {
sql_allocator *osa;
sql_schema *s = mvc_bind_schema(sql, sname);
@@ -284,7 +284,7 @@ create_table_or_view(mvc *sql, char* sna
if (STORE_READONLY)
return sql_error(sql, 06, "25006!schema statements cannot be 
executed on a readonly database.");
 
-   if(!rename) {
+   if(!reuse) {
if (!s)
return sql_message(SQLSTATE(3F000) "CREATE %s: schema 
'%s' doesn't exist", (t->query) ? "TABLE" : "VIEW", sname);
if (mvc_bind_table(sql, s, t->base.name)) {
@@ -303,7 +303,7 @@ create_table_or_view(mvc *sql, char* sna
sql->sa = NULL;
 
nt = sql_trans_create_table(sql->session->tr, s, tname, t->query, 
t->type, t->system, temp, t->commit_action,
-   t->sz, 
t->properties, reuse ? reuse : 0);
+   t->sz, 
t->properties, reuse);
 
/* first check default values */
for (n = t->columns.set->h; n; n = n->next) {
@@ -341,7 +341,7 @@ create_table_or_view(mvc *sql, char* sna
sql->sa = osa;
throw(SQL, "sql.catalog", SQLSTATE(42000) "%s", 
sql->errstr);
}
-   if(!rename) {
+   if(!reuse) {
id_l = rel_dependencies(sql, r);
mvc_create_dependencies(sql, id_l, nt->base.id, 
FUNC_DEPENDENCY);
}
@@ -352,7 +352,7 @@ create_table_or_view(mvc *sql, char* sna
}
 
for (n = t->columns.set->h; n; n = n->next) {
-   sql_column *c = n->data, *copied = mvc_copy_column(sql, nt, c, 
NULL, !rename);
+   sql_column *c = n->data, *copied = mvc_copy_column(sql, nt, c, 
NULL, !reuse);
 
if (copied == NULL) {
sql->sa = osa;
@@ -372,7 +372,7 @@ create_table_or_view(mvc *sql, char* sna
throw(SQL, "sql.catalog",SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
}
 
-   err = bootstrap_partition_expression(sql, sql->session->tr->sa, 
nt, 1, !rename);
+   err = bootstrap_partition_expression(sql, sql->session->tr->sa, 
nt, 1, !reuse);
sa_destroy(sql->sa);
sql->sa = NULL;
if(err) {
@@ -380,7 +380,7 @@ create_table_or_view(mvc *sql, char* sna
return err;
}
}
-   if(!rename) {
+   if(!reuse) {
check = sql_trans_set_partition_table(sql->session->tr, nt);
if(check == -1) {
sql->sa = osa;
@@ -394,7 +394,7 @@ create_table_or_view(mvc *sql, char* sna
if (t->idxs.set) {
for (n = t->idxs.set->h; n; n = n->next) {
sql_idx *i = n->data;
-   mvc_copy_idx(sql, nt, i, !rename);
+   mvc_copy_idx(sql, nt, i, !reuse);
}
}
if (t->keys.set) {
@@ -415,23 +415,23 @@ create_table_or_view(mvc *sql, char* sna
sql->sa = osa;
return err;
}
-   mvc_copy_key(sql, nt, k, !rename);
+   mvc_copy_key(sql, nt, k, !reuse);
}
}
if (t->members.set) {
for (n = t->members.set->h; n; n = n->next) {
sql_part *pt = n->data;
-   mvc_copy_part(sql, nt, pt, !rename);
+   mvc_copy_part(sql, nt, pt, !reuse);
}
}
if (t->triggers.set) {
for (n = t->triggers.set->h; n; n = n->next) {
sql_trigger *tr = n->data;
-   mvc_copy_trigger(sql, nt, tr, !rename);
+   mvc_copy_trigger(sql, nt, tr, !reuse);
}
}
/* also create dependencies when not renaming */
-   if (!rename && nt->query && isView(nt)) {
+   if (!reuse && nt->query && isView(nt)) {
sql_rel *r = NULL;
 
sql->sa = sa_create();

MonetDB: Aug2018 - Added test and output for bug 6649.

2018-10-08 Thread Pedro Ferreira 
Changeset: 0c647922bc86 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c647922bc86
Added Files:
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
Modified Files:
sql/test/BugTracker-2018/Tests/All
Branch: Aug2018
Log Message:

Added test and output for bug 6649.


diffs (211 lines):

diff --git a/sql/test/BugTracker-2018/Tests/All 
b/sql/test/BugTracker-2018/Tests/All
--- a/sql/test/BugTracker-2018/Tests/All
+++ b/sql/test/BugTracker-2018/Tests/All
@@ -84,3 +84,4 @@ crash-after-call-non-existing-loader
 timestamp-as-boolean.Bug-6642
 timestamp-roundtrip.Bug-6640
 convert-key.Bug-6648
+update-transaction-select.Bug-6649
diff --git 
a/sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.sql 
b/sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.sql
@@ -0,0 +1,28 @@
+start transaction;
+create table updating (a int);
+insert into updating values (1), (2);
+update updating set a = 3 where a = 2;
+select a from updating where a = 3;
+rollback;
+
+create table updating (a int);
+insert into updating values (2);
+start transaction;
+update updating set a = 3 where a = 2;
+select a from updating where a = 3;
+rollback;
+
+truncate updating;
+insert into updating values (1), (1);
+start transaction;
+update updating set a = 3 where a = 2;
+select a from updating where a = 3;
+rollback;
+
+truncate updating;
+insert into updating values (1), (2);
+start transaction;
+update updating set a = 3 where a = 2;
+select a from updating where a = 3;
+rollback;
+drop table updating;
diff --git 
a/sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.err 
b/sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.err
new file mode 100644
--- /dev/null
+++ 
b/sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'update-transaction-select.Bug-6649` in directory 
'sql/test/BugTracker-2018` itself:
+
+
+# 14:20:45 >  
+# 14:20:45 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=31957" "--set" 
"mapi_usock=/var/tmp/mtest-3236/.s.monetdb.31957" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018"
 "--set" "embedded_c=true"
+# 14:20:45 >  
+
+# builtin opt  gdk_dbpath = 
/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_vmtrim = no
+# builtin opt  monet_prompt = >
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 31957
+# cmdline opt  mapi_usock = /var/tmp/mtest-3236/.s.monetdb.31957
+# cmdline opt  monet_prompt = 
+# cmdline opt  gdk_dbpath = 
/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt  embedded_c = true
+# cmdline opt  gdk_debug = 553648138
+
+# 14:20:45 >  
+# 14:20:45 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-3236" "--port=31957"
+# 14:20:45 >  
+
+
+# 14:20:46 >  
+# 14:20:46 >  "Done."
+# 14:20:46 >  
+
diff --git 
a/sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.out 
b/sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.out
new file mode 100644
--- /dev/null
+++ 
b/sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.out
@@ -0,0 +1,125 @@
+stdout of test 'update-transaction-select.Bug-6649` in directory 
'sql/test/BugTracker-2018` itself:
+
+
+# 14:20:45 >  
+# 14:20:45 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=31957" "--set" 
"mapi_usock=/var/tmp/mtest-3236/.s.monetdb.31957" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018"
 "--set" "embedded_c=true"
+# 14:20:45 >  
+
+# MonetDB 5 server v11.31.8
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.492 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://wired-142.cwi.nl:31957/
+# Listening for UNIX domain connectio

MonetDB: sample-with-seed - Merge with default.

2018-10-08 Thread Aris Koning 
Changeset: 363afbf1d35c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=363afbf1d35c
Added Files:
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
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
clients/Tests/exports.stable.out
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/gdk_calc.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/libbat.rc
geom/monetdb5/geom_upgrade.c
libversions
monetdb5/tools/libmonetdb5.rc
sql/include/sql_catalog.h
sql/server/rel_select.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/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: sample-with-seed
Log Message:

Merge with default.


diffs (truncated from 3691 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -712,3 +712,5 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655
 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_7
 3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release
 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release
+a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_9
+a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -108,7 +108,7 @@ Vendor: MonetDB BV 
 Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Aug2018/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Aug2018-SP1/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 # we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -350,7 +350,8 @@ This package contains the files needed t
 Summary: MonetDB ODBC driver
 Group: Applications/Databases
 Requires: %{name}-client%{?_isa} = %{version}-%{release}
-Requires(pre): unixODBC
+Requires(post): unixODBC
+Requires(postun): unixODBC
 
 %description client-odbc
 MonetDB is a database management system that is developed from a
@@ -737,10 +738,10 @@ used from the MAL level.
 %package SQL-server5
 Summary: MonetDB5 SQL server modules
 Group: Applications/Databases
-Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release}
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
 # RHEL >= 7, and all current Fedora
-Requires: %{_bindir}/systemd-tmpfiles
+Requires(post): %{_bindir}/systemd-tmpfiles
 %endif
 %if (0%{?fedora} >= 22)
 %if %{with hugeint}
@@ -881,9 +882,12 @@ Group: Applications/Databases
 %if "%{?_selinux_policy_version}" != ""
 Requires:   selinux-policy >= %{?_selinux_policy_version}
 %endif
-Requires:   %{name}-SQL-server5 = %{version}-%{release}
-Requires(post):   /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles, 
MonetDB-SQL-server5, MonetDB5-server
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles, 
MonetDB-SQL-server5, MonetDB5-server
+Requires(post):   MonetDB5-server = %{version}-%{release}
+Requires(postun): MonetDB5-server
+Requires(post):   %{name}-SQL-server5 = %{version}-%{release}
+Requires(postun): %{name}-SQL-server5
+Requires(post):   /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
+Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
 BuildArch: noarch
 
 %global selinux_types %(%{__awk} '/^#[[:space:]]*SELINUXTYPE=/,/^[^#]/ { if 
($3 == "-") printf "%s ", $2 }' /etc/selinux/config 2>/dev/null)
@@ -1038,6 +1042,18 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Oct 05 2018 Sjoerd Mullender  - 11.31.9-20181005
+- Rebuilt.
+- BZ#6640: timestamp_to_str returning incorrectly adjusted results
+- BZ#6641: race condition in SQL UDF with update
+- BZ#6642: Hanging query
+- BZ#6646: Example SQLcopyinto.java does not work
+
+* 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.
+
 * Wed Aug 29 2018 Sjoerd Mullender  - 11.31.7-20180829
 - Rebuilt.
 
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_confi

MonetDB: sample-with-seed - Approved new signatures.

2018-10-08 Thread Sjoerd Mullender 
Changeset: 83d4eae46a59 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83d4eae46a59
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
Branch: sample-with-seed
Log Message:

Approved new signatures.


diffs (32 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
@@ -10897,8 +10897,10 @@ Ready.
 [ "sabaoth",   "marchScenario","command 
sabaoth.marchScenario(lang:str):void ","SABmarchScenario;",
"Publishes the given language as available for this server" ]
 [ "sabaoth",   "prelude",  "command sabaoth.prelude():void ",  
"SABprelude;",  "Initialise the sabaoth module" ]
 [ "sabaoth",   "retreatScenario",  "command 
sabaoth.retreatScenario(lang:str):void ",  "SABretreatScenario;",  
"Unpublishes the given language as available for this server"   ]
-[ "sample","subuniform",   "command sample.subuniform(b:bat[:any], 
s:lng):bat[:oid] ", "SAMPLEuniform;",   "Returns the oids of a uniform 
sample of size s"]
-[ "sample","subuniform",   "command sample.subuniform(b:bat[:any], 
p:dbl):bat[:oid] ", "SAMPLEuniform_dbl;",   "Returns the oids of a uniform 
sample of size = (p x count(b)), where 0 <= p <= 1.0"]
+[ "sample","subuniform",   "pattern sample.subuniform(b:bat[:any], 
p:dbl):bat[:oid] ", "SAMPLEuniform;",   "Returns the oids of a uniform 
sample of size = (p x count(b)), where 0 <= p <= 1.0"]
+[ "sample","subuniform",   "pattern sample.subuniform(b:bat[:any], p:dbl, 
sample_seed:int):bat[:oid] ","SAMPLEuniform;",   "Returns the oids of a 
uniform sample of size = (p x count(b)), where 0 <= p <= 1.0 and where the prg 
is seeded with sample_seed"   ]
+[ "sample","subuniform",   "pattern sample.subuniform(b:bat[:any], 
sample_size:lng):bat[:oid] ",   "SAMPLEuniform;",   "Returns the oids of a 
uniform sample of size s"]
+[ "sample","subuniform",   "pattern sample.subuniform(b:bat[:any], 
sample_size:lng, sample_seed:int):bat[:oid] ",  "SAMPLEuniform;",   
"Returns the oids of a uniform sample of size s and where the prg is seeded 
with sample_seed"   ]
 [ "shp",   "attach",   "pattern shp.attach(filename:str):void ",   
"SHPattach;",   "Register an ESRI Shapefile in the vault catalog"   ]
 [ "shp",   "import",   "pattern shp.import(fileid:int):void ", 
"SHPimport;",   "Import an ESRI Shapefile with given id into the vault" ]
 [ "shp",   "import",   "pattern shp.import(fileid:int, po:wkb):void ", 
"SHPpartialimport;","Partially import an ESRI Shapefile with given id into 
the vault"   ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128 
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -15112,8 +15112,10 @@ Ready.
 [ "sabaoth",   "marchScenario","command 
sabaoth.marchScenario(lang:str):void ","SABmarchScenario;",
"Publishes the given language as available for this server" ]
 [ "sabaoth",   "prelude",  "command sabaoth.prelude():void ",  
"SABprelude;",  "Initialise the sabaoth module" ]
 [ "sabaoth",   "retreatScenario",  "command 
sabaoth.retreatScenario(lang:str):void ",  "SABretreatScenario;",  
"Unpublishes the given language as available for this server"   ]
-[ "sample","subuniform",   "command sample.subuniform(b:bat[:any], 
s:lng):bat[:oid] ", "SAMPLEuniform;",   "Returns the oids of a uniform 
sample of size s"]
-[ "sample","subuniform",   "command sample.subuniform(b:bat[:any], 
p:dbl):bat[:oid] ", "SAMPLEuniform_dbl;",   "Returns the oids of a uniform 
sample of size = (p x count(b)), where 0 <= p <= 1.0"]
+[ "sample","subuniform",   "pattern sample.subuniform(b:bat[:any], 
p:dbl):bat[:oid] ", "SAMPLEuniform;",   "Returns the oids of a uniform 
sample of size = (p x count(b)), where 0 <= p <= 1.0"]
+[ "sample","subuniform",   "pattern sample.subuniform(b:bat[:any], p:dbl, 
sample_seed:int):bat[:oid] ","SAMPLEuniform;",   "Returns the oids of a 
uniform sample of size = (p x count(b)), where 0 <= p <= 1.0 and where the prg 
is seeded with sample_seed"   ]
+[ "sample","subuniform",   "pattern sample.subuniform(b:bat[:any], 
sample_size:lng):bat[:oid] ",   "SAMPLEuniform;",   "Returns the oids of a 
uniform sample of size s"]
+[ "sample","subuniform",   "pattern sample.subuniform(b:bat[:any], 
sample_size:lng, sample_seed:int):bat[:oid] ",  "SAMPLEuniform;",   
"Returns the oids of a uniform sample of size s and where the prg is seeded 
with sample_seed"   ]
 [ "shp",   "attach",   "pattern shp.attach(filename:str):void ",   
"SHPattach;",   "Register an E

MonetDB: default - Merge with Aug2018 branch.

2018-10-08 Thread Sjoerd Mullender 
Changeset: 22fcb5f4590a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22fcb5f4590a
Added Files:
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
Modified Files:
MonetDB.spec
gdk/gdk_calc.c
sql/server/rel_select.c
sql/test/BugTracker-2018/Tests/All
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
Branch: default
Log Message:

Merge with Aug2018 branch.


diffs (truncated from 1441 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -350,7 +350,8 @@ This package contains the files needed t
 Summary: MonetDB ODBC driver
 Group: Applications/Databases
 Requires: %{name}-client%{?_isa} = %{version}-%{release}
-Requires(pre): unixODBC
+Requires(post): unixODBC
+Requires(postun): unixODBC
 
 %description client-odbc
 MonetDB is a database management system that is developed from a
@@ -737,10 +738,10 @@ used from the MAL level.
 %package SQL-server5
 Summary: MonetDB5 SQL server modules
 Group: Applications/Databases
-Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release}
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
 # RHEL >= 7, and all current Fedora
-Requires: %{_bindir}/systemd-tmpfiles
+Requires(post): %{_bindir}/systemd-tmpfiles
 %endif
 %if (0%{?fedora} >= 22)
 %if %{with hugeint}
@@ -881,9 +882,12 @@ Group: Applications/Databases
 %if "%{?_selinux_policy_version}" != ""
 Requires:   selinux-policy >= %{?_selinux_policy_version}
 %endif
-Requires:   %{name}-SQL-server5 = %{version}-%{release}
-Requires(post):   /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles, 
MonetDB-SQL-server5, MonetDB5-server
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles, 
MonetDB-SQL-server5, MonetDB5-server
+Requires(post):   MonetDB5-server = %{version}-%{release}
+Requires(postun): MonetDB5-server
+Requires(post):   %{name}-SQL-server5 = %{version}-%{release}
+Requires(postun): %{name}-SQL-server5
+Requires(post):   /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
+Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
 BuildArch: noarch
 
 %global selinux_types %(%{__awk} '/^#[[:space:]]*SELINUXTYPE=/,/^[^#]/ { if 
($3 == "-") printf "%s ", $2 }' /etc/selinux/config 2>/dev/null)
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -241,12 +241,12 @@ BATcalcnot(BAT *b, BAT *s)
bn->tkey = b->tkey;
 
if (nils != 0 && !b->tnil) {
-   b->tnil = 1;
-   b->batDirtydesc = 1;
+   b->tnil = true;
+   b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
-   b->tnonil = 1;
-   b->batDirtydesc = 1;
+   b->tnonil = true;
+   b->batDirtydesc = true;
}
 
return bn;
@@ -360,12 +360,12 @@ BATcalcnegate(BAT *b, BAT *s)
bn->tkey = b->tkey;
 
if (nils != 0 && !b->tnil) {
-   b->tnil = 1;
-   b->batDirtydesc = 1;
+   b->tnil = true;
+   b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
-   b->tnonil = 1;
-   b->batDirtydesc = 1;
+   b->tnonil = true;
+   b->batDirtydesc = true;
}
 
return bn;
@@ -489,12 +489,12 @@ BATcalcabsolute(BAT *b, BAT *s)
bn->tnonil = nils == 0;
 
if (nils && !b->tnil) {
-   b->tnil = 1;
-   b->batDirtydesc = 1;
+   b->tnil = true;
+   b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
-   b->tnonil = 1;
-   b->batDirtydesc = 1;
+   b->tnonil = true;
+   b->batDirtydesc = true;
}
 
return bn;
@@ -617,12 +617,12 @@ BATcalciszero(BAT *b, BAT *s)
bn->tnonil = nils == 0;
 
if (nils != 0 && !b->tnil) {
-   b->tnil = 1;
-   b->batDirtydesc = 1;
+   b->tnil = true;
+   b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
-   b->tnonil = 1;
-   b->batDirtydesc = 1;
+   b->tnonil = true;
+   b->batDirtydesc = true;
}
 
return bn;
@@ -749,12 +749,12 @@ BATcalcsign(BAT *b, BAT *s)
bn->tnonil = nils == 0;
 
if (nils != 0 && !b->tnil) {
-   b->tnil = 1;
-   b->batDirtydesc = 1;
+   b->tnil = true;
+   b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
-   b->tnonil = 1

MonetDB: Aug2018 - Fix setting of key property in convert.

2018-10-08 Thread Sjoerd Mullender 
Changeset: 3039e5ecc347 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3039e5ecc347
Added Files:
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
Modified Files:
gdk/gdk_calc.c
sql/test/BugTracker-2018/Tests/All
Branch: Aug2018
Log Message:

Fix setting of key property in convert.
This fixes bug 6648.


diffs (truncated from 911 to 300 lines):

diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -13323,10 +13323,11 @@ BATcalcifthencstelsecst(BAT *b, const Va
 static BUN \
 convert_##TYPE##_##TYPE(const TYPE *src, TYPE *restrict dst, BUN cnt,  \
BUN start, BUN end, const oid *restrict cand,   \
-   const oid *candend, oid candoff)\
+   const oid *candend, oid candoff, bool *reduce)  \
 {  \
BUN i, nils = 0;\
\
+   *reduce = false;\
CANDLOOP(dst, i, TYPE##_nil, 0, start); \
for (i = start; i < end; i++) { \
CHECKCAND(dst, i, candoff, TYPE##_nil); \
@@ -13341,10 +13342,33 @@ convert_##TYPE##_##TYPE(const TYPE *src,
 static BUN \
 convert_##TYPE1##_##TYPE2(const TYPE1 *src, TYPE2 *restrict dst, BUN cnt, \
  BUN start, BUN end, const oid *restrict cand, \
- const oid *candend, oid candoff)  \
+ const oid *candend, oid candoff, bool *reduce) \
 {  \
BUN i, nils = 0;\
\
+   *reduce = false;\
+   CANDLOOP(dst, i, TYPE2##_nil, 0, start);\
+   for (i = start; i < end; i++) { \
+   CHECKCAND(dst, i, candoff, TYPE2##_nil);\
+   if (is_##TYPE1##_nil(src[i])) { \
+   dst[i] = TYPE2##_nil;   \
+   nils++; \
+   } else  \
+   dst[i] = (TYPE2) src[i];\
+   }   \
+   CANDLOOP(dst, i, TYPE2##_nil, end, cnt);\
+   return nils;\
+}
+
+#define convertimpl_enlarge_float(TYPE1, TYPE2, MANT_DIG)  \
+static BUN \
+convert_##TYPE1##_##TYPE2(const TYPE1 *src, TYPE2 *restrict dst, BUN cnt, \
+ BUN start, BUN end, const oid *restrict cand, \
+ const oid *candend, oid candoff, bool *reduce) \
+{  \
+   BUN i, nils = 0;\
+   \
+   *reduce = 8 * sizeof(TYPE1) > MANT_DIG; \
CANDLOOP(dst, i, TYPE2##_nil, 0, start);\
for (i = start; i < end; i++) { \
CHECKCAND(dst, i, candoff, TYPE2##_nil);\
@@ -13370,10 +13394,11 @@ static BUN
\
 convert_##TYPE1##_oid(const TYPE1 *src, oid *restrict dst, BUN cnt,\
  BUN start, BUN end, const oid *restrict cand, \
  const oid *candend, oid candoff,  \
- int abort_on_error)   \
+ int abort_on_error, bool *reduce) \
 {  \
BUN i, nils = 0;\
\
+   *reduce = false;\
CANDLOOP(dst, i, oid_nil, 0, start);\
for (i = start; i < end; i++) { \
CHECKCAND(dst, i, candoff, oid_nil);

MonetDB: Aug2018 - Use bool.

2018-10-08 Thread Sjoerd Mullender 
Changeset: 8387e8b87689 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8387e8b87689
Modified Files:
gdk/gdk_calc.c
Branch: Aug2018
Log Message:

Use bool.


diffs (291 lines):

diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -241,12 +241,12 @@ BATcalcnot(BAT *b, BAT *s)
bn->tkey = b->tkey;
 
if (nils != 0 && !b->tnil) {
-   b->tnil = 1;
-   b->batDirtydesc = 1;
+   b->tnil = true;
+   b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
-   b->tnonil = 1;
-   b->batDirtydesc = 1;
+   b->tnonil = true;
+   b->batDirtydesc = true;
}
 
return bn;
@@ -360,12 +360,12 @@ BATcalcnegate(BAT *b, BAT *s)
bn->tkey = b->tkey;
 
if (nils != 0 && !b->tnil) {
-   b->tnil = 1;
-   b->batDirtydesc = 1;
+   b->tnil = true;
+   b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
-   b->tnonil = 1;
-   b->batDirtydesc = 1;
+   b->tnonil = true;
+   b->batDirtydesc = true;
}
 
return bn;
@@ -489,12 +489,12 @@ BATcalcabsolute(BAT *b, BAT *s)
bn->tnonil = nils == 0;
 
if (nils && !b->tnil) {
-   b->tnil = 1;
-   b->batDirtydesc = 1;
+   b->tnil = true;
+   b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
-   b->tnonil = 1;
-   b->batDirtydesc = 1;
+   b->tnonil = true;
+   b->batDirtydesc = true;
}
 
return bn;
@@ -617,12 +617,12 @@ BATcalciszero(BAT *b, BAT *s)
bn->tnonil = nils == 0;
 
if (nils != 0 && !b->tnil) {
-   b->tnil = 1;
-   b->batDirtydesc = 1;
+   b->tnil = true;
+   b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
-   b->tnonil = 1;
-   b->batDirtydesc = 1;
+   b->tnonil = true;
+   b->batDirtydesc = true;
}
 
return bn;
@@ -749,12 +749,12 @@ BATcalcsign(BAT *b, BAT *s)
bn->tnonil = nils == 0;
 
if (nils != 0 && !b->tnil) {
-   b->tnil = 1;
-   b->batDirtydesc = 1;
+   b->tnil = true;
+   b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
-   b->tnonil = 1;
-   b->batDirtydesc = 1;
+   b->tnonil = true;
+   b->batDirtydesc = true;
}
 
return bn;
@@ -1010,14 +1010,14 @@ BATcalcmin(BAT *b1, BAT *b2, BAT *s)
bn->tnil = nils > 0;
bn->tnonil = nils == 0;
if (cnt <= 1) {
-   bn->tsorted = 1;
-   bn->trevsorted = 1;
-   bn->tkey = 1;
+   bn->tsorted = true;
+   bn->trevsorted = true;
+   bn->tkey = true;
bn->tseqbase = ATOMtype(b1->ttype) == TYPE_oid ? cnt == 1 ? 
*(oid*)Tloc(bn,0) : 0 : oid_nil;
} else {
-   bn->tsorted = 0;
-   bn->trevsorted = 0;
-   bn->tkey = 0;
+   bn->tsorted = false;
+   bn->trevsorted = false;
+   bn->tkey = false;
bn->tseqbase = oid_nil;
}
return bn;
@@ -1094,14 +1094,14 @@ BATcalcmin_no_nil(BAT *b1, BAT *b2, BAT 
bn->tnil = nils > 0;
bn->tnonil = nils == 0;
if (cnt <= 1) {
-   bn->tsorted = 1;
-   bn->trevsorted = 1;
-   bn->tkey = 1;
+   bn->tsorted = true;
+   bn->trevsorted = true;
+   bn->tkey = true;
bn->tseqbase = ATOMtype(b1->ttype) == TYPE_oid ? cnt == 1 ? 
*(oid*)Tloc(bn,0) : 0 : oid_nil;
} else {
-   bn->tsorted = 0;
-   bn->trevsorted = 0;
-   bn->tkey = 0;
+   bn->tsorted = false;
+   bn->trevsorted = false;
+   bn->tkey = false;
bn->tseqbase = oid_nil;
}
return bn;
@@ -1173,14 +1173,14 @@ BATcalcmincst(BAT *b, const ValRecord *v
bn->tnil = nils > 0;
bn->tnonil = nils == 0;
if (cnt <= 1) {
-   bn->tsorted = 1;
-   bn->trevsorted = 1;
-   bn->tkey = 1;
+   bn->tsorted = true;
+   bn->trevsorted = true;
+   bn->tkey = true;
bn->tseqbase = ATOMtype(bn->ttype) == TYPE_oid ? cnt == 1 ? 
*(oid*)Tloc(bn,0) : 0 : oid_nil;
} else {
-   bn->tsorted = 0;
-   bn->trevsorted = 0;
-   bn->tkey = 0;
+   bn->tsorted = false;
+   bn->trevsorted = false;
+   bn->tkey = false;
bn->tseqbase = oid_nil;
}
return bn;
@@ -1262,14 +1262,1

MonetDB: rename-sql - Merge with default

2018-10-08 Thread Pedro Ferreira 
Changeset: f2d3e5c1080e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f2d3e5c1080e
Added Files:
clients/R/Tests/deps-install.timeout
debian/libmonetdb17.install
debian/libmonetdb5-server-cfitsio.install
debian/monetdb-python3.install
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
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

sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.sql

sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err

sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out
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
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
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
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:
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
tools/merovingian/daemon/.merovingian_properties.in
tools/merovingian/daemon/monetdbd.service.in
Modified Files:
.hgtags
MonetDB.spec
NT/mksqlwxs.py
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
buildtools/autogen/autogen/msc.py
buildtools/doc/windowsbuild.rst
clients/ChangeLog-Archive
clients/ChangeLog.Aug2018
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
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/examples/C/Makefile.ag
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/Makefile.ag
clients/mapiclient/dump.c
clients/mapiclient/eventparser.c
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/mapiclient/mnc.c
clients/mapiclient/msqldump.c
clients/mapiclient/msqldump.h
clients/mapiclient/stethoscope.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
clients/mapilib/ChangeLog
clients/mapilib/mapi.c
clients/mapilib/mapi.h
clients/mapilib/mapi.rc
clients/odbc/driver/ODBCConvert.c
clients/od

MonetDB: config_rss - Use custom c code to test configurable rss.

2018-10-08 Thread Aris Koning 
Changeset: ae03b3295b7d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae03b3295b7d
Added Files:
sql/backends/monet5/config_rss/Makefile.ag
sql/backends/monet5/config_rss/test_rss.c
sql/backends/monet5/config_rss/test_rss.mal
Removed Files:
sql/test/configurable_rss/Tests/cap_rss_32.py.src
sql/test/configurable_rss/Tests/cap_rss_32.stable.err
sql/test/configurable_rss/Tests/cap_rss_32.stable.out
sql/test/configurable_rss/Tests/cap_rss_64.py.src
sql/test/configurable_rss/Tests/cap_rss_64.stable.err
sql/test/configurable_rss/Tests/cap_rss_64.stable.out
sql/test/configurable_rss/Tests/no_cap_rss_32.py.src
sql/test/configurable_rss/Tests/no_cap_rss_32.stable.err
sql/test/configurable_rss/Tests/no_cap_rss_32.stable.out
sql/test/configurable_rss/Tests/no_cap_rss_64.py.src
sql/test/configurable_rss/Tests/no_cap_rss_64.stable.err
sql/test/configurable_rss/Tests/no_cap_rss_64.stable.out
Modified Files:
sql/backends/monet5/Makefile.ag
sql/test/configurable_rss/Tests/All
sql/test/configurable_rss/Tests/rss.py
Branch: config_rss
Log Message:

Use custom c code to test configurable rss.


diffs (truncated from 639 to 300 lines):

diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -4,7 +4,7 @@
 #
 # Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
 
-SUBDIRS = NOT_WIN32?vaults UDF generator
+SUBDIRS = NOT_WIN32?vaults UDF generator HAVE_TESTING&WIN32?config_rss
 
 INCLUDES = ../../include ../../common ../../storage ../../server \
   ../../../monetdb5/modules/atoms \
diff --git a/sql/backends/monet5/config_rss/Makefile.ag 
b/sql/backends/monet5/config_rss/Makefile.ag
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/config_rss/Makefile.ag
@@ -0,0 +1,25 @@
+# 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.
+
+INCLUDES = ../../../include \
+  ../../../common \
+  ../../../../monetdb5/mal \
+  ../../../../monetdb5/modules/mal
+
+lib__test_rss = {
+   MODULE
+   CONDINST = HAVE_TESTING WIN32
+   DIR = libdir/monetdb5
+   SOURCES = test_rss.c
+   LIBS = WIN32?../../../../monetdb5/tools/libmonetdb5 \
+  WIN32?../../../../gdk/libbat
+}
+
+headers_mal = {
+   HEADERS = mal
+   DIR = libdir/monetdb5
+   SOURCES = test_rss.mal
+}
diff --git a/sql/backends/monet5/config_rss/test_rss.c 
b/sql/backends/monet5/config_rss/test_rss.c
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/config_rss/test_rss.c
@@ -0,0 +1,64 @@
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+
+#define MB(x) ((SIZE_T) (x) << 20)
+#define GB(x) ((SIZE_T) (x) << 30)
+
+#define ALLOC_CHUNK_SIZE (MB(10))
+#define MIN_WORKING_SET MB(100)
+#define MAX_WORKING_SET MB(200)
+#define MAX_VIRTUAL_MEMORY MB(400)
+
+#define TEST_FILE "test_file"
+
+mal_export str TESTrestricted_rss(lng* GDK_mem_maxsize /*in bytes*/)
+{
+   // We are going to try to allocate twice the maximum configured rss 
bound.
+   size_t rss_bound = (size_t) *GDK_mem_maxsize, to_be_allocated = 2 * 
rss_bound, allocated = 0;
+
+   // A test file is going to be (re)created in the current directory.
+   FILE* const pfile = fopen(TEST_FILE, "w");
+
+   char* committedMemory = NULL;
+
+   while(allocated < to_be_allocated)
+   {
+   if(!(committedMemory = (char*) malloc(ALLOC_CHUNK_SIZE)))
+   {
+   break;
+   }
+
+   // Write something to newly committed memory.
+   for (int i = 0; i < ALLOC_CHUNK_SIZE - 1; i++)
+   {
+   committedMemory[i] = rand()%26+'a';
+   }
+   committedMemory[ALLOC_CHUNK_SIZE] = '\0';
+
+   // Perform some I/O to make sure the OS is actually doing 
something with these dirty pages.
+
+   fputs(committedMemory, pfile);
+
+   // Query process memory counters from OS.
+   PROCESS_MEMORY_COUNTERS_EX psmemCounters;
+   GetProcessMemoryInfo(GetCurrentProcess(), &psmemCounters, 
sizeof(PROCESS_MEMORY_COUNTERS_EX));
+   
+   printf("Working Set:\t%lld MB\t", psmemCounters.WorkingSetSize 
>> 20);
+   printf("Total Memory:\t%lld MB\n", psmemCounters.PrivateUsage 
>> 20);
+
+   if (psmemCounters.WorkingSetSize > rss_bound) {
+   fclose(pfile);
+   throw(MAL, "test_config_rss.run_test_config_rss", 
"physical memory allocation violates configured working set s

MonetDB: config_rss - Merge with default.

2018-10-08 Thread Aris Koning 
Changeset: 83f3ed55c828 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83f3ed55c828
Added Files:
ChangeLog
ChangeLog.Aug2018
buildtools/ChangeLog
buildtools/ChangeLog.Aug2018
clients/ChangeLog
clients/ChangeLog.Aug2018
clients/R/Tests/deps-install.timeout
clients/mapilib/ChangeLog
clients/mapilib/ChangeLog.Aug2018
clients/odbc/samples/testStmtAttr.c
common/stream/ChangeLog
common/stream/ChangeLog.Aug2018
common/utils/strptime.cpp
debian/libmonetdb17.install
debian/libmonetdb5-server-cfitsio.install
debian/monetdb-python3.install
gdk/ChangeLog
gdk/ChangeLog.Aug2018
geom/ChangeLog
geom/ChangeLog.Aug2018
monetdb5/ChangeLog
monetdb5/ChangeLog.Aug2018
sql/ChangeLog
sql/ChangeLog.Aug2018
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
sql/server/rel_propagate.c
sql/server/rel_propagate.h
sql/server/sql_partition.c
sql/server/sql_partition.h
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

sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.sql

sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.err

sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.out

sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py

sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.err

sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.out
sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.sql

sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.err

sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out
sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.sql

sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.err

sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.out

sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py

sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.err

sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.out

sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.sql

sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err

sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out
sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.sql
sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.stable.err
sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.stable.out
sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py

sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.err

sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.out
sql/test/BugTracker-2018/Tests/singleton-stddev.Bug-6627.sql
sql/test/BugTracker-2018/Tests/singleton-stddev.Bug-6627.stable.err
sql/test/BugTracker-2018/Tests/singleton-stddev.Bug-6627.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-rangejoin-undefined.Bug-6610.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-rangejoin-undefined.Bug-6610.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-rangejoin-undefined.Bug-6610.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-add.Bug-6630.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-add.Bug-6630.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-add.Bug-6630.stable.out

sql/test/BugTracker

MonetDB: data-vaults - Merge with default

2018-10-08 Thread Panagiotis Koutsourakis 
Changeset: 1921396f46b8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1921396f46b8
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
clients/Tests/exports.stable.out
configure.ag
debian/changelog
gdk/gdk_logger.c
gdk/gdk_logger.h
geom/monetdb5/geom_upgrade.c
libversions
sql/include/sql_catalog.h
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
tools/mserver/monet_version.c.in
tools/mserver/mserver5.c
Branch: data-vaults
Log Message:

Merge with default


diffs (truncated from 2253 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -712,3 +712,5 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655
 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_7
 3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release
 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release
+a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_9
+a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -108,7 +108,7 @@ Vendor: MonetDB BV 
 Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Aug2018/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Aug2018-SP1/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 # we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1038,6 +1038,18 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Oct 05 2018 Sjoerd Mullender  - 11.31.9-20181005
+- Rebuilt.
+- BZ#6640: timestamp_to_str returning incorrectly adjusted results
+- BZ#6641: race condition in SQL UDF with update
+- BZ#6642: Hanging query
+- BZ#6646: Example SQLcopyinto.java does not work
+
+* 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.
+
 * Wed Aug 29 2018 Sjoerd Mullender  - 11.31.7-20180829
 - Rebuilt.
 
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
@@ -80,9 +80,6 @@
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
-/* location where binaries are installed */
-/* #undef BINDIR */
-
 /* read-only architecture-independent data */
 #define DATA_DIR PREFIX "\\share"
 
@@ -95,6 +92,9 @@
 /* architecture-dependent files */
 #define EXEC_PREFIX PREFIX
 
+/* location where binaries are installed */
+#define BINDIR EXEC_PREFIX "\\bin"
+
 /* Define to nothing if C supports flexible array members, and to 1 if it does
not. That way, with a declaration like `struct s { int n; double
d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* 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.
+
 * Tue Aug 28 2018 Sjoerd Mullender  - 11.31.5-20180829
 - Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio
   Debian/Ubuntu package.
diff --git a/buildtools/ChangeLog.Aug2018 b/buildtools/ChangeLog.Aug2018
--- a/buildtools/ChangeLog.Aug2018
+++ b/buildtools/ChangeLog.Aug2018
@@ -1,8 +1,3 @@
 # 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/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -407,15 +407,15 @@ ssize_t lngFromStr(const char *src, size
 ssize_t lngToStr(str *dst, size_t *len, const lng *src);
 const lng lng_nil;
 gdk_return log_abort(logger *lg);
-gdk_return log_bat(logger *lg, BAT *b, const char *n);
-gdk_return log_bat_clear(logger *lg, const char *n);
-gdk_return log_bat_persists(logger *lg, BAT *b, const char *n);
-gdk_return log_bat_transient(logger *lg, const char *n);
-gdk_return log_delta(logger *lg, BAT *uid, BAT *uval, const char *n);
+gdk_return log_bat(logger *lg, BAT *b, const char *n, char tpe, oid id);
+gdk_return log_bat_clear

MonetDB: default - Don't mix return types.

2018-10-08 Thread Sjoerd Mullender 
Changeset: bd1848b8b004 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd1848b8b004
Modified Files:
gdk/gdk_logger.c
sql/storage/bat/bat_storage.c
Branch: default
Log Message:

Don't mix return types.


diffs (36 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -3236,9 +3236,9 @@ logger_upgrade_bat(logger *lg, const cha
   BUNappend(lg->catalog_nme, name, false) != GDK_SUCCEED ||
   BUNappend(lg->catalog_tpe, &tpe, false) != GDK_SUCCEED ||
   BUNappend(lg->catalog_oid, &id, false) != GDK_SUCCEED) 
-   return LOG_ERR;
+   return GDK_FAIL;
}
-   return LOG_OK;
+   return GDK_SUCCEED;
 }
 
 gdk_return
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -1407,7 +1407,7 @@ create_delta( sql_delta *d, BAT *b, BAT 
 static int
 upgrade_delta( sql_delta *d, char tpe, oid id)
 {
-   return logger_upgrade_bat(bat_logger, d->name, tpe, id);
+   return logger_upgrade_bat(bat_logger, d->name, tpe, id) == GDK_SUCCEED 
? LOG_OK : LOG_ERR;
 }
 
 static bat
@@ -1679,7 +1679,7 @@ upgrade_del(sql_table *t)
sql_dbat *bat = t->data;
 
if (!t->bootstrap)
-   return logger_upgrade_bat(bat_logger, bat->dname, LOG_TAB, 
t->base.id);
+   return logger_upgrade_bat(bat_logger, bat->dname, LOG_TAB, 
t->base.id) == GDK_SUCCEED ? LOG_OK : LOG_ERR;
return LOG_OK;
 }
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Get rid of unused variable in no-assert builds.

2018-10-08 Thread Sjoerd Mullender 
Changeset: d807407ae1f0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d807407ae1f0
Modified Files:
gdk/gdk_logger.c
Branch: default
Log Message:

Get rid of unused variable in no-assert builds.


diffs (25 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -418,7 +418,7 @@ log_read_updates(logger *lg, trans *tr, 
if (tt == TYPE_void && BATtdense(b))
tseq = 1;
} else {/* search trans action for create statement */
-   int i, found = 0;
+   int i;
 
for (i = 0; i < tr->nr; i++) {
if (tr->changes[i].type == LOG_CREATE &&
@@ -433,11 +433,10 @@ log_read_updates(logger *lg, trans *tr, 
tseq = 1;
tt = TYPE_void;
}
-   found = 1;
break;
}
}
-   assert(found);
+   assert(i < tr->nr); /* found one */
}
assert((ht == TYPE_void && l->flag == LOG_INSERT) ||
   ((ht == TYPE_oid || !ht) && l->flag == LOG_UPDATE));
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list