Changeset: d08a2ca961f6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d08a2ca961f6 Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog-Archive buildtools/ChangeLog.Oct2014 clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py configure.ag debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Oct2014 gdk/gdk_batop.c gdk/libbat.rc java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Oct2014 monetdb5/optimizer/opt_generator.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Oct2014 sql/backends/monet5/generator/generator.c vertoo.data Branch: bamloader Log Message:
Merge with default diffs (truncated from 799 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -581,3 +581,5 @@ 4f894ebf1a93ae895ec23d54ce2112bf21a6427e e92e434d19b7308c2952d50978c2cfd78e1bdb80 Oct2014_3 4f894ebf1a93ae895ec23d54ce2112bf21a6427e Oct2014_release 88a29a5a2bef5c6cef6b3bfa5ab7c4d3b855a2c8 Oct2014_release +eb2967c408350131b63f5393704fd697c701fc49 Oct2014_5 +2da8cbcb65ed56690bad29f089d996eac347b48d Oct2014_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -91,7 +91,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Oct2014/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -960,6 +960,45 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- Rebuilt. +- BZ#3580: cosmetic change (append newline) +- BZ#3609: Incorrect use of generate_series +- BZ#3611: quantile() and median() commands crash when used 2x on the + same variable on a null table +- BZ#3612: assertion failure when deleting rows from table to which a + FK constraint is defined +- BZ#3620: ORDER BY broken when using UNION ALL +- BZ#3621: Hexadecimal literal vs decimal literal + +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- gdk: Implemented a change to the way in which string bats are appended. + We now try harder to limit the growth of the string heap. + +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- monetdb5: Fixed adding of 0 intervals to dates. + +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- sql: Fixed sys.queue() implementation to report on other queries being + executed. + +* Fri Nov 14 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- sql: A number of bugs were fixed in the code to upgrade a database from + previous releases. This version should fix the upgrade of a database + that had been upgraded to the Oct2014 release, but also properly + upgrade directly from Jan2014 and Feb2013 releases. + +* Fri Nov 7 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- buildtools: The libraries included in the Windows installers have been upgraded. + We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8. + +* Wed Nov 5 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- gdk: Fixed some problems with BATsample. It was possible for BATsample to + return a value that was just beyond the end of the sampled BAT. Also, + on some systems the range of the rand() function is rather limited + (0..32767) and trying to get a sample larger than this range would + result in an infinite loop. + * Tue Oct 28 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.3-20141028 - Rebuilt. diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Nov 7 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- The libraries included in the Windows installers have been upgraded. + We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8. + * Thu Apr 10 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.1-20141024 - Jacqueline, the MonetDB/JAQL frontend, has been removed. The frontend never grew beyond being experimental, and there is no interest anymore diff --git a/buildtools/ChangeLog.Oct2014 b/buildtools/ChangeLog.Oct2014 --- a/buildtools/ChangeLog.Oct2014 +++ b/buildtools/ChangeLog.Oct2014 @@ -1,7 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Fri Nov 7 2014 Sjoerd Mullender <sjo...@acm.org> -- The libraries included in the Windows installers have been upgraded. - We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8. - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,63 @@ +monetdb (11.19.5-20141120) unstable; urgency=low + + * Rebuilt. + * BZ#3580: cosmetic change (append newline) + * BZ#3609: Incorrect use of generate_series + * BZ#3611: quantile() and median() commands crash when used 2x on the + same variable on a null table + * BZ#3612: assertion failure when deleting rows from table to which a + FK constraint is defined + * BZ#3620: ORDER BY broken when using UNION ALL + * BZ#3621: Hexadecimal literal vs decimal literal + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 20 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * gdk: Implemented a change to the way in which string bats are appended. + We now try harder to limit the growth of the string heap. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 20 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * monetdb5: Fixed adding of 0 intervals to dates. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 20 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * sql: Fixed sys.queue() implementation to report on other queries being + executed. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 20 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * sql: A number of bugs were fixed in the code to upgrade a database from + previous releases. This version should fix the upgrade of a database + that had been upgraded to the Oct2014 release, but also properly + upgrade directly from Jan2014 and Feb2013 releases. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 14 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * buildtools: The libraries included in the Windows installers have been upgraded. + We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 7 Nov 2014 10:37:22 +0100 + +monetdb (11.19.5-20141120) unstable; urgency=low + + * gdk: Fixed some problems with BATsample. It was possible for BATsample to + return a value that was just beyond the end of the sampled BAT. Also, + on some systems the range of the rand() function is rather limited + (0..32767) and trying to get a sample larger than this range would + result in an infinite loop. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 5 Nov 2014 10:37:22 +0100 + monetdb (11.19.3-20141028) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,17 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- Implemented a change to the way in which string bats are appended. + We now try harder to limit the growth of the string heap. + +* Wed Nov 5 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.5-20141120 +- Fixed some problems with BATsample. It was possible for BATsample to + return a value that was just beyond the end of the sampled BAT. Also, + on some systems the range of the rand() function is rather limited + (0..32767) and trying to get a sample larger than this range would + result in an infinite loop. + * Mon Jul 14 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.1-20141024 - Added "multifarm" capability. It is now possible to separate persistent and transient BATs into different directories (presumably on different diff --git a/gdk/ChangeLog.Oct2014 b/gdk/ChangeLog.Oct2014 --- a/gdk/ChangeLog.Oct2014 +++ b/gdk/ChangeLog.Oct2014 @@ -1,14 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Thu Nov 20 2014 Sjoerd Mullender <sjo...@acm.org> -- Implemented a change to the way in which string bats are appended. - We now try harder to limit the growth of the string heap. - -* Wed Nov 5 2014 Sjoerd Mullender <sjo...@acm.org> -- Fixed some problems with BATsample. It was possible for BATsample to - return a value that was just beyond the end of the sampled BAT. Also, - on some systems the range of the rand() function is rather limited - (0..32767) and trying to get a sample larger than this range would - result in an infinite loop. - diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b/gdk/gdk_batop.c @@ -62,15 +62,12 @@ insert_string_bat(BAT *b, BAT *n, int ap unsigned int tiv; /* tail value-as-int */ #endif var_t v; /* value */ - int ntw, btw; /* shortcuts for {b,n}->T->width */ size_t off; /* offset within n's string heap */ assert(b->htype == TYPE_void || b->htype == TYPE_oid); if (n->batCount == 0) return b; ni = bat_iterator(n); - btw = b->T->width; - ntw = n->T->width; hp = NULL; tp = NULL; if (append && b->htype != TYPE_void) { @@ -192,16 +189,15 @@ insert_string_bat(BAT *b, BAT *n, int ap * first that the width of b's offset heap can * accommodate all values. */ if (b->T->width < SIZEOF_VAR_T && - ((size_t) 1 << 8 * b->T->width) < (b->T->width <= 2 ? (b->T->vheap->size >> GDK_VARSHIFT) - GDK_VAROFFSET : (b->T->vheap->size >> GDK_VARSHIFT))) { + ((size_t) 1 << 8 * b->T->width) <= (b->T->width <= 2 ? (b->T->vheap->size >> GDK_VARSHIFT) - GDK_VAROFFSET : (b->T->vheap->size >> GDK_VARSHIFT))) { /* offsets aren't going to fit, so * widen offset heap */ if (GDKupgradevarheap(b->T, (var_t) (b->T->vheap->size >> GDK_VARSHIFT), 0, force) == GDK_FAIL) { toff = ~(size_t) 0; goto bunins_failed; } - btw = b->T->width; } - switch (btw) { + switch (b->T->width) { case 1: tt = TYPE_bte; tp = &tbv; @@ -235,12 +231,12 @@ insert_string_bat(BAT *b, BAT *n, int ap append = 1; } } - if (toff == 0 && ntw == btw && (b->htype == TYPE_void || !append)) { + if (toff == 0 && n->T->width == b->T->width && (b->htype == TYPE_void || !append)) { /* we don't need to do any translation of offset * values, nor do we need to do any calculations for * the head column, so we can use fast memcpy */ memcpy(Tloc(b, BUNlast(b)), Tloc(n, BUNfirst(n)), - BATcount(n) * ntw); + BATcount(n) * n->T->width); if (b->htype != TYPE_void) { assert(n->htype == b->htype); assert(!append); @@ -265,7 +261,7 @@ insert_string_bat(BAT *b, BAT *n, int ap if (!append && b->htype) hp = BUNhloc(ni, p); - switch (ntw) { + switch (n->T->width) { case 1: v = (var_t) *tbp++ + GDK_VAROFFSET; break; @@ -284,7 +280,7 @@ insert_string_bat(BAT *b, BAT *n, int ap v = (var_t) ((((size_t) v << GDK_VARSHIFT) + toff) >> GDK_VARSHIFT); assert(v >= GDK_VAROFFSET); assert(((size_t) v << GDK_VARSHIFT) < b->T->vheap->free); - switch (btw) { + switch (b->T->width) { case 1: assert(v - GDK_VAROFFSET < ((var_t) 1 << 8)); tbv = (unsigned char) (v - GDK_VAROFFSET); @@ -330,23 +326,35 @@ insert_string_bat(BAT *b, BAT *n, int ap if (b->H->type) *(oid *) Hloc(b, BUNlast(b)) = *(oid *) hp; v = (var_t) (off >> GDK_VARSHIFT); - switch (btw) { + if (b->T->width < SIZEOF_VAR_T && + ((size_t) 1 << 8 * b->T->width) <= (b->T->width <= 2 ? v - GDK_VAROFFSET : v)) { + /* offset isn't going to fit, + * so widen offset heap */ + if (GDKupgradevarheap(b->T, v, 0, force) == GDK_FAIL) { + goto bunins_failed; + } + } + switch (b->T->width) { case 1: assert(v - GDK_VAROFFSET < ((var_t) 1 << 8)); *(unsigned char *)Tloc(b, BUNlast(b)) = (unsigned char) (v - GDK_VAROFFSET); + b->T->heap.free += 1; break; case 2: assert(v - GDK_VAROFFSET < ((var_t) 1 << 16)); *(unsigned short *)Tloc(b, BUNlast(b)) = (unsigned short) (v - GDK_VAROFFSET); + b->T->heap.free += 2; break; #if SIZEOF_VAR_T == 8 case 4: assert(v < ((var_t) 1 << 32)); *(unsigned int *)Tloc(b, BUNlast(b)) = (unsigned int) v; + b->T->heap.free += 4; break; #endif _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
