Changeset: d38597ef522a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d38597ef522a Added Files: monetdb5/optimizer/Tests/dataflow4.mal monetdb5/optimizer/Tests/dataflow4.stable.err monetdb5/optimizer/Tests/dataflow4.stable.out monetdb5/optimizer/Tests/dataflow5.mal monetdb5/optimizer/Tests/dataflow5.stable.err monetdb5/optimizer/Tests/dataflow5.stable.out monetdb5/optimizer/Tests/inlineFunction1.mal monetdb5/optimizer/Tests/inlineFunction1.stable.err monetdb5/optimizer/Tests/inlineFunction1.stable.out monetdb5/optimizer/Tests/inlineFunction3.mal monetdb5/optimizer/Tests/inlineFunction3.stable.err monetdb5/optimizer/Tests/inlineFunction3.stable.out monetdb5/optimizer/Tests/inlineFunction4.mal monetdb5/optimizer/Tests/inlineFunction4.stable.err monetdb5/optimizer/Tests/inlineFunction4.stable.out sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Solaris sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.Solaris sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.sql sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.err sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.out sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.bat sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.sh sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.pl sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.err sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.out Removed Files: sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.SunOS testing/subprocess26.py 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 clients/Tests/exports.stable.out clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm clients/python2/monetdb/mapi.py clients/python2/setup.py clients/python3/monetdb/mapi.py clients/python3/setup.py configure.ag debian/changelog gdk/gdk.h gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_relop.mx gdk/gdk_storage.c gdk/gdk_utils.c gdk/gdk_value.c gdk/libbat.rc libversions monetdb5/extras/jaql/parser/jaql.l monetdb5/mal/Tests/tst019.stable.out monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/modules/atoms/batxml.c monetdb5/modules/kernel/bat5.c monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/dataflow3.mal monetdb5/optimizer/Tests/dataflow3.stable.out monetdb5/optimizer/Tests/ifthencst.stable.out monetdb5/optimizer/Tests/inlineFunction.mal monetdb5/optimizer/Tests/inlineFunction.stable.out monetdb5/optimizer/Tests/inlineFunction2.mal monetdb5/optimizer/Tests/inlineFunction2.stable.out monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_evaluate.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql.mx sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_scenario.c sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/scripts/75_storagemodel.sql sql/server/rel_psm.c sql/storage/bat/bat_storage.c sql/storage/store.c sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out sql/test/BugTracker-2013/Tests/All sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0_nogeom.stable.out sql/test/mapi/Tests/php_monetdb.stable.out sql/test/mapi/Tests/php_monetdb_nogeom.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out testing/Makefile.ag testing/Mtest.py.in tools/merovingian/client/monetdb.1 vertoo.data Branch: sciql Log Message:
merged from Default diffs (truncated from 5954 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -515,3 +515,5 @@ 0d23123db0a3fd8564564c46789e8e549320c77b 1f74df406780bccca94e6128c6c62a0b101fc847 Oct2012_SP3_release 693187b90b57a610779caa942efe7514372125ee Feb2013_1 23894afae1679eb37e6866a793ba00782c4b0804 Feb2013_release +355d0e22cf76c461ba4009d11f84d7bd7349b2a4 Feb2013_3 +fc0c9b319d2275215c283a7ece1d389e55b43217 Feb2013_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Feb2013/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Feb2013-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -725,6 +725,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Wed Feb 27 2013 Sjoerd Mullender <[email protected]> - 11.15.3-20130227 +- Rebuilt. + * Tue Feb 12 2013 Sjoerd Mullender <[email protected]> - 11.15.1-20130212 - Rebuilt. 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 @@ -614,6 +614,11 @@ /* Define to 1 if the system has the type `_Bool'. */ #define HAVE__BOOL 1 +#ifdef _WIN64 +/* Define to 1 if you have the `_mul128' function. */ +#define HAVE__MUL128 1 +#endif + /* Define if you have _sys_siglist */ /* #undef HAVE__SYS_SIGLIST */ 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 @@ -1528,7 +1528,7 @@ str MALparser(Client c); str MALpass(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MALpipeline(Client c); str MALreader(Client c); -void MALresourceFairness(Client cntxt, MalBlkPtr mb, lng usec); +void MALresourceFairness(lng usec); str MALstartDataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANUALcompletion(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANUALcreate0(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); diff --git a/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm --- a/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm +++ b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm @@ -14,7 +14,7 @@ sub unquote { my ($class, $v) = @_; - return undef if !$v || $v eq 'NULL' || $v eq 'nil'; + return undef if !defined($v) || $v eq 'NULL' || $v eq 'nil'; if ( $v =~ /^["']/) { $v =~ s/^["']//; diff --git a/clients/python2/monetdb/mapi.py b/clients/python2/monetdb/mapi.py --- a/clients/python2/monetdb/mapi.py +++ b/clients/python2/monetdb/mapi.py @@ -229,7 +229,7 @@ class Connection(object): while count > 0: recv = self.socket.recv(count) if len(recv) == 0: - time.sleep(1) + raise OperationalError("Server closed connection") #logger.debug("II: package size: %i payload: %s" % (len(recv), recv)) count -= len(recv) result.write(recv) diff --git a/clients/python3/monetdb/mapi.py b/clients/python3/monetdb/mapi.py --- a/clients/python3/monetdb/mapi.py +++ b/clients/python3/monetdb/mapi.py @@ -237,7 +237,7 @@ class Connection(object): while count > 0: recv = self.socket.recv(count) if len(recv) == 0: - time.sleep(1) + raise OperationalError("Server closed connection") #logger.debug("II: package size: %i payload: %s" % (len(recv), recv)) count -= len(recv) result.write(recv) diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +monetdb (11.15.3-20130227) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Wed, 27 Feb 2013 15:26:54 +0100 + monetdb (11.15.1-20130212) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1449,8 +1449,6 @@ bat_iterator(BAT *b) * @item void * @tab BATsetcount (BAT *b, BUN cnt) * @item BUN - * @tab BATbuncount (BAT *b) - * @item str * @tab BATrename (BAT *b, str nme) * @item BAT * * @tab BATkey (BAT *b, int onoff) @@ -1469,10 +1467,6 @@ bat_iterator(BAT *b) * The function BATcount returns the number of associations stored in * the BAT. * - * The function BATbuncount returns the space that is occupied in - * associations in the BAT. This is not the same as BATcount, since - * the first N associations may be unused or delta data. - * * The BAT is given a new logical name using BATrename. * * The integrity properties to be maintained for the BAT are @@ -1861,7 +1855,7 @@ typedef struct { BAT *cache[2]; /* if loaded: BAT* handle + reverse */ str logical[2]; /* logical name + reverse */ str bak[2]; /* logical name + reverse backups */ - bat next[2]; /* next BBP slot in link list */ + bat next[2]; /* next BBP slot in linked list */ BATstore *desc; /* the BAT descriptor */ str physical; /* dir + basename for storage */ str options; /* A string list of options */ @@ -2266,8 +2260,6 @@ gdk_export str GDKstrdup(const char *s); * @tab * GDKmessage * @item bit - * @tab GDKsilent - * @item int * @tab * GDKfatal(str msg) * @item int @@ -2293,9 +2285,8 @@ gdk_export str GDKstrdup(const char *s); * should show if this mechanism is sufficient. Most routines return * a pointer with zero to indicate an error. * - * The error messages are also copied to standard output unless - * GDKsilent is set to a non-zero value. The last error message is - * kept around in a global variable. + * The error messages are also copied to standard output. The last + * error message is kept around in a global variable. * * Error messages can also be collected in a user-provided buffer, * instead of being echoed to a stream. This is a thread-specific diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c --- a/gdk/gdk_align.c +++ b/gdk/gdk_align.c @@ -519,7 +519,7 @@ BATmaterialize(BAT *b) * The @#VIEWunlink@ routine cuts a reference to the parent. Part of the view * destroy sequence. */ -void +static void VIEWunlink(BAT *b) { if (b) { diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c --- a/gdk/gdk_atoms.c +++ b/gdk/gdk_atoms.c @@ -48,7 +48,7 @@ shtCmp(const sht *l, const sht *r) return simple_CMP(l, r, sht); } -int +static int intCmp(const int *l, const int *r) { return simple_CMP(l, r, int); @@ -60,7 +60,7 @@ fltCmp(const flt *l, const flt *r) return simple_CMP(l, r, flt); } -int +static int lngCmp(const lng *l, const lng *r) { return simple_CMP(l, r, lng); @@ -1049,7 +1049,7 @@ strCmpNoNil(const unsigned char *l, cons return (*l < *r) ? -1 : 1; } -void +static void strHeap(Heap *d, size_t cap) { size_t size; @@ -1120,7 +1120,7 @@ strLocate(Heap *h, const char *v) return 0; } -var_t +static var_t strPut(Heap *h, var_t *dst, const char *v) { size_t elimbase = GDK_ELIMBASE(h->free); @@ -1627,7 +1627,7 @@ OIDbase(oid o) return o; } -oid +static oid OIDseed(oid o) { oid t, p = GDKoid; diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -2086,17 +2086,6 @@ BATsetcount(BAT *b, BUN cnt) assert(b->batCapacity >= cnt); } -/* - * The alternative routine is BATbuncount, which calculates the total - * buns in use. - */ -BUN -BATbuncount(BAT *b) -{ - BATcheck(b, "BATbuncount"); - return BUNlast(b); -} - size_t BATvmsize(BAT *b, int dirty) { @@ -2277,20 +2266,6 @@ BATroles(BAT *b, const char *hnme, const return b; } -BAT * -BATcol_name(BAT *b, const char *tnme) -{ - BATcheck(b, "BATcol_name"); - if (b->tident && !default_ident(b->tident)) - GDKfree(b->tident); - if (tnme) - b->tident = GDKstrdup(tnme); - else - b->tident = BATstring_t; - return b; -} - - /* * @- BATmmap * Changing the storage status of heaps in a BAT is done in BATmmap. diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b/gdk/gdk_batop.c @@ -1194,18 +1194,6 @@ BATorder_rev(BAT *b) } BAT * -BATsorder(BAT *b) -{ - return BATorder_internal(b, 1, 0, 0, "BATsorder"); -} - -BAT * -BATsorder_rev(BAT *b) -{ - return BATorder_internal(b, 1, 1, 0, "BATsorder_rev"); -} - -BAT * BATsort(BAT *b) { return BATorder_internal(b, 0, 0, 1, "BATsort"); diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -2233,19 +2233,6 @@ BBPkeepref(bat i) } void -BBPreleaselref(bat i) -{ - int lock = locked_by ? BBP_getpid() != locked_by : 1; - - if (i == bat_nil) - return; - if (i < 0) - i = -i; - assert(BBP_lrefs(i) > 0); _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
