MonetDB: Jul2017 - fixed bug 6413, ie correct output of tpch sf1...

2017-10-11 Thread Niels Nes 
Changeset: 055d1f50bb0f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=055d1f50bb0f
Modified Files:
sql/server/rel_optimizer.c
Branch: Jul2017
Log Message:

fixed bug 6413, ie correct output of tpch sf1 q17. A column from
the subquery was used in the outer query. This is fixed in the
apply/rename optimizer (which correctly marks all internal columns
as such and renames them).


diffs (57 lines):

diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -1439,7 +1439,7 @@ can_push_func(sql_exp *e, sql_rel *rel, 
int mustl = 0, mustr = 0, mustf = 0;
sql_exp *l = e->l, *r = e->r, *f = e->f;
 
-   if (e->flag == cmp_or || e->flag == cmp_in || e->flag == 
cmp_notin || get_cmp(e) == cmp_filter) 
+   if (get_cmp(e) == cmp_or || e->flag == cmp_in || e->flag == 
cmp_notin || get_cmp(e) == cmp_filter) 
return 0;
return ((l->type == e_column || can_push_func(l, rel, )) 
&& (*must = mustl)) || 
   (!f && (r->type == e_column || can_push_func(r, rel, 
)) && (*must = mustr)) || 
@@ -1501,7 +1501,7 @@ exp_needs_push_down(sql_exp *e)
return 0;
switch(e->type) {
case e_cmp: 
-   if (e->flag == cmp_or || e->flag == cmp_in || e->flag == 
cmp_notin || get_cmp(e) == cmp_filter) 
+   if (get_cmp(e) == cmp_or || e->flag == cmp_in || e->flag == 
cmp_notin || get_cmp(e) == cmp_filter) 
return 0;
return exp_needs_push_down(e->l) || exp_needs_push_down(e->r) 
|| (e->f && exp_needs_push_down(e->f));
case e_convert:
@@ -6784,7 +6784,7 @@ split_exp(mvc *sql, sql_exp *e, sql_rel 
}
return e;
case e_cmp: 
-   if (e->flag == cmp_or) {
+   if (get_cmp(e) == cmp_or) {
split_exps(sql, e->l, rel);
split_exps(sql, e->r, rel);
} else if (e->flag == cmp_in || e->flag == cmp_notin || 
get_cmp(e) == cmp_filter) {
@@ -7939,7 +7939,7 @@ exp_uses_exps(sql_exp *e, list *exps)
return exps_uses_exps(e->l, exps);
break;
case e_cmp: 
-   if (e->flag == cmp_or) {
+   if (get_cmp(e) == cmp_or) {
return (exps_uses_exps(e->l, exps) || 
exps_uses_exps(e->r, exps));
} else if (e->flag == cmp_in || e->flag == cmp_notin || 
get_cmp(e) == cmp_filter) {
return (exp_uses_exps(e->l, exps) || 
exps_uses_exps(e->r, exps));
@@ -8266,7 +8266,7 @@ exp_find_conflicts(mvc *sql, sql_exp *e,
break;
}
case e_cmp: 
-   if (e->flag == cmp_or || get_cmp(e) == cmp_filter) {
+   if (get_cmp(e) == cmp_or || get_cmp(e) == cmp_filter) {
exps_find_conflicts(sql, e->l, aexps, conflicts);
exps_find_conflicts(sql, e->r, aexps, conflicts);
} else if (e->flag == cmp_in || e->flag == cmp_notin) {
@@ -8303,6 +8303,8 @@ rel_find_conflicts(mvc *sql, sql_rel *re
switch(rel->op) {
case op_basetable:
case op_table: 
+   if (rel->op == op_basetable && rel->l)
+   exps_find_conflicts(sql, rel->exps, exps, conflicts);
exps_mark_conflicts(sql, rel->exps, conflicts, 1); 
return rel;
case op_topn: 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jul2017 - reimplemented IN/NOT IN. Fixed bug 6411

2017-10-11 Thread Niels Nes 
Changeset: b7681c154e83 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7681c154e83
Added Files:

sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct.Bug-6411.stable.err

sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct.Bug-6411.stable.out
sql/test/bugs/Tests/in.sql
sql/test/bugs/Tests/in.stable.err
sql/test/bugs/Tests/in.stable.out
Modified Files:
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.6.sql
sql/backends/monet5/vaults/bam/Tests/query2.6.stable.out
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_rel.c
sql/server/rel_select.c
sql/server/sql_semantic.c

sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out
sql/test/BugTracker-2012/Tests/null_except_null.Bug-3040.stable.out
sql/test/BugTracker-2015/Tests/and_or_in.Bug-3655.stable.out

sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/bugs/Tests/All

sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/test/bugs/Tests/union_all-bug-sf-941788.stable.out
sql/test/mergetables/Tests/part-elim.stable.out
Branch: Jul2017
Log Message:

reimplemented IN/NOT IN. Fixed bug 6411


diffs (truncated from 2529 to 300 lines):

diff --git a/monetdb5/optimizer/opt_mergetable.c 
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -520,6 +520,14 @@ mat_setop(MalBlkPtr mb, InstrPtr p, matl
s = 
pushArgument(mb,s,getArg(mat[n].mi,j));
}
}
+   if (s->retc == 1 && s->argc == 2){ /* only one input, 
change into an assignment */
+   getFunctionId(s) = NULL; 
+   getModuleId(s) = NULL; 
+   s->token = ASSIGNsymbol; 
+   s->typechk = TYPE_UNKNOWN;
+   s->fcn = NULL;
+   s->blk = NULL;
+   }
pushInstruction(mb,s);
 
getArg(q,0) = newTmpVariable(mb, tpe);
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
@@ -616,22 +616,28 @@ exp_bin(backend *be, sql_exp *e, stmt *l
if (e->flag == cmp_in || e->flag == cmp_notin) {
return handle_in_exps(be, e->l, e->r, left, right, grp, 
ext, cnt, sel, (e->flag == cmp_in), 0);
}
-   if (e->flag == cmp_or && (!right || right->nrcols == 1)) {
+   if (get_cmp(e) == cmp_or && (!right || right->nrcols == 1)) {
+   sql_subtype *bt = sql_bind_localtype("bit");
list *l = e->l;
node *n;
stmt *sel1 = NULL, *sel2 = NULL;
+   int anti = is_anti(e);
 
sel1 = sel;
sel2 = sel;
for( n = l->h; n; n = n->next ) {
+   sql_exp *c = n->data;
stmt *sin = (sel1 && sel1->nrcols)?sel1:NULL;
 
-   s = exp_bin(be, n->data, left, right, grp, ext, 
cnt, sin); 
+   /* propagate the anti flag */
+   if (anti) 
+   set_anti(c);
+   s = exp_bin(be, c, left, right, grp, ext, cnt, 
sin); 
if (!s) 
return s;
+
if (!sin && sel1 && sel1->nrcols == 0 && 
s->nrcols == 0) {
-   sql_subtype *bt = 
sql_bind_localtype("bit");
-   sql_subfunc *f = sql_bind_func(sql->sa, 
sql->session->schema, "and", bt, bt, F_FUNC);
+   sql_subfunc *f = sql_bind_func(sql->sa, 
sql->session->schema, anti?"or":"and", bt, bt, F_FUNC);
assert(f);

MonetDB: Jul2017 - Remove ChangeLog files from previous branch.

2017-10-11 Thread Sjoerd Mullender 
Changeset: 1941abc8fcfe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1941abc8fcfe
Removed Files:
ChangeLog.Dec2016
buildtools/ChangeLog.Dec2016
clients/ChangeLog.Dec2016
clients/mapilib/ChangeLog.Dec2016
common/stream/ChangeLog.Dec2016
gdk/ChangeLog.Dec2016
geom/ChangeLog.Dec2016
monetdb5/ChangeLog.Dec2016
sql/ChangeLog.Dec2016
testing/ChangeLog.Dec2016
tools/merovingian/ChangeLog.Dec2016
Branch: Jul2017
Log Message:

Remove ChangeLog files from previous branch.


diffs (92 lines):

diff --git a/ChangeLog.Dec2016 b/ChangeLog.Dec2016
deleted file mode 100644
--- a/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for devel
-# This file is updated with Maddlog
-
diff --git a/buildtools/ChangeLog.Dec2016 b/buildtools/ChangeLog.Dec2016
deleted file mode 100644
--- a/buildtools/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for buildtools
-# This file is updated with Maddlog
-
diff --git a/clients/ChangeLog.Dec2016 b/clients/ChangeLog.Dec2016
deleted file mode 100644
--- a/clients/ChangeLog.Dec2016
+++ /dev/null
@@ -1,7 +0,0 @@
-# ChangeLog file for clients
-# This file is updated with Maddlog
-
-* Mon Jun 12 2017 Sjoerd Mullender 
-- A bug was fixed in the implementation of the functions SQLTables in
-  the ODBC driver where not enough memory was allocated.
-
diff --git a/clients/mapilib/ChangeLog.Dec2016 
b/clients/mapilib/ChangeLog.Dec2016
deleted file mode 100644
--- a/clients/mapilib/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for mapilib
-# This file is updated with Maddlog
-
diff --git a/common/stream/ChangeLog.Dec2016 b/common/stream/ChangeLog.Dec2016
deleted file mode 100644
--- a/common/stream/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for stream
-# This file is updated with Maddlog
-
diff --git a/gdk/ChangeLog.Dec2016 b/gdk/ChangeLog.Dec2016
deleted file mode 100644
--- a/gdk/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for MonetDB
-# This file is updated with Maddlog
-
diff --git a/geom/ChangeLog.Dec2016 b/geom/ChangeLog.Dec2016
deleted file mode 100644
--- a/geom/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for geom
-# This file is updated with Maddlog
-
diff --git a/monetdb5/ChangeLog.Dec2016 b/monetdb5/ChangeLog.Dec2016
deleted file mode 100644
--- a/monetdb5/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for MonetDB5
-# This file is updated with Maddlog
-
diff --git a/sql/ChangeLog.Dec2016 b/sql/ChangeLog.Dec2016
deleted file mode 100644
--- a/sql/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for sql
-# This file is updated with Maddlog
-
diff --git a/testing/ChangeLog.Dec2016 b/testing/ChangeLog.Dec2016
deleted file mode 100644
--- a/testing/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for testing
-# This file is updated with Maddlog
-
diff --git a/tools/merovingian/ChangeLog.Dec2016 
b/tools/merovingian/ChangeLog.Dec2016
deleted file mode 100644
--- a/tools/merovingian/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for sql/src/backends/monet5/merovingian
-# This file is updated with mchangelog
-
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jul2017 - Close handle in case of error.

2017-10-11 Thread Sjoerd Mullender 
Changeset: b668d5923bb0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b668d5923bb0
Modified Files:
monetdb5/mal/mal_linker.c
Branch: Jul2017
Log Message:

Close handle in case of error.


diffs (18 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
@@ -116,12 +116,14 @@ getAddress(stream *out, str modname, str
adr = (MALfcn) dlsym(dl, fcnname);
filesLoaded[lastfile].modname = GDKstrdup("libmonetdb5");
if(filesLoaded[lastfile].modname == NULL) {
+   dlclose(dl);
if (!silent)
showException(out, MAL,"MAL.getAddress", "could not 
allocate space");
return NULL;
}
filesLoaded[lastfile].fullname = GDKstrdup("libmonetdb5");
if(filesLoaded[lastfile].fullname == NULL) {
+   dlclose(dl);
GDKfree(filesLoaded[lastfile].modname);
if (!silent)
showException(out, MAL,"MAL.getAddress", "could not 
allocate space");
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

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

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

Merge with Jul2017 branch, not changing any files..

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

MonetDB: Jul2017 - Post release build.

2017-10-11 Thread Panagiotis Koutsourakis 
Changeset: 81c40585ce60 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81c40585ce60
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Jul2017
Log Message:

Post release build.


diffs (229 lines):

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

MonetDB: default - Merge with Jul2017 branch.

2017-10-11 Thread Panagiotis Koutsourakis 
Changeset: 5baaca63c055 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5baaca63c055
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
libversions
Branch: default
Log Message:

Merge with Jul2017 branch.


diffs (141 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -680,3 +680,5 @@ 1534ee14ff84fe5629becc6a5b5e2990b694d5a3
 269ab71a82190d6024b3a920837089d657893493 Jul2017_5
 1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_SP1_release
 269ab71a82190d6024b3a920837089d657893493 Jul2017_SP1_release
+fce449d5af88de715fde36624815a56ef34c56bb Jul2017_7
+fce449d5af88de715fde36624815a56ef34c56bb Jul2017_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
 Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Jul2017-SP1/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Jul2017-SP2/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 # we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1041,6 +1041,47 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Oct 11 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 
11.27.7-20171011
+- Rebuilt.
+- BZ#4017: server crashes when executing particular loopback query in
+  embedded python
+- BZ#6239: Incorrect profiling
+- BZ#6261: New handling of delta tables hurts badly reusage of bats
+- BZ#6287: should the CORR function return some numeric type that allows
+  fractions?
+- BZ#6321: Two-column aggregation on join result extremely slow.
+- BZ#6343: MERGE TABLE issue: unable to find
+- BZ#6348: Interference of procedure/table name
+- BZ#6350: Carriage return and form feed in TEXT fields are returned as
+  'r' and 'f' in jdbcclient and ResultSets
+- BZ#6352: Scope resolution problem (sqlsmith)
+- BZ#6353: implicit NULL value not propagated in distributed/remote query
+- BZ#6374: Wrong answer from merge table after content changes
+- BZ#6379: Table UDF: SEGV raised when invoking a non existing function
+- BZ#6380: unable to create new databases from clean installation
+- BZ#6381: Parser misses error messages in conditional
+- BZ#6382: Can't set JSON fields via PreparedStatement
+- BZ#6384: crash when setting a wrong listenaddr
+- BZ#6385: AGGREGATE UDFs with more than 2 parameters incorrectly
+  processed
+- BZ#6386: Unexpected error from server for query with long floats
+- BZ#6387: Performance degradation on multi column sort
+- BZ#6388: JDBC Connection via user voc produces errors when fetching
+  certain meta data information
+- BZ#6392: SELECT EXISTS (empty table) returns 'true'
+- BZ#6395: BAT leak of scalar result sets
+- BZ#6397: Isolation of generating functions not correct
+- BZ#6398: Null Matches in outer join are not supported
+- BZ#6399: UDF crashes when subquery and scalar values are passed
+  as pameters
+- BZ#6400: getCharacterStream() currently not supported
+- BZ#6404: COPY INTO crashes if table has primary key or foreign key
+  constraint
+- BZ#6409: sqllogictest crash on aggregation query with NOT IN clause
+  in HAVING clause
+- BZ#6410: Sqlitelogictest crash on aggregation query with IN clause
+- BZ#6411: Sqlitelogictest crash in aggregation query
+
 * Thu Jul 27 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.5-20170727
 - Rebuilt.
 - BZ#6375: MAL profiler truncates JSON objects larger than 8192 characters
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+monetdb (11.27.7) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#4017: server crashes when executing particular loopback query in
+embedded python
+  * BZ#6239: Incorrect profiling
+  * BZ#6261: New handling of delta tables hurts badly reusage of bats
+  * BZ#6287: should the CORR function return some numeric type that allows
+fractions?
+  * BZ#6321: Two-column aggregation on join result extremely slow.
+  * BZ#6343: MERGE TABLE issue: unable to find
+  * BZ#6348: Interference of procedure/table name
+  * BZ#6350: Carriage return and form feed in TEXT fields are returned as
+'r' and 'f' in jdbcclient and ResultSets
+  * BZ#6352: Scope resolution problem (sqlsmith)
+  * BZ#6353: implicit NULL value not propagated in distributed/remote query
+  * BZ#6374: Wrong answer from merge table after content changes
+  * BZ#6379: Table UDF: SEGV raised when invoking a non existing function
+  * BZ#6380: unable to create new databases from clean installation
+  * BZ#6381: Parser misses error messages in conditional
+  * BZ#6382: Can't set JSON fields via PreparedStatement
+  * BZ#6384: crash when setting a wrong listenaddr
+  * BZ#6385: AGGREGATE UDFs with more than 2 parameters incorrectly
+processed
+  * BZ#6386: Unexpected error from server for query with long floats
+  * BZ

MonetDB: Jul2017 - Setting tags Jul2017_7 and Jul2017_SP2 for th...

2017-10-11 Thread Panagiotis Koutsourakis 
Changeset: abecd7abd9d9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=abecd7abd9d9
Modified Files:
.hgtags
Branch: Jul2017
Log Message:

Setting tags Jul2017_7 and Jul2017_SP2 for the release build.


diffs (9 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -680,3 +680,5 @@ 1534ee14ff84fe5629becc6a5b5e2990b694d5a3
 269ab71a82190d6024b3a920837089d657893493 Jul2017_5
 1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_SP1_release
 269ab71a82190d6024b3a920837089d657893493 Jul2017_SP1_release
+fce449d5af88de715fde36624815a56ef34c56bb Jul2017_7
+fce449d5af88de715fde36624815a56ef34c56bb Jul2017_SP2_release
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jul2017 - Moved contents of ChangeLog.Jul2017 to MonetD...

2017-10-11 Thread Panagiotis Koutsourakis 
Changeset: fce449d5af88 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fce449d5af88
Modified Files:
MonetDB.spec
debian/changelog
Branch: Jul2017
Log Message:

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


diffs (111 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
 Group: Applications/Databases
 License: MPLv2.0
 URL: https://www.monetdb.org/
-Source: 
https://www.monetdb.org/downloads/sources/Jul2017-SP1/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Jul2017-SP2/%{name}-%{version}.tar.bz2
 
 # we need systemd for the _unitdir macro to exist
 # we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1041,6 +1041,47 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Oct 11 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 
11.27.7-20171011
+- Rebuilt.
+- BZ#4017: server crashes when executing particular loopback query in
+  embedded python
+- BZ#6239: Incorrect profiling
+- BZ#6261: New handling of delta tables hurts badly reusage of bats
+- BZ#6287: should the CORR function return some numeric type that allows
+  fractions?
+- BZ#6321: Two-column aggregation on join result extremely slow.
+- BZ#6343: MERGE TABLE issue: unable to find
+- BZ#6348: Interference of procedure/table name
+- BZ#6350: Carriage return and form feed in TEXT fields are returned as
+  'r' and 'f' in jdbcclient and ResultSets
+- BZ#6352: Scope resolution problem (sqlsmith)
+- BZ#6353: implicit NULL value not propagated in distributed/remote query
+- BZ#6374: Wrong answer from merge table after content changes
+- BZ#6379: Table UDF: SEGV raised when invoking a non existing function
+- BZ#6380: unable to create new databases from clean installation
+- BZ#6381: Parser misses error messages in conditional
+- BZ#6382: Can't set JSON fields via PreparedStatement
+- BZ#6384: crash when setting a wrong listenaddr
+- BZ#6385: AGGREGATE UDFs with more than 2 parameters incorrectly
+  processed
+- BZ#6386: Unexpected error from server for query with long floats
+- BZ#6387: Performance degradation on multi column sort
+- BZ#6388: JDBC Connection via user voc produces errors when fetching
+  certain meta data information
+- BZ#6392: SELECT EXISTS (empty table) returns 'true'
+- BZ#6395: BAT leak of scalar result sets
+- BZ#6397: Isolation of generating functions not correct
+- BZ#6398: Null Matches in outer join are not supported
+- BZ#6399: UDF crashes when subquery and scalar values are passed
+  as pameters
+- BZ#6400: getCharacterStream() currently not supported
+- BZ#6404: COPY INTO crashes if table has primary key or foreign key
+  constraint
+- BZ#6409: sqllogictest crash on aggregation query with NOT IN clause
+  in HAVING clause
+- BZ#6410: Sqlitelogictest crash on aggregation query with IN clause
+- BZ#6411: Sqlitelogictest crash in aggregation query
+
 * Thu Jul 27 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.5-20170727
 - Rebuilt.
 - BZ#6375: MAL profiler truncates JSON objects larger than 8192 characters
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+monetdb (11.27.7) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#4017: server crashes when executing particular loopback query in
+embedded python
+  * BZ#6239: Incorrect profiling
+  * BZ#6261: New handling of delta tables hurts badly reusage of bats
+  * BZ#6287: should the CORR function return some numeric type that allows
+fractions?
+  * BZ#6321: Two-column aggregation on join result extremely slow.
+  * BZ#6343: MERGE TABLE issue: unable to find
+  * BZ#6348: Interference of procedure/table name
+  * BZ#6350: Carriage return and form feed in TEXT fields are returned as
+'r' and 'f' in jdbcclient and ResultSets
+  * BZ#6352: Scope resolution problem (sqlsmith)
+  * BZ#6353: implicit NULL value not propagated in distributed/remote query
+  * BZ#6374: Wrong answer from merge table after content changes
+  * BZ#6379: Table UDF: SEGV raised when invoking a non existing function
+  * BZ#6380: unable to create new databases from clean installation
+  * BZ#6381: Parser misses error messages in conditional
+  * BZ#6382: Can't set JSON fields via PreparedStatement
+  * BZ#6384: crash when setting a wrong listenaddr
+  * BZ#6385: AGGREGATE UDFs with more than 2 parameters incorrectly
+processed
+  * BZ#6386: Unexpected error from server for query with long floats
+  * BZ#6387: Performance degradation on multi column sort
+  * BZ#6388: JDBC Connection via user voc produces errors when fetching
+certain meta data information
+  * BZ#6392: SELECT EXISTS (empty table) returns 'true'
+  * BZ#6395: BAT leak of scalar result sets
+  * BZ#6397: Isolation of generating functions not correct
+  * BZ#6398: Null Matches in outer join are not supported

MonetDB: Jul2017 - Updated library versions.

2017-10-11 Thread Panagiotis Koutsourakis 
Changeset: a08f06c8b9d5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a08f06c8b9d5
Modified Files:
libversions
Branch: Jul2017
Log Message:

Updated library versions.


diffs (21 lines):

diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
-GDK_VERSION=15:2:0
+GDK_VERSION=15:3:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
-MAPI_VERSION=9:1:0
+MAPI_VERSION=9:2:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=23:2:0
+MONETDB5_VERSION=23:3:0
 
 # version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=10:1:2
+STREAM_VERSION=10:2:2
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

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

2017-10-11 Thread Panagiotis Koutsourakis 
Changeset: 645638026eda for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=645638026eda
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:

Merge with Jul2017 branch, not changing any files.

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

MonetDB: Jul2017 - Pre-release version number update.

2017-10-11 Thread Panagiotis Koutsourakis 
Changeset: f6d5dcf40b60 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6d5dcf40b60
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Jul2017
Log Message:

Pre-release version number update.


diffs (229 lines):

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

MonetDB: trails - Compilation fix, plus stopping continuous quer...

2017-10-11 Thread Pedro Ferreira 
Changeset: a3a5b02e8cea for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3a5b02e8cea
Added Files:
sql/backends/monet5/Tests/cquery13.stable.err
sql/backends/monet5/Tests/cquery13.stable.out
Modified Files:
sql/backends/monet5/sql_cquery.c
Branch: trails
Log Message:

Compilation fix, plus stopping continuous queries within others.


diffs (149 lines):

diff --git a/sql/backends/monet5/Tests/cquery13.stable.err 
b/sql/backends/monet5/Tests/cquery13.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/cquery13.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'cquery13` in directory 'sql/backends/monet5` itself:
+
+
+# 13:07:42 >  
+# 13:07:42 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=35524" "--set" 
"mapi_usock=/var/tmp/mtest-29293/.s.monetdb.35524" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5"
 "--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 13:07:42 >  
+
+# builtin opt  gdk_dbpath = 
/home/ferreira/MonetDB-trails/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 = 35524
+# cmdline opt  mapi_usock = /var/tmp/mtest-29293/.s.monetdb.35524
+# cmdline opt  monet_prompt = 
+# cmdline opt  gdk_dbpath = 
/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt  embedded_r = yes
+# cmdline opt  embedded_py = true
+# cmdline opt  gdk_debug = 536870922
+
+# 13:07:42 >  
+# 13:07:42 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-29293" "--port=35524"
+# 13:07:42 >  
+
+
+# 13:07:45 >  
+# 13:07:45 >  "Done."
+# 13:07:45 >  
+
diff --git a/sql/backends/monet5/Tests/cquery13.stable.out 
b/sql/backends/monet5/Tests/cquery13.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/cquery13.stable.out
@@ -0,0 +1,87 @@
+stdout of test 'cquery13` in directory 'sql/backends/monet5` itself:
+
+
+# 13:07:42 >  
+# 13:07:42 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=35524" "--set" 
"mapi_usock=/var/tmp/mtest-29293/.s.monetdb.35524" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/home/ferreira/MonetDB-trails/BUILD/var/MonetDB/mTests_sql_backends_monet5"
 "--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 13:07:42 >  
+
+# MonetDB 5 server v11.28.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.498 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on 
mapi:monetdb://dhcp-120.eduroam.cwi.nl:35524/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-29293/.s.monetdb.35524
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/Timetrails module loaded
+# MonetDB/Python2 module loaded
+# MonetDB/R   module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 50_cquery.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 60_wlcr.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_shp.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql

MonetDB: default - Merge with Jul2017

2017-10-11 Thread Pedro Ferreira 
Changeset: 69c07b025b23 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=69c07b025b23
Modified Files:
common/stream/stream.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_session.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_remap.c
Branch: default
Log Message:

Merge with Jul2017


diffs (134 lines):

diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -2274,7 +2274,11 @@ socket_read(stream *s, void *buf, size_t
}
if (n == 0) /* unexpected end of file */
break;
-   nr += n;
+   nr +=
+#ifdef _MSC_VER
+   (int)
+#endif
+   n;
}
}
return nr / (ssize_t) elmsize;
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -208,6 +208,10 @@ MCinitClientRecord(Client c, oid user, b
c->blkmode = 0;
 
c->fdin = fin ? fin : bstream_create(GDKin, 0);
+   if ( c->fdin == NULL){
+   showException(GDKout, MAL, "initClientRecord", MAL_MALLOC_FAIL);
+   return NULL;
+   }
c->yycur = 0;
c->bak = NULL;
 
@@ -218,8 +222,8 @@ MCinitClientRecord(Client c, oid user, b
c->curprg = c->backup = 0;
c->glb = 0;
 
-   /* remove garbage from previous connection 
-* be aware, a user can introduce several modules 
+   /* remove garbage from previous connection
+* be aware, a user can introduce several modules
 * that should be freed to avoid memory leaks */
c->usermodule = c->curmodule = 0;
 
@@ -235,6 +239,10 @@ MCinitClientRecord(Client c, oid user, b
 
prompt = !fin ? GDKgetenv("monet_prompt") : PROMPT1;
c->prompt = GDKstrdup(prompt);
+   if ( c->prompt == NULL){
+   showException(GDKout, MAL, "initClientRecord", MAL_MALLOC_FAIL);
+   return NULL;
+   }
c->promptlength = strlen(prompt);
 
c->actions = 0;
@@ -268,7 +276,7 @@ MCinitClient(oid user, bstream *fin, str
 
 /*
  * The administrator should be initialized to enable interpretation of
- * the command line arguments, before it starts serviceing statements
+ * the command line arguments, before it starts servicing statements
  */
 int
 MCinitClientThread(Client c)
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -384,9 +384,11 @@ cloneFunction(Module scope, Symbol proc,
return NULL;
}
freeMalBlk(new->def);
-   new->def = copyMalBlk(proc->def);
-   if( new->def == NULL)
+   if((new->def = copyMalBlk(proc->def)) == NULL) {
+   freeSymbol(new);
+   fprintf(stderr,"cloneFunction() failed");
return NULL;
+   }
/* now change the definition of the original proc */
 #ifdef DEBUG_CLONE
fprintf(stderr, "CLONED VERSION\n");
diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c
--- a/monetdb5/mal/mal_import.c
+++ b/monetdb5/mal/mal_import.c
@@ -95,6 +95,10 @@ malLoadScript(Client c, str name, bstrea
throw(MAL, "malInclude", "file %s too large to process", name);
}
*fdin = bstream_create(fd, sz == 0 ? (size_t) (2 * 128 * BLOCK) : sz);
+   if(*fdin == NULL) {
+   mnstr_destroy(fd);
+   throw(MAL, "malInclude", MAL_MALLOC_FAIL);
+   }
if (bstream_next(*fdin) < 0)
mnstr_printf(c->fdout, "!WARNING: could not read %s\n", name);
return MAL_SUCCEED;
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -327,6 +327,12 @@ MSscheduleClient(str command, str challe
/* move this back !! */
if (c->usermodule == 0) {
c->curmodule = c->usermodule = userModule();
+   if(c->curmodule  == NULL) {
+   mnstr_printf(fout, "!could not allocate 
space\n");
+   exit_streams(fin, fout);
+   GDKfree(command);
+   return;
+   }
}
 
if ((s = setScenario(c, lang)) != NULL) {
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -458,7 +458,7 @@ compileOptimizer(Client cntxt, const cha
if( compiled){
pipes[j].mb = 
compiled->def;

MonetDB: default - Compilation fix

2017-10-11 Thread Pedro Ferreira 
Changeset: 70dc25e0a7bf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70dc25e0a7bf
Modified Files:
monetdb5/mal/mal_linker.c
Branch: default
Log Message:

Compilation fix


diffs (19 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
@@ -110,15 +110,11 @@ getAddress(str fcnname)
adr = (MALfcn) dlsym(dl, fcnname);
filesLoaded[lastfile].modname = GDKstrdup("libmonetdb5");
if(filesLoaded[lastfile].modname == NULL) {
-   if (!silent)
-   showException(out, MAL,"MAL.getAddress", "could not 
allocate space");
return NULL;
}
filesLoaded[lastfile].fullname = GDKstrdup("libmonetdb5");
if(filesLoaded[lastfile].fullname == NULL) {
GDKfree(filesLoaded[lastfile].modname);
-   if (!silent)
-   showException(out, MAL,"MAL.getAddress", "could not 
allocate space");
return NULL;
}
filesLoaded[lastfile].handle = dl;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list