MonetDB: compressedcandidates - Limit property testing on bit-ve...

2017-10-23 Thread Martin Kersten 
Changeset: df247816b0c5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df247816b0c5
Modified Files:
gdk/gdk_bat.c
Branch: compressedcandidates
Log Message:

Limit property testing on bit-vector types.


diffs (13 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2049,6 +2049,9 @@ BATassertProps(BAT *b)
assert(b->theap.size >> b->tshift >= b->batCapacity);
}
 
+   /* ignore the properties for  bit-vector candidates */
+   if (b->ttype == TYPE_msk)
+   return;
/* void and str imply varsized */
if (b->ttype == TYPE_void ||
ATOMstorage(b->ttype) == TYPE_str)
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - fixed and revised (MAL-)implementation of (su...

2017-10-23 Thread Stefan Manegold 
Changeset: 9aef4b4bf037 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9aef4b4bf037
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
sql/backends/monet5/sql_aggr_bte.mal
sql/backends/monet5/sql_aggr_dbl.mal
sql/backends/monet5/sql_aggr_flt.mal
sql/backends/monet5/sql_aggr_hge.mal
sql/backends/monet5/sql_aggr_int.mal
sql/backends/monet5/sql_aggr_lng.mal
sql/backends/monet5/sql_aggr_sht.mal
sql/backends/monet5/sql_upgrades.c
sql/scripts/39_analytics.sql
sql/scripts/39_analytics_hge.sql
sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.sql
sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
Branch: default
Log Message:

fixed and revised (MAL-)implementation of (sub)covar() & (sub)corr():

- always produce result of type dbl (nothing else makes sense)
- use correct types internally to avoid overflows (as much as possible)
- use avg() instead of sum()/count() to avoid overflows (as much as possible)
  and to properly respect / handle NIL/NULL values
- correctly handle "mutual" NIL/NULL values, i.e., only consider
  values from either column in case both column values are not NIL/NULL
- correctly return NIL/NULL as corr() in case at least one stddev() is 0


diffs (truncated from 1014 to 300 lines):

diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -75,24 +75,24 @@ Ready.
 [ "aggr",  "avg",  "command aggr.avg(b:bat[:sht], g:bat[:oid], 
e:bat[:any_1]) (X_0:bat[:dbl], X_1:bat[:lng]) ","AGGRavg23_dbl;",   
"Grouped tail average on sht, also returns count"   ]
 [ "aggr",  "avg",  "pattern aggr.avg(b:bat[:any_2]):dbl ", "CMDcalcavg;",  
"Gives the avg of all tail values"  ]
 [ "aggr",  "cardinality",  "command aggr.cardinality(b:bat[:any_2]):lng ", 
"ALGcard;", "Return the cardinality of the BAT tail values."]
-[ "aggr",  "corr", "function aggr.corr(e1:bat[:bte], e2:bat[:bte]):bte;",  
"", ""  ]
+[ "aggr",  "corr", "function aggr.corr(e1:bat[:bte], e2:bat[:bte]):dbl;",  
"", ""  ]
 [ "aggr",  "corr", "function aggr.corr(e1:bat[:dbl], e2:bat[:dbl]):dbl;",  
"", ""  ]
-[ "aggr",  "corr", "function aggr.corr(e1:bat[:flt], e2:bat[:flt]):flt;",  
"", ""  ]
-[ "aggr",  "corr", "function aggr.corr(e1:bat[:int], e2:bat[:int]):int;",  
"", ""  ]
-[ "aggr",  "corr", "function aggr.corr(e1:bat[:lng], e2:bat[:lng]):lng;",  
"", ""  ]
-[ "aggr",  "corr", "function aggr.corr(e1:bat[:sht], e2:bat[:sht]):sht;",  
"", ""  ]
+[ "aggr",  "corr", "function aggr.corr(e1:bat[:flt], e2:bat[:flt]):dbl;",  
"", ""  ]
+[ "aggr",  "corr", "function aggr.corr(e1:bat[:int], e2:bat[:int]):dbl;",  
"", ""  ]
+[ "aggr",  "corr", "function aggr.corr(e1:bat[:lng], e2:bat[:lng]):dbl;",  
"", ""  ]
+[ "aggr",  "corr", "function aggr.corr(e1:bat[:sht], e2:bat[:sht]):dbl;",  
"", ""  ]
 [ "aggr",  "count","command aggr.count(b:bat[:any_1], g:bat[:oid], 
e:bat[:any_2], ignorenils:bit):bat[:lng] ", "AGGRcount3;",  ""  ]
 [ "aggr",  "count","command aggr.count(b:bat[:any_1], g:bat[:oid], 
e:bat[:any_2]):bat[:lng] ", "AGGRcount3nils;",  "Grouped count" ]
 [ "aggr",  "count","command aggr.count(b:bat[:any]):lng ", 
"ALGcount_bat;","Return the current size (in number of elements) in a 
BAT." ]
 [ "aggr",  "count","command aggr.count(b:bat[:any], 
ignore_nils:bit):lng ","ALGcount_nil;","Return the number of 
elements currently in a BAT ignores\n\t\tBUNs with nil-tail iff 
ignore_nils==TRUE."   ]
 [ "aggr",  "count_no_nil", "command aggr.count_no_nil(b:bat[:any_1], 
g:bat[:oid], e:bat[:any_2]):bat[:lng] ",  "AGGRcount3nonils;",""  ]
 [ "aggr",  "count_no_nil", "command aggr.count_no_nil(b:bat[:any_2]):lng 
","ALGcount_no_nil;", "Return the number of elements 
currently\n\tin a BAT ignoring BUNs with nil-tail"   ]
-[ "aggr",  "covar","function aggr.covar(e1:bat[:bte], 
e2:bat[:bte]):bte;", "", ""  ]
+[ "aggr",  "covar","function aggr.covar(e1:bat[:bte], 
e2:bat[:bte]):dbl;", "", ""  ]
 [ "aggr",  "covar","function aggr.covar(e1:bat[:dbl], 
e2:bat[:dbl]):dbl;", "", ""  ]
-[ "aggr",  "covar","function aggr.covar(e1:bat[:flt], 
e2:bat[:flt]):flt;", "", ""  ]
-[ "aggr",  "covar",

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

2017-10-23 Thread Sjoerd Mullender 
Changeset: 62ab7e8a8d98 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=62ab7e8a8d98
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-23 Thread Sjoerd Mullender 
Changeset: e1af4111b5b0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e1af4111b5b0
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.9
+%define version 11.27.10
 %{!?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.9"
+#define PACKAGE_VERSION "11.27.10"
 
 /* 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.9
+VERSION=11.27.10
 #   ^^
 # 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,9,1
-  PRODUCTVERSION 11,27,9,1
+  FILEVERSION 11,27,10,1
+  PRODUCTVERSION 11,27,10,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.9\0"
+  VALUE "FileVersion", "11.27.10\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.9\0"
+  VALUE "ProductVersion", "11.27.10\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,9,1
-  PRODUCTVERSION 11,27,9,1
+  FILEVERSION 11,27,10,1
+  PRODUCTVERSION 11,27,10,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.9\0"
+  VALUE "FileVersion", "11.27.10\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.9\0"
+  VALUE "ProductVersion", "11.27.10\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,9,1
- PRODUCTVERSION 11,27,9,1
+ FILEVERSION 11,27,10,1
+ PRODUCTVERSION 11,27,10,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.9"
+VALUE "FileVersion", "11.27.10"
 VALUE "InternalName", "libMonetODBCs.dll"
 VALUE "LegalCopyright", "Copyright © MonetDB B.V.

MonetDB: default - Merge with Jul2017 branch.

2017-10-23 Thread Sjoerd Mullender 
Changeset: e8e8d392f375 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e8e8d392f375
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2017
libversions
Branch: default
Log Message:

Merge with Jul2017 branch.


diffs (153 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -682,3 +682,6 @@ 1534ee14ff84fe5629becc6a5b5e2990b694d5a3
 269ab71a82190d6024b3a920837089d657893493 Jul2017_SP1_release
 fce449d5af88de715fde36624815a56ef34c56bb Jul2017_7
 fce449d5af88de715fde36624815a56ef34c56bb Jul2017_SP2_release
+3d26c58579a18157659b590899a8f73f45954ec6 Jul2017_9
+fce449d5af88de715fde36624815a56ef34c56bb Jul2017_SP2_release
+3d26c58579a18157659b590899a8f73f45954ec6 Jul2017_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1041,6 +1041,44 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Oct 23 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.9-20171023
+- Rebuilt.
+- BZ#6207: identifier ambiguous when grouping and selecting the same
+  column twice
+- BZ#6335: Sqlitelogictest crash in complex SQL query
+- BZ#6405: Compilation error if DISABLE_PARENT_HASH not defined
+- BZ#6412: Overflow in sys.epoch
+- BZ#6413: Wrong answer for TPC-H Q17
+- BZ#6414: Using RPAD returns: could not allocate space
+- BZ#6416: Sqlitelogictest crash in aggregation query with a NOT IN clause
+- BZ#6417: Segfault encountered (sqlsmith)
+- BZ#6418: Segfault in renaming (sqlsmith)
+- BZ#6419: segfault in rel_optimizer (sqlsmith)
+- BZ#6420: Assertion error in mergetable task (sqlsmith)
+- BZ#6422: Another assertion error in rel_or (sqlsmith)
+- BZ#6423: Dereference null pointer (sqlsmith)
+- BZ#6424: Assertion error in rel_rename_expr (sqlsmith)
+- BZ#6425: Assertion error in exp_bin (sqlsmith)
+- BZ#6426: Assertion error in rel_find_exp_ (sqlsmith)
+- BZ#6427: Assertion error in eq_typeswitchloop (sqlsmith)
+- BZ#6428: Sqlitelogictest crash in aggregation query
+- BZ#6430: Assertion raised in another eq_typeswitch error (sqlsmith)
+- BZ#6431: Sqlitelogictest crash in aggregation query with a long
+  having clause
+- BZ#6432: Assertion error in exp_bin (sqlsmith)
+- BZ#6433: Sqlitelogictest crash in complex SELECT query with IN operator
+- BZ#6435: Sqlitelogictest crash in simple select query
+- BZ#6437: System schemas "profiler" and "json" shouldn't be allowed to
+  be dropped.
+- BZ#6438: Implement functionality to enforce the restrict option in:
+  DROP SCHEMA xyz RESTRICT;
+- BZ#6440: Faulty plan generated. Query returns more rows than expected
+  or existing in the view sys.tables.
+
+* Mon Oct 23 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.9-20171023
+- gdk: A serious bug, possibly resulting in database corruption, having to
+  do with appending data to a string BAT was fixed.
+
 * Wed Oct 11 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 
11.27.7-20171011
 - Rebuilt.
 - BZ#4017: server crashes when executing particular loopback query in
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+monetdb (11.27.9) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6207: identifier ambiguous when grouping and selecting the same
+column twice
+  * BZ#6335: Sqlitelogictest crash in complex SQL query
+  * BZ#6405: Compilation error if DISABLE_PARENT_HASH not defined
+  * BZ#6412: Overflow in sys.epoch
+  * BZ#6413: Wrong answer for TPC-H Q17
+  * BZ#6414: Using RPAD returns: could not allocate space
+  * BZ#6416: Sqlitelogictest crash in aggregation query with a NOT IN clause
+  * BZ#6417: Segfault encountered (sqlsmith)
+  * BZ#6418: Segfault in renaming (sqlsmith)
+  * BZ#6419: segfault in rel_optimizer (sqlsmith)
+  * BZ#6420: Assertion error in mergetable task (sqlsmith)
+  * BZ#6422: Another assertion error in rel_or (sqlsmith)
+  * BZ#6423: Dereference null pointer (sqlsmith)
+  * BZ#6424: Assertion error in rel_rename_expr (sqlsmith)
+  * BZ#6425: Assertion error in exp_bin (sqlsmith)
+  * BZ#6426: Assertion error in rel_find_exp_ (sqlsmith)
+  * BZ#6427: Assertion error in eq_typeswitchloop (sqlsmith)
+  * BZ#6428: Sqlitelogictest crash in aggregation query
+  * BZ#6430: Assertion raised in another eq_typeswitch error (sqlsmith)
+  * BZ#6431: Sqlitelogictest crash in aggregation query with a long
+having clause
+  * BZ#6432: Assertion error in exp_bin (sqlsmith)
+  * BZ#6433: Sqlitelogictest crash in complex SELECT query with IN operator
+  * BZ#6435: Sqlitelogictest crash in simple select query
+  * BZ#6437: System schemas "profiler" and "json" shouldn't be allowed to
+be dropped.
+  * BZ#6438: Implement functionality to enforce the restrict option in:
+DROP SCHEMA xyz RESTRICT;
+  * BZ#6440: Faulty plan generated. Query returns more rows than expected
+or existing in the view sys.tables.
+
+ -- Sjoerd M

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

2017-10-23 Thread Sjoerd Mullender 
Changeset: a2297a2a6a43 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a2297a2a6a43
Modified Files:
.hgtags
Branch: Jul2017
Log Message:

Setting tags Jul2017_9 and Jul2017_SP2 for the release build.


diffs (10 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -682,3 +682,6 @@ 1534ee14ff84fe5629becc6a5b5e2990b694d5a3
 269ab71a82190d6024b3a920837089d657893493 Jul2017_SP1_release
 fce449d5af88de715fde36624815a56ef34c56bb Jul2017_7
 fce449d5af88de715fde36624815a56ef34c56bb Jul2017_SP2_release
+3d26c58579a18157659b590899a8f73f45954ec6 Jul2017_9
+fce449d5af88de715fde36624815a56ef34c56bb Jul2017_SP2_release
+3d26c58579a18157659b590899a8f73f45954ec6 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-23 Thread Sjoerd Mullender 
Changeset: 3d26c58579a1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d26c58579a1
Modified Files:
MonetDB.spec
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2017
Branch: Jul2017
Log Message:

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


diffs (124 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1041,6 +1041,44 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Oct 23 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.9-20171023
+- Rebuilt.
+- BZ#6207: identifier ambiguous when grouping and selecting the same
+  column twice
+- BZ#6335: Sqlitelogictest crash in complex SQL query
+- BZ#6405: Compilation error if DISABLE_PARENT_HASH not defined
+- BZ#6412: Overflow in sys.epoch
+- BZ#6413: Wrong answer for TPC-H Q17
+- BZ#6414: Using RPAD returns: could not allocate space
+- BZ#6416: Sqlitelogictest crash in aggregation query with a NOT IN clause
+- BZ#6417: Segfault encountered (sqlsmith)
+- BZ#6418: Segfault in renaming (sqlsmith)
+- BZ#6419: segfault in rel_optimizer (sqlsmith)
+- BZ#6420: Assertion error in mergetable task (sqlsmith)
+- BZ#6422: Another assertion error in rel_or (sqlsmith)
+- BZ#6423: Dereference null pointer (sqlsmith)
+- BZ#6424: Assertion error in rel_rename_expr (sqlsmith)
+- BZ#6425: Assertion error in exp_bin (sqlsmith)
+- BZ#6426: Assertion error in rel_find_exp_ (sqlsmith)
+- BZ#6427: Assertion error in eq_typeswitchloop (sqlsmith)
+- BZ#6428: Sqlitelogictest crash in aggregation query
+- BZ#6430: Assertion raised in another eq_typeswitch error (sqlsmith)
+- BZ#6431: Sqlitelogictest crash in aggregation query with a long
+  having clause
+- BZ#6432: Assertion error in exp_bin (sqlsmith)
+- BZ#6433: Sqlitelogictest crash in complex SELECT query with IN operator
+- BZ#6435: Sqlitelogictest crash in simple select query
+- BZ#6437: System schemas "profiler" and "json" shouldn't be allowed to
+  be dropped.
+- BZ#6438: Implement functionality to enforce the restrict option in:
+  DROP SCHEMA xyz RESTRICT;
+- BZ#6440: Faulty plan generated. Query returns more rows than expected
+  or existing in the view sys.tables.
+
+* Mon Oct 23 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.9-20171023
+- gdk: A serious bug, possibly resulting in database corruption, having to
+  do with appending data to a string BAT was fixed.
+
 * Wed Oct 11 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 
11.27.7-20171011
 - Rebuilt.
 - BZ#4017: server crashes when executing particular loopback query in
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+monetdb (11.27.9) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6207: identifier ambiguous when grouping and selecting the same
+column twice
+  * BZ#6335: Sqlitelogictest crash in complex SQL query
+  * BZ#6405: Compilation error if DISABLE_PARENT_HASH not defined
+  * BZ#6412: Overflow in sys.epoch
+  * BZ#6413: Wrong answer for TPC-H Q17
+  * BZ#6414: Using RPAD returns: could not allocate space
+  * BZ#6416: Sqlitelogictest crash in aggregation query with a NOT IN clause
+  * BZ#6417: Segfault encountered (sqlsmith)
+  * BZ#6418: Segfault in renaming (sqlsmith)
+  * BZ#6419: segfault in rel_optimizer (sqlsmith)
+  * BZ#6420: Assertion error in mergetable task (sqlsmith)
+  * BZ#6422: Another assertion error in rel_or (sqlsmith)
+  * BZ#6423: Dereference null pointer (sqlsmith)
+  * BZ#6424: Assertion error in rel_rename_expr (sqlsmith)
+  * BZ#6425: Assertion error in exp_bin (sqlsmith)
+  * BZ#6426: Assertion error in rel_find_exp_ (sqlsmith)
+  * BZ#6427: Assertion error in eq_typeswitchloop (sqlsmith)
+  * BZ#6428: Sqlitelogictest crash in aggregation query
+  * BZ#6430: Assertion raised in another eq_typeswitch error (sqlsmith)
+  * BZ#6431: Sqlitelogictest crash in aggregation query with a long
+having clause
+  * BZ#6432: Assertion error in exp_bin (sqlsmith)
+  * BZ#6433: Sqlitelogictest crash in complex SELECT query with IN operator
+  * BZ#6435: Sqlitelogictest crash in simple select query
+  * BZ#6437: System schemas "profiler" and "json" shouldn't be allowed to
+be dropped.
+  * BZ#6438: Implement functionality to enforce the restrict option in:
+DROP SCHEMA xyz RESTRICT;
+  * BZ#6440: Faulty plan generated. Query returns more rows than expected
+or existing in the view sys.tables.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 23 Oct 2017 15:39:35 +0200
+
+monetdb (11.27.9) unstable; urgency=low
+
+  * gdk: A serious bug, possibly resulting in database corruption, having to
+do with appending data to a string BAT was fixed.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 23 Oct 2017 15:39:35 +0200
+
 monetdb (11.27.7) unstable; urgency=low
 
   * Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive

MonetDB: Jul2017 - Updated library versions.

2017-10-23 Thread Sjoerd Mullender 
Changeset: c4ee8a2b27c7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c4ee8a2b27c7
Modified Files:
libversions
Branch: Jul2017
Log Message:

Updated library versions.


diffs (19 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:3:0
+GDK_VERSION=15:4:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=9:2:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=23:3:0
+MONETDB5_VERSION=23:4:0
 
 # version of the STREAM library (subdirectory common/stream)
 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-23 Thread Sjoerd Mullender 
Changeset: add822f9fb7a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=add822f9fb7a
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-23 Thread Sjoerd Mullender 
Changeset: 0d308f055611 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d308f055611
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.8
+%define version 11.27.9
 %{!?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.8"
+#define PACKAGE_VERSION "11.27.9"
 
 /* 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.8
+VERSION=11.27.9
 #   ^^
 # 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,8,1
-  PRODUCTVERSION 11,27,8,1
+  FILEVERSION 11,27,9,1
+  PRODUCTVERSION 11,27,9,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.8\0"
+  VALUE "FileVersion", "11.27.9\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.8\0"
+  VALUE "ProductVersion", "11.27.9\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,8,1
-  PRODUCTVERSION 11,27,8,1
+  FILEVERSION 11,27,9,1
+  PRODUCTVERSION 11,27,9,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.8\0"
+  VALUE "FileVersion", "11.27.9\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.8\0"
+  VALUE "ProductVersion", "11.27.9\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,8,1
- PRODUCTVERSION 11,27,8,1
+ FILEVERSION 11,27,9,1
+ PRODUCTVERSION 11,27,9,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.8"
+VALUE "FileVersion", "11.27.9"
 VALUE "InternalName", "libMonetODBCs.dll"
 VALUE "LegalCopyright", "Copyright © MonetDB B.V.

MonetDB: default - Merge with Jul2017 branch.

2017-10-23 Thread Sjoerd Mullender 
Changeset: 2e1bfee1461d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e1bfee1461d
Modified Files:
gdk/ChangeLog.Jul2017
gdk/gdk_batop.c
gdk/gdk_logger.c
sql/backends/monet5/sql_cat.c
sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
sql/server/rel_select.c
sql/server/sql_parser.y
sql/test/BugTracker-2011/Tests/UDF_in_schema.Bug-2817.sql

sql/test/BugTracker-2012/Tests/insert_serial_with_unique_key.Bug-3091.sql
sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.sql
sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.sql
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Skyserver/drop_user.sql
sql/test/leaks/Tests/check1.stable.out.int128
Branch: default
Log Message:

Merge with Jul2017 branch.


diffs (truncated from 453 to 300 lines):

diff --git a/gdk/ChangeLog.Jul2017 b/gdk/ChangeLog.Jul2017
--- a/gdk/ChangeLog.Jul2017
+++ b/gdk/ChangeLog.Jul2017
@@ -1,3 +1,7 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
+* Mon Oct 23 2017 Sjoerd Mullender 
+- A serious bug, possibly resulting in database corruption, having to
+  do with appending data to a string BAT was fixed.
+
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -174,8 +174,12 @@ insert_string_bat(BAT *b, BAT *n, BAT *s
}
memcpy(b->tvheap->base + toff, n->tvheap->base, 
n->tvheap->free);
b->tvheap->free = toff + n->tvheap->free;
-   /* flush double-elimination hash table */
-   memset(b->tvheap->base, 0, GDK_STRHASHSIZE);
+   if (toff > 0) {
+   /* flush double-elimination
+* hash table */
+   memset(b->tvheap->base, 0,
+  GDK_STRHASHSIZE);
+   }
}
}
if (toff != ~(size_t) 0) {
@@ -195,38 +199,10 @@ insert_string_bat(BAT *b, BAT *n, BAT *s
goto bunins_failed;
}
}
-   switch (b->twidth) {
-   case 1:
-   b->ttype = TYPE_bte;
-   tp = 
-   break;
-   case 2:
-   b->ttype = TYPE_sht;
-   tp = 
-   break;
-#if SIZEOF_VAR_T == 8
-   case 4:
-   b->ttype = TYPE_int;
-   tp = 
-   break;
-   case 8:
-   b->ttype = TYPE_lng;
-   tp = 
-   break;
-#else
-   case 4:
-   b->ttype = TYPE_int;
-   tp = 
-   break;
-#endif
-   default:
-   assert(0);
-   }
-   b->tvarsized = 0;
}
} else if (unshare_string_heap(b) != GDK_SUCCEED)
return GDK_FAIL;
-   if (toff == 0 && n->twidth == b->twidth) {
+   if (toff == 0 && n->twidth == b->twidth && cand == NULL) {
/* we don't need to do any translation of offset
 * values, so we can use fast memcpy */
memcpy(Tloc(b, BUNlast(b)), Tloc(n, start),
@@ -250,6 +226,34 @@ insert_string_bat(BAT *b, BAT *n, BAT *s
 #endif
const var_t *restrict tvp = (const var_t *) Tloc(n, 0);
 
+   switch (b->twidth) {
+   case 1:
+   b->ttype = TYPE_bte;
+   tp = 
+   break;
+   case 2:
+   b->ttype = TYPE_sht;
+   tp = 
+   break;
+#if SIZEOF_VAR_T == 8
+   case 4:
+   b->ttype = TYPE_int;
+   tp = 
+   break;
+   case 8:
+   b->ttype = TYPE_lng;
+   tp = 
+   break;
+#else
+   case 4:
+   b->ttype = TYPE_int;
+   tp = 
+   break;
+#endif
+   default:
+   assert(0);
+

MonetDB: Jul2017 - Balance parentheses.

2017-10-23 Thread Sjoerd Mullender 
Changeset: c39b5669c88a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c39b5669c88a
Modified Files:
sql/backends/monet5/sql_cat.c
Branch: Jul2017
Log Message:

Balance parentheses.


diffs (17 lines):

diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -874,11 +874,11 @@ SQLdrop_schema(Client cntxt, MalBlkPtr m
} else if (s->system) {
msg = sql_message("42000!DROP SCHEMA: access denied for '%s'", 
sname);
} else if (sql_schema_has_user(sql, s)) {
-   msg = sql_message("2BM37!DROP SCHEMA: unable to drop schema 
'%s' (there are database objects which depend on it", sname);
+   msg = sql_message("2BM37!DROP SCHEMA: unable to drop schema 
'%s' (there are database objects which depend on it)", sname);
} else if (!action /* RESTRICT */ && (
!list_empty(s->tables.set) || !list_empty(s->types.set) ||
!list_empty(s->funcs.set) || !list_empty(s->seqs.set))) {
-   msg = sql_message("2BM37!DROP SCHEMA: unable to drop schema 
'%s' (there are database objects which depend on it", sname);
+   msg = sql_message("2BM37!DROP SCHEMA: unable to drop schema 
'%s' (there are database objects which depend on it)", sname);
} else {
mvc_drop_schema(sql, s, action);
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jul2017 - Some minor code improvements.

2017-10-23 Thread Sjoerd Mullender 
Changeset: 622f9cda01ca for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=622f9cda01ca
Modified Files:
gdk/gdk_batop.c
Branch: Jul2017
Log Message:

Some minor code improvements.


diffs (115 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -174,8 +174,12 @@ insert_string_bat(BAT *b, BAT *n, BAT *s
}
memcpy(b->tvheap->base + toff, n->tvheap->base, 
n->tvheap->free);
b->tvheap->free = toff + n->tvheap->free;
-   /* flush double-elimination hash table */
-   memset(b->tvheap->base, 0, GDK_STRHASHSIZE);
+   if (toff > 0) {
+   /* flush double-elimination
+* hash table */
+   memset(b->tvheap->base, 0,
+  GDK_STRHASHSIZE);
+   }
}
}
if (toff != ~(size_t) 0) {
@@ -195,34 +199,6 @@ insert_string_bat(BAT *b, BAT *n, BAT *s
goto bunins_failed;
}
}
-   switch (b->twidth) {
-   case 1:
-   b->ttype = TYPE_bte;
-   tp = 
-   break;
-   case 2:
-   b->ttype = TYPE_sht;
-   tp = 
-   break;
-#if SIZEOF_VAR_T == 8
-   case 4:
-   b->ttype = TYPE_int;
-   tp = 
-   break;
-   case 8:
-   b->ttype = TYPE_lng;
-   tp = 
-   break;
-#else
-   case 4:
-   b->ttype = TYPE_int;
-   tp = 
-   break;
-#endif
-   default:
-   assert(0);
-   }
-   b->tvarsized = 0;
}
} else if (unshare_string_heap(b) != GDK_SUCCEED)
return GDK_FAIL;
@@ -250,6 +226,34 @@ insert_string_bat(BAT *b, BAT *n, BAT *s
 #endif
const var_t *restrict tvp = (const var_t *) Tloc(n, 0);
 
+   switch (b->twidth) {
+   case 1:
+   b->ttype = TYPE_bte;
+   tp = 
+   break;
+   case 2:
+   b->ttype = TYPE_sht;
+   tp = 
+   break;
+#if SIZEOF_VAR_T == 8
+   case 4:
+   b->ttype = TYPE_int;
+   tp = 
+   break;
+   case 8:
+   b->ttype = TYPE_lng;
+   tp = 
+   break;
+#else
+   case 4:
+   b->ttype = TYPE_int;
+   tp = 
+   break;
+#endif
+   default:
+   assert(0);
+   }
+   b->tvarsized = 0;
for (;;) {
if (cand) {
if (cand == candend)
@@ -299,6 +303,8 @@ insert_string_bat(BAT *b, BAT *n, BAT *s
}
bunfastapp(b, tp);
}
+   b->tvarsized = 1;
+   b->ttype = TYPE_str;
} else if (b->tvheap->free < n->tvheap->free / 2 ||
   GDK_ELIMDOUBLES(b->tvheap)) {
/* if b's string heap is much smaller than n's string
@@ -394,8 +400,6 @@ insert_string_bat(BAT *b, BAT *n, BAT *s
r++;
}
}
-   b->tvarsized = 1;
-   b->ttype = TYPE_str;
return GDK_SUCCEED;
   bunins_failed:
b->tvarsized = 1;
@@ -562,7 +566,7 @@ BATappend(BAT *b, BAT *n, BAT *s, bit fo
b->tnokey[0] = b->tnokey[1] = 0;
}
} else {
-   BUN last = BUNlast(b) - 1;
+   BUN last = r - 1;
BATiter ni = bat_iterator(n);
BATiter bi = bat_iterator(b);
int xx = ATOMcmp(b->ttype, BUNtail(ni, start), BUNtail(bi, 
last));
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jul2017 - Fixed bug in BATappend of string BAT with can...

2017-10-23 Thread Sjoerd Mullender 
Changeset: 807f421f99b9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=807f421f99b9
Modified Files:
gdk/ChangeLog.Jul2017
gdk/gdk_batop.c
gdk/gdk_logger.c
Branch: Jul2017
Log Message:

Fixed bug in BATappend of string BAT with candidate list.


diffs (104 lines):

diff --git a/gdk/ChangeLog.Jul2017 b/gdk/ChangeLog.Jul2017
--- a/gdk/ChangeLog.Jul2017
+++ b/gdk/ChangeLog.Jul2017
@@ -1,3 +1,7 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
+* Mon Oct 23 2017 Sjoerd Mullender 
+- A serious bug, possibly resulting in database corruption, having to
+  do with appending data to a string BAT was fixed.
+
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -226,7 +226,7 @@ insert_string_bat(BAT *b, BAT *n, BAT *s
}
} else if (unshare_string_heap(b) != GDK_SUCCEED)
return GDK_FAIL;
-   if (toff == 0 && n->twidth == b->twidth) {
+   if (toff == 0 && n->twidth == b->twidth && cand == NULL) {
/* we don't need to do any translation of offset
 * values, so we can use fast memcpy */
memcpy(Tloc(b, BUNlast(b)), Tloc(n, start),
@@ -531,24 +531,27 @@ BATappend(BAT *b, BAT *n, BAT *s, bit fo
 
r = BUNlast(b);
 
-   if (BATcount(b) == 0 && cand == NULL) {
+   if (BATcount(b) == 0) {
BATiter ni = bat_iterator(n);
 
b->tsorted = n->tsorted;
-   b->tnosorted = start <= n->tnosorted && n->tnosorted < end ? 
n->tnosorted - start : 0;
b->trevsorted = n->trevsorted;
-   b->tnorevsorted = start <= n->tnorevsorted && n->tnorevsorted < 
end ? n->tnorevsorted - start : 0;
b->tdense = n->tdense && cand == NULL;
-   b->tnodense = start <= n->tnodense && n->tnodense < end ? 
n->tnodense - start : 0;
b->tnonil = n->tnonil;
b->tnil = n->tnil && cnt == BATcount(n);
b->tseqbase = oid_nil;
if (cand == NULL) {
+   b->tnosorted = start <= n->tnosorted && n->tnosorted < 
end ? n->tnosorted - start : 0;
+   b->tnorevsorted = start <= n->tnorevsorted && 
n->tnorevsorted < end ? n->tnorevsorted - start : 0;
+   b->tnodense = start <= n->tnodense && n->tnodense < end 
? n->tnodense - start : 0;
if (n->tdense && n->ttype == TYPE_oid)
b->tseqbase = *(oid *) BUNtail(ni, start);
else if (n->ttype == TYPE_void &&
 n->tseqbase != oid_nil)
b->tseqbase = n->tseqbase + start;
+   } else {
+   b->tnosorted = 0;
+   b->tnorevsorted = 0;
}
/* if tunique, uniqueness is guaranteed above */
b->tkey = n->tkey | b->tunique;
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1319,7 +1319,7 @@ bm_subcommit(logger *lg, BAT *list_bid, 
catalog_bid == list_bid &&
catalog_nme == list_nme &&
lg->catalog_bid == catalog_bid) {
-   BAT *bids, *nmes, *tids, *b;
+   BAT *bids, *nmes, *tids;
 
tids = bm_tids(catalog_bid, dcatalog);
if (tids == NULL) {
@@ -1337,28 +1337,6 @@ bm_subcommit(logger *lg, BAT *list_bid, 
return GDK_FAIL;
}
 
-   b = BATproject(tids, catalog_bid);
-   if (BATappend(bids, b, NULL, TRUE) != GDK_SUCCEED) {  
-   logbat_destroy(b);
-   logbat_destroy(tids);
-   logbat_destroy(bids);
-   logbat_destroy(nmes);
-   GDKfree(n);
-   return GDK_FAIL;
-   }
-   logbat_destroy(b);
-   b = BATproject(tids, catalog_nme);
-   if (BATappend(nmes, b, NULL, TRUE) != GDK_SUCCEED) {  
-   logbat_destroy(b);
-   logbat_destroy(tids);
-   logbat_destroy(bids);
-   logbat_destroy(nmes);
-   GDKfree(n);
-   return GDK_FAIL;
-   }
-   logbat_destroy(b);
-
-   /*
if (BATappend(bids, catalog_bid, tids, TRUE) != GDK_SUCCEED ||
BATappend(nmes, catalog_nme, tids, TRUE) != GDK_SUCCEED) {
logbat_destroy(tids);
@@ -1367,7 +1345,6 @@ bm_subcommit(logger *lg, BAT *list_bid, 
GDKfree(n);
return GDK_FAIL;
}
-   */
logbat_destroy(tids);
BATclear(dcatalog, TRUE);
 
___

monetdb-java: default - Settings tag v2.27.

2017-10-23 Thread Sjoerd Mullender 
Changeset: 9585e024f352 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java?cmd=changeset;node=9585e024f352
Modified Files:
.hgtags
Branch: default
Log Message:

Settings tag v2.27.


diffs (8 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -1,3 +1,4 @@
 80de05f07508fec938845b4a6e05f600bf0b48c0 v2.24
 c43c293f3d5841517cbe0d858108c4da5fb1ec0c v2.26
 a6a2f4ee2d42d7e192f9d8d37f79ea99178d7f2c v2.25
+fe8170e2b549c22ceb2d96301022b9304f62424d v2.27
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list