Changeset: 4df16a7b83c7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4df16a7b83c7 Added Files: sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.sql sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.err sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.out sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.sql sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.err sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.out sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql 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/Tests/exports.stable.out 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.h gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_private.h gdk/libbat.rc java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Oct2014 monetdb5/mal/mal_interpreter.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/mal/sysmon.c monetdb5/optimizer/opt_generator.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Oct2014 sql/backends/monet5/bam/bam_lib.c sql/backends/monet5/bam/bam_lib.h sql/backends/monet5/generator/generator.c sql/backends/monet5/sql_result.c sql/jdbc/tests/Tests/Test_PSsqldata.stable.out sql/server/rel_updates.c sql/test/BugTracker-2014/Tests/All sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.err sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out sql/test/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/arrays.stable.err sql/test/pg_regress/Tests/boolean.stable.err sql/test/pg_regress/Tests/case.stable.err sql/test/pg_regress/Tests/char.stable.err sql/test/pg_regress/Tests/comments.stable.err sql/test/pg_regress/Tests/create_aggregate.stable.err sql/test/pg_regress/Tests/create_misc.stable.err sql/test/pg_regress/Tests/create_operator.stable.err sql/test/pg_regress/Tests/date.stable.err sql/test/pg_regress/Tests/date.stable.out sql/test/pg_regress/Tests/drop.stable.err sql/test/pg_regress/Tests/float4.stable.err sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/inet.stable.err sql/test/pg_regress/Tests/inet.stable.out sql/test/pg_regress/Tests/insert.stable.err sql/test/pg_regress/Tests/int2.stable.err sql/test/pg_regress/Tests/int4.stable.err sql/test/pg_regress/Tests/int8.stable.err sql/test/pg_regress/Tests/interval.stable.err sql/test/pg_regress/Tests/limit.stable.err sql/test/pg_regress/Tests/numeric.stable.err sql/test/pg_regress/Tests/numeric_big.stable.err sql/test/pg_regress/Tests/numerology.stable.err sql/test/pg_regress/Tests/oid.stable.err sql/test/pg_regress/Tests/select_into.stable.err sql/test/pg_regress/Tests/strings.stable.err sql/test/pg_regress/Tests/strings_cast.stable.err sql/test/pg_regress/Tests/strings_concat.stable.err sql/test/pg_regress/Tests/timestamp.stable.err sql/test/pg_regress/Tests/timestamptz.stable.err sql/test/pg_regress/Tests/varchar.stable.err sql/test/pg_regress/Tests/without_oid.stable.err vertoo.data Branch: mosaic Log Message:
Merge with default branch. diffs (truncated from 8209 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -581,3 +581,8 @@ 4f894ebf1a93ae895ec23d54ce2112bf21a6427e e92e434d19b7308c2952d50978c2cfd78e1bdb80 Oct2014_3 4f894ebf1a93ae895ec23d54ce2112bf21a6427e Oct2014_release 88a29a5a2bef5c6cef6b3bfa5ab7c4d3b855a2c8 Oct2014_release +eb2967c408350131b63f5393704fd697c701fc49 Oct2014_5 +2da8cbcb65ed56690bad29f089d996eac347b48d Oct2014_SP1_release +ee3d8e3af6aae6be6cfaa876a379a0751f164e97 Oct2014_7 +2da8cbcb65ed56690bad29f089d996eac347b48d Oct2014_SP1_release +6607367487d91eb02c5eb7dfb9d96606f8f7c6f0 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,48 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Fri Nov 21 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.7-20141121 +- Rebuilt. + +* 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/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1658,7 +1658,7 @@ str MTIMEtime_add_msec_interval_wrap(day str MTIMEtime_sub_msec_interval_wrap(daytime *ret, const daytime *t, const lng *msec); str MTIMEtimestamp(timestamp *ret, const int *sec); str MTIMEtimestamp2timestamp(timestamp *ret, const timestamp *src); -str MTIMEtimestamp_add(timestamp *ret, const timestamp *v, const lng *msecs); +str MTIMEtimestamp_add(timestamp *ret, const timestamp *v, const lng *msec); str MTIMEtimestamp_add_month_interval_lng_wrap(timestamp *ret, const timestamp *t, const lng *months); str MTIMEtimestamp_add_month_interval_wrap(timestamp *ret, const timestamp *t, const int *months); str MTIMEtimestamp_bulk(bat *ret, bat *bid); @@ -1678,7 +1678,7 @@ str MTIMEtimestamp_extract_daytime_defau str MTIMEtimestamp_fromstr(timestamp *ret, const char *const *d); str MTIMEtimestamp_hours(int *ret, const timestamp *t); str MTIMEtimestamp_inside_dst(bit *ret, const timestamp *p, const tzone *z); -str MTIMEtimestamp_lng(timestamp *ret, const lng *msecs); +str MTIMEtimestamp_lng(timestamp *ret, const lng *msec); str MTIMEtimestamp_lng_bulk(bat *ret, bat *bid); str MTIMEtimestamp_milliseconds(int *ret, const timestamp *t); str MTIMEtimestamp_minutes(int *ret, const timestamp *t); diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,69 @@ +monetdb (11.19.7-20141121) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 21 Nov 2014 10:14:18 +0100 + +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,10 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* 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.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1255,7 +1255,7 @@ gdk_export bte ATOMelmshift(int sz); break; \ } \ } else { \ - ATOMputFIX((b)->HT->type, (b)->HT->vheap, (p), v); \ + ATOMputFIX((b)->HT->type, (p), v); \ } \ } while (0) #define Hputvalue(b, p, v, copyall) HTputvalue(b, p, v, copyall, H) @@ -1303,7 +1303,7 @@ gdk_export bte ATOMelmshift(int sz); break; \ } \ } else { \ - ATOMreplaceFIX((b)->HT->type, (b)->HT->vheap, (p), v); \ + ATOMreplaceFIX((b)->HT->type, (p), v); \ } \ } while (0) #define Hreplacevalue(b, p, v) HTreplacevalue(b, p, v, H) diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h --- a/gdk/gdk_atoms.h +++ b/gdk/gdk_atoms.h @@ -244,7 +244,7 @@ gdk_export const ptr ptr_nil; if ((*BATatoms[type].atomPut)(heap, dst, src) == 0) \ goto bunins_failed; \ } while (0) -#define ATOMputFIX(type, heap, dst, src) \ +#define ATOMputFIX(type, dst, src) \ do { \ int t_ = (type); \ void *d_ = (dst); \ @@ -290,7 +290,7 @@ gdk_export const ptr ptr_nil; *d_ = loc_; \ ATOMfix(t_, s_); \ } while (0) -#define ATOMreplaceFIX(type, heap, dst, src) \ +#define ATOMreplaceFIX(type, dst, src) \ do { \ int t_ = (type); \ void *d_ = (dst); \ diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -1214,6 +1214,11 @@ BUNins(BAT *b, const void *h, const void return NULL; } + if (unshare_string_heap(b) == GDK_FAIL) { + GDKerror("BUNins: failed to unshare string heap\n"); + return NULL; + } + ALIGNins(b, "BUNins", force); b->batDirty = 1; if (b->H->hash && b->H->vheap) @@ -1320,6 +1325,11 @@ BUNappend(BAT *b, const void *t, bit for } void_materialize(b, t); + if (unshare_string_heap(b) == GDK_FAIL) { + GDKerror("BUNappend: failed to unshare string heap\n"); + return NULL; + } + setcolprops(b, b->H, h); setcolprops(b, b->T, t); diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b/gdk/gdk_batop.c @@ -41,13 +41,42 @@ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
