Changeset: db8ef1a4d2f5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db8ef1a4d2f5 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/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_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_relop.mx gdk/gdk_utils.c gdk/gdk_value.c gdk/libbat.rc libversions monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_gencode.c sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out sql/test/leaks/Tests/check0_nogeom.stable.out testing/Mtest.py.in vertoo.data Branch: rdf Log Message:
Merge with default branch diffs (truncated from 750 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -516,3 +516,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 @@ -722,6 +722,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/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 @@ -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); - decref(i, TRUE, FALSE, lock); -} - -void BBPreleaseref(bat i) { int lock = locked_by ? BBP_getpid() != locked_by : 1; diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c --- a/gdk/gdk_posix.c +++ b/gdk/gdk_posix.c @@ -789,7 +789,7 @@ win_rmdir(const char *pathname) char buf[128], *p = reduce_dir_name(pathname, buf, sizeof(buf)); int ret = _rmdir(p); - if (ret < 0) { + if (ret < 0 && errno != ENOENT) { /* it could be the <expletive deleted> indexing * service which prevents us from doing what we have a * right to do, so try again (once) */ @@ -814,7 +814,7 @@ win_unlink(const char *pathname) (void) SetFileAttributes(pathname, FILE_ATTRIBUTE_NORMAL); ret = _unlink(pathname); } - if (ret < 0) { + if (ret < 0 && errno != ENOENT) { /* it could be the <expletive deleted> indexing * service which prevents us from doing what we have a * right to do, so try again (once) */ @@ -831,7 +831,7 @@ win_rename(const char *old, const char * { int ret = rename(old, new); - if (ret < 0) { + if (ret < 0 && errno != ENOENT) { /* it could be the <expletive deleted> indexing * service which prevents us from doing what we have a * right to do, so try again (once) */ diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h --- a/gdk/gdk_private.h +++ b/gdk/gdk_private.h @@ -27,41 +27,32 @@ int ATOMunknown_add(const char *nme); int ATOMunknown_del(int a); int ATOMunknown_find(const char *nme); str ATOMunknown_name(int a); -BUN BATbuncount(BAT *b); int BATcheckmodes(BAT *b, int persistent); BAT *BATclone(BAT *b, BUN capacity); -BAT *BATcol_name(BAT *b, const char *tnme); BATstore *BATcreatedesc(int ht, int tt, int heapnames); void BATdestroy(BATstore *bs); int BATfree(BAT *b); gdk_return BATgroup_internal(BAT **groups, BAT **extents, BAT **histo, BAT *b, BAT *g, BAT *e, BAT *h, int subsorted); BUN BATguess(BAT *b); void BATinit_idents(BAT *bn); -BAT *BATleftmergejoin(BAT *l, BAT *r, BUN estimate); -BAT *BATleftthetajoin(BAT *l, BAT *r, int mode, BUN estimate); BAT *BATload_intern(bat bid, int lock); BAT *BATmaterializet(BAT *b); int BATmultijoin(int argc, BAT *argv[], RowFcn tuple_fcn, ptr tuple_data, ColFcn value_fcn[], ptr value_data[], int orderspec); void BATpropagate(BAT *dst, BAT *src, int idx); str BATrename(BAT *b, const char *nme); void BATsetdims(BAT *b); -BAT *BATsorder(BAT *b); -BAT *BATsorder_rev(BAT *b); size_t BATvmsize(BAT *b, int dirty); void BBPcacheit(BATstore *bs, int lock); -void BBPdumpcache(void); /* never called: for debugging only */ void BBPdump(void); /* never called: for debugging only */ void BBPexit(void); void BBPinit(void); bat BBPinsert(BATstore *bs); -void BBPreleaselref(bat i); _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
