Changeset: 788b8310e281 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=788b8310e281 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_utils.c gdk/libbat.rc libversions monetdb5/modules/mal/mat.c monetdb5/tools/libmonetdb5.rc tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Feb2013 vertoo.data Branch: default Log Message:
merge diffs (189 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -532,3 +532,5 @@ 64caf95db680ce67235697114693cbcf4cc859eb 334140294fb20e04aa85ab7f06bc3da45b1ae4f3 before_new_JOIN_implementation 508d02b1f9bf8bac7a86664b092000dd3fd20824 before_reviving_RECYCLER 64caf95db680ce67235697114693cbcf4cc859eb fixed_strict_Windows_compilation +0ee7e3f578f7ed364682cae20edac923c27dfd86 Feb2013_13 +89679ea95aac8f548c787cd74c35212137f5b56f Feb2013_SP4_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-SP3/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Feb2013-SP4/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -755,6 +755,13 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog rm -fr $RPM_BUILD_ROOT %changelog +* Fri Sep 20 2013 Sjoerd Mullender <[email protected]> - 11.15.13-20130920 +- Rebuilt. + +* Tue Jul 30 2013 Fabian Groffen <[email protected]> - 11.15.13-20130920 +- merovingian: monetdb now no longer compresses output when not connected to a terminal, + bug #3292 + * Wed Jun 19 2013 Hannes Muehleisen <[email protected]> - 11.15.11-20130619 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.15.13-20130920) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Fri, 20 Sep 2013 10:23:23 +0200 + +monetdb (11.15.13-20130920) unstable; urgency=low + + * merovingian: monetdb now no longer compresses output when not connected to a terminal, + bug #3292 + + -- Fabian Groffen <[email protected]> Tue, 30 Jul 2013 10:23:22 +0200 + monetdb (11.15.11-20130619) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c --- a/gdk/gdk_utils.c +++ b/gdk/gdk_utils.c @@ -1639,8 +1639,8 @@ THRnew(str name) s->data[0] = THRdata[0]; s->sp = THRsp(); - PARDEBUG THRprintf(GDKstdout, "#%x " SZFMT " sp = " SZFMT "\n", s->tid, (size_t) pid, s->sp); - PARDEBUG THRprintf(GDKstdout, "#nrofthreads %d\n", GDKnrofthreads); + PARDEBUG fprintf(stderr, "#%x " SZFMT " sp = " SZFMT "\n", s->tid, (size_t) pid, s->sp); + PARDEBUG fprintf(stderr, "#nrofthreads %d\n", GDKnrofthreads); GDKnrofthreads++; } @@ -1657,9 +1657,7 @@ THRdel(Thread t) GDKfatal("THRdel: illegal call\n"); } MT_lock_set(&GDKthreadLock, "THRdel"); -/* The stream may haven been closed (e.g. in freeClient) causing an abort - PARDEBUG THRprintf(GDKstdout, "#pid = " SZFMT ", disconnected, %d left\n", (size_t) t->pid, GDKnrofthreads); -*/ + PARDEBUG fprintf(stderr, "#pid = " SZFMT ", disconnected, %d left\n", (size_t) t->pid, GDKnrofthreads); t->pid = 0; GDKnrofthreads--; diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,13 +36,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=9:4:0 +GDK_VERSION=9:5:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=6:5:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=14:4:0 +MONETDB5_VERSION=14:5:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=4:6:1 +STREAM_VERSION=4:7:1 diff --git a/monetdb5/modules/mal/mat.c b/monetdb5/modules/mal/mat.c --- a/monetdb5/modules/mal/mat.c +++ b/monetdb5/modules/mal/mat.c @@ -114,7 +114,6 @@ MATpackInternal(MalStkPtr stk, InstrPtr bn = BATnew(TYPE_void, tt, cap); if (bn == NULL) throw(MAL, "mat.pack", MAL_MALLOC_FAIL); - BATsettrivprop(bn); for (i = 1; i < p->argc; i++) { b = BATdescriptor(stk->stk[getArg(p,i)].val.ival); @@ -441,36 +440,47 @@ MATpack(Client cntxt, MalBlkPtr mb, MalS return MATpackInternal(stk,p); } -// merging multiple OID lists +// merging multiple OID lists, optimized for empty bats +// Further improvement should come from multi-bat merging. str MATmergepack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p) { int i, *ret = (int*) getArgReference(stk,p,0); + int top=0, *bids; BAT *b, *bn, *bm; BUN cap = 0; (void)cntxt; (void)mb; + bids = (int*) GDKzalloc(sizeof(int) * p->argc); + if ( bids ==0) + throw(MAL,"mat.mergepack",MAL_MALLOC_FAIL); for (i = 1; i < p->argc; i++) { int bid = stk->stk[getArg(p,i)].val.ival; b = BBPquickdesc(ABS(bid),FALSE); - if (b ) + if (b ){ cap += BATcount(b); + if ( BATcount(b) ) + bids[top++] = b->batCacheid; + } } bn = BATnew(TYPE_void, TYPE_oid, cap); if (bn == NULL) throw(MAL, "mat.pack", MAL_MALLOC_FAIL); - BATsettrivprop(bn); - for (i = 1; i < p->argc; i++) { - b = BATdescriptor(stk->stk[getArg(p,i)].val.ival); + for (i = 0; i < top; i++) { + b = BATdescriptor(bids[i]); if( b ){ + if ( i == 1) + BATseqbase(bn, b->hseqbase); bm = BATmergecand(bn,b); BBPunfix(b->batCacheid); BBPunfix(bn->batCacheid); bn = bm; } } + GDKfree(bids); + BATsettrivprop(bn); assert(!bn->H->nil || !bn->H->nonil); assert(!bn->T->nil || !bn->T->nonil); BBPkeepref(*ret = bn->batCacheid); diff --git a/tools/merovingian/ChangeLog-Archive b/tools/merovingian/ChangeLog-Archive --- a/tools/merovingian/ChangeLog-Archive +++ b/tools/merovingian/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Jul 30 2013 Fabian Groffen <[email protected]> - 11.15.13-20130920 +- monetdb now no longer compresses output when not connected to a terminal, + bug #3292 + * Sat Dec 1 2012 Fabian Groffen <[email protected]> - 11.15.1-20130212 - Upgrade support for dbfarms from Mar2011 and Aug2011 was dropped diff --git a/tools/merovingian/ChangeLog.Feb2013 b/tools/merovingian/ChangeLog.Feb2013 --- a/tools/merovingian/ChangeLog.Feb2013 +++ b/tools/merovingian/ChangeLog.Feb2013 @@ -1,7 +1,3 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog -* Tue Jul 30 2013 Fabian Groffen <[email protected]> -- monetdb now no longer compresses output when not connected to a terminal, - bug #3292 - _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
