Changeset: cec3a9274f72 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cec3a9274f72 Added Files: sql/test/BugTracker-2014/Tests/oid-table-assert.Bug-3514.sql sql/test/BugTracker-2014/Tests/oid-table-assert.Bug-3514.stable.err sql/test/BugTracker-2014/Tests/oid-table-assert.Bug-3514.stable.out sql/test/BugTracker-2014/Tests/round-properties.Bug-3515.sql sql/test/BugTracker-2014/Tests/round-properties.Bug-3515.stable.err sql/test/BugTracker-2014/Tests/round-properties.Bug-3515.stable.out 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.Jan2014 clients/R/MonetDB.R/DESCRIPTION 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/gdk.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_join_legacy.c gdk/gdk_logger.c gdk/gdk_sample.c gdk/gdk_select.c gdk/gdk_unique.c gdk/gdk_utils.c gdk/libbat.rc libversions monetdb5/extras/sphinx/sphinx.c monetdb5/mal/mal_authorize.c monetdb5/mal/mal_builder.c monetdb5/mal/mal_function.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/array.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/microbenchmark.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/cluster.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/sample.c monetdb5/modules/mal/sample.h monetdb5/modules/mal/zorder.c monetdb5/optimizer/opt_wrapper.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/datacell/basket.c sql/backends/monet5/sql.c sql/backends/monet5/sql_round_impl.h sql/benchmarks/ssbm/Tests/01-13.reqtests sql/benchmarks/ssbm/Tests/01-explain.reqtests sql/benchmarks/ssbm/Tests/01-plan.reqtests sql/benchmarks/ssbm/Tests/01.reqtests sql/benchmarks/ssbm/Tests/02-explain.reqtests sql/benchmarks/ssbm/Tests/02-plan.reqtests sql/benchmarks/ssbm/Tests/02.reqtests sql/benchmarks/ssbm/Tests/03-explain.reqtests sql/benchmarks/ssbm/Tests/03-plan.reqtests sql/benchmarks/ssbm/Tests/03.reqtests sql/benchmarks/ssbm/Tests/04-explain.reqtests sql/benchmarks/ssbm/Tests/04-plan.reqtests sql/benchmarks/ssbm/Tests/04.reqtests sql/benchmarks/ssbm/Tests/05-explain.reqtests sql/benchmarks/ssbm/Tests/05-plan.reqtests sql/benchmarks/ssbm/Tests/05.reqtests sql/benchmarks/ssbm/Tests/06-explain.reqtests sql/benchmarks/ssbm/Tests/06-plan.reqtests sql/benchmarks/ssbm/Tests/06.reqtests sql/benchmarks/ssbm/Tests/07-explain.reqtests sql/benchmarks/ssbm/Tests/07-plan.reqtests sql/benchmarks/ssbm/Tests/07.reqtests sql/benchmarks/ssbm/Tests/08-explain.reqtests sql/benchmarks/ssbm/Tests/08-plan.reqtests sql/benchmarks/ssbm/Tests/08.reqtests sql/benchmarks/ssbm/Tests/09-explain.reqtests sql/benchmarks/ssbm/Tests/09-plan.reqtests sql/benchmarks/ssbm/Tests/09.reqtests sql/benchmarks/ssbm/Tests/10-explain.reqtests sql/benchmarks/ssbm/Tests/10-plan.reqtests sql/benchmarks/ssbm/Tests/10.reqtests sql/benchmarks/ssbm/Tests/11-explain.reqtests sql/benchmarks/ssbm/Tests/11-plan.reqtests sql/benchmarks/ssbm/Tests/11.reqtests sql/benchmarks/ssbm/Tests/12-explain.reqtests sql/benchmarks/ssbm/Tests/12-plan.reqtests sql/benchmarks/ssbm/Tests/12.reqtests sql/benchmarks/ssbm/Tests/13-explain.reqtests sql/benchmarks/ssbm/Tests/13-plan.reqtests sql/benchmarks/ssbm/Tests/13.reqtests sql/benchmarks/ssbm/Tests/check1.reqtests sql/benchmarks/ssbm/Tests/load.reqtests sql/storage/bat/bat_logger.c sql/storage/bat/bat_utils.c sql/test/BugTracker-2014/Tests/All sql/test/pg_regress/Tests/numeric.sql sql/test/pg_regress/Tests/numeric.stable.err sql/test/pg_regress/Tests/numeric.stable.out sql/test/pg_regress/postgresql2sql99.sh vertoo.data Branch: bamloader Log Message:
Merge with default branch. diffs (truncated from 5747 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -567,3 +567,5 @@ 13e1b24f442791f5ab790fa77453d3bd4e88a9c8 c3051f066a9eea814487dfb0b7cf7070ae16cd21 Jan2014_17 13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release 389f5f0d4c43ab689e31c28e01b43c8b7ba8de9c Jan2014_SP2_release +dc158ade928d0305f3f0e7ef9613dd81329f613d Jan2014_19 +0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -49,7 +49,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/Jan2014-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jan2014-SP3/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -841,6 +841,19 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Tue Jul 22 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.19-20140722 +- Rebuilt. +- BZ#3487: dead link to "Professional services" +- BZ#3500: MonetDB driver wants an empty string for SQLTables and + SQLColumns API calls, where other drivers expect NULL +- BZ#3514: mserver5 crash due (assertion failure in gdk_select.c) +- BZ#3515: mserver5 crash due (assertion failure in gdk_bat.c) + +* Tue Jun 3 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.19-20140722 +- buildtools: Fix configure to continue without Python if the python binary is + too old. This instead of always aborting configure if python happens + to be too old. + * Wed May 14 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.17-20140514 - Rebuilt. - BZ#3482: Crossproduct error diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,11 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Jun 3 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.19-20140722 +- Fix configure to continue without Python if the python binary is + too old. This instead of always aborting configure if python happens + to be too old. + * Wed Apr 30 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 - Lots of minor fixes were made for potential defects found by Coverity Scan. diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014 --- a/buildtools/ChangeLog.Jan2014 +++ b/buildtools/ChangeLog.Jan2014 @@ -1,8 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Tue Jun 3 2014 Sjoerd Mullender <sjo...@acm.org> -- Fix configure to continue without Python if the python binary is - too old. This instead of always aborting configure if python happens - to be too old. - diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION --- a/clients/R/MonetDB.R/DESCRIPTION +++ b/clients/R/MonetDB.R/DESCRIPTION @@ -1,6 +1,6 @@ Package: MonetDB.R Version: 0.9.4 -Date: 2013-07-16 +Date: 2013-07-18 Title: Connect MonetDB to R Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email = "han...@cwi.nl"), person("Thomas Lumley", role = "ctb"), 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 @@ -160,7 +160,7 @@ int BATmmap(BAT *b, int hb, int tb, int BAT *BATmode(BAT *b, int onoff); gdk_return BATmultiprintf(stream *f, int argc, BAT *argv[], int printoid, int order, int printorderby); int BATname(BAT *b, const char *nme); -BAT *BATnew(int hdtype, int tltype, BUN capacity, int role); +BAT *BATnew(int hdtype, int tltype, BUN capacity, int role) __attribute__((warn_unused_result)); BAT *BATorder(BAT *b); BAT *BATorder_rev(BAT *b); int BATordered(BAT *b); @@ -1837,8 +1837,8 @@ str SABmarchConnection(int *ret, str *ho str SABmarchScenario(int *ret, str *lang); str SABprelude(int *ret); str SABretreatScenario(int *ret, str *lang); -str SAMPLEuniform(bat *r, bat *b, ptr s); -str SAMPLEuniform_dbl(bat *r, bat *b, ptr p); +str SAMPLEuniform(bat *r, bat *b, wrd *s); +str SAMPLEuniform_dbl(bat *r, bat *b, dbl *p); str SERVERbindBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str SERVERclient(int *res, stream **In, stream **Out); str SERVERconnect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +monetdb (11.17.19-20140722) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jul 2014 11:42:09 +0200 + +monetdb (11.17.19-20140722) unstable; urgency=low + + * Rebuilt. + * BZ#3487: dead link to "Professional services" + * BZ#3500: MonetDB driver wants an empty string for SQLTables and + SQLColumns API calls, where other drivers expect NULL + * BZ#3514: mserver5 crash due (assertion failure in gdk_select.c) + * BZ#3515: mserver5 crash due (assertion failure in gdk_bat.c) + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jul 2014 11:42:07 +0200 + +monetdb (11.17.19-20140722) unstable; urgency=low + + * buildtools: Fix configure to continue without Python if the python binary is + too old. This instead of always aborting configure if python happens + to be too old. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 3 Jun 2014 11:42:07 +0200 + monetdb (11.17.17-20140514) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1127,7 +1127,8 @@ gdk_export void HEAP_free(Heap *heap, va */ #define BATDELETE (-9999) -gdk_export BAT *BATnew(int hdtype, int tltype, BUN capacity, int role); +gdk_export BAT *BATnew(int hdtype, int tltype, BUN capacity, int role) + __attribute__((warn_unused_result)); gdk_export BAT *BATextend(BAT *b, BUN newcap); /* internal */ diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -389,10 +389,12 @@ BATclone(BAT *b, BUN cap, int role) { BAT *c = BATnew(b->htype, b->ttype, cap, role); - if (c && c->htype == TYPE_void && b->hseqbase != oid_nil) - BATseqbase(c, b->hseqbase); - if (c && c->ttype == TYPE_void && b->tseqbase != oid_nil) - BATseqbase(BATmirror(c), b->tseqbase); + if (c) { + if (c->htype == TYPE_void && b->hseqbase != oid_nil) + BATseqbase(c, b->hseqbase); + if (c->ttype == TYPE_void && b->tseqbase != oid_nil) + BATseqbase(BATmirror(c), b->tseqbase); + } return c; } @@ -1286,6 +1288,7 @@ BUNappend(BAT *b, const void *t, bit for return NULL; } + assert(!isVIEW(b)); bm = BBP_cache(-b->batCacheid); if ((b->tkey & BOUND2BTRUE) && BUNfnd(bm, t) != BUN_NONE) { return b; diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b/gdk/gdk_batop.c @@ -457,6 +457,7 @@ BATappend(BAT *b, BAT *n, bit force) if (b == NULL || n == NULL || (sz = BATcount(n)) == 0) { return b; } + assert(!isVIEW(b)); if (b->htype != TYPE_void && b->htype != TYPE_oid) { GDKerror("BATappend: input must be (V)OID headed\n"); return NULL; @@ -2256,8 +2257,10 @@ BATintersectcand(BAT *a, BAT *b) if (BATcount(a) == 0 || BATcount(b) == 0) { bn = BATnew(TYPE_void, TYPE_void, 0, TRANSIENT); - BATseqbase(bn, 0); - BATseqbase(BATmirror(bn), 0); + if (bn) { + BATseqbase(bn, 0); + BATseqbase(BATmirror(bn), 0); + } return bn; } diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c --- a/gdk/gdk_imprints.c +++ b/gdk/gdk_imprints.c @@ -563,18 +563,42 @@ BATimprints(BAT *b) { if (imprints == NULL) { GDKerror("#BATimprints: memory allocation error.\n"); MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)), - "BATimprints"); + "BATimprints"); return NULL; } #define SMP_SIZE 2048 s = BATsample(b, SMP_SIZE); + if (s == NULL) { + MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)), + "BATimprints"); + GDKfree(imprints); + return NULL; + } smp = BATsubunique(b, s); BBPunfix(s->batCacheid); + if (smp == NULL) { + MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)), + "BATimprints"); + GDKfree(imprints); + return NULL; + } s = BATproject(smp,b); BBPunfix(smp->batCacheid); + if (s == NULL) { + MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)), + "BATimprints"); + GDKfree(imprints); + return NULL; + } s->tkey=1; /* we know is unique on tail now */ - BATsubsort(&smp,NULL,NULL,s,NULL,NULL,0,0); + if (BATsubsort(&smp,NULL,NULL,s,NULL,NULL,0,0) == GDK_FAIL) { + MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)), + "BATimprints"); + BBPunfix(s->batCacheid); + GDKfree(imprints); + return NULL; + } BBPunfix(s->batCacheid); /* smp now is ordered and unique on tail */ assert(smp->tkey && smp->tsorted); @@ -592,7 +616,7 @@ BATimprints(BAT *b) { GDKfree(imprints); BBPunfix(smp->batCacheid); MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)), - "BATimprints"); + "BATimprints"); return NULL; } sprintf(imprints->bins->filename, "%s.bins", nme); @@ -601,7 +625,7 @@ BATimprints(BAT *b) { GDKfree(imprints->bins); GDKfree(imprints); MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)), - "BATimprints"); + "BATimprints"); return NULL; } diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c --- a/gdk/gdk_join.c +++ b/gdk/gdk_join.c @@ -2506,9 +2506,14 @@ subleftjoin(BAT **r1p, BAT **r2p, BAT *l rcount = MIN(rcount, BATcount(sr)); if (lcount == 0 || rcount == 0) { r1 = BATnew(TYPE_void, TYPE_void, 0, TRANSIENT); + r2 = BATnew(TYPE_void, TYPE_void, 0, TRANSIENT); + if (r1 == NULL || r2 == NULL) { + BBPreclaim(r1); + BBPreclaim(r2); + return GDK_FAIL; + } BATseqbase(r1, 0); BATseqbase(BATmirror(r1), 0); - r2 = BATnew(TYPE_void, TYPE_void, 0, TRANSIENT); BATseqbase(r2, 0); BATseqbase(BATmirror(r2), 0); *r1p = r1; @@ -2641,9 +2646,14 @@ BATsubjoin(BAT **r1p, BAT **r2p, BAT *l, rcount = MIN(rcount, BATcount(sr)); if (lcount == 0 || rcount == 0) { r1 = BATnew(TYPE_void, TYPE_void, 0, TRANSIENT); + r2 = BATnew(TYPE_void, TYPE_void, 0, TRANSIENT); + if (r1 == NULL || r2 == NULL) { + BBPreclaim(r1); + BBPreclaim(r2); + return GDK_FAIL; + } BATseqbase(r1, 0); BATseqbase(BATmirror(r1), 0); - r2 = BATnew(TYPE_void, TYPE_void, 0, TRANSIENT); BATseqbase(r2, 0); BATseqbase(BATmirror(r2), 0); *r1p = r1; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
