Changeset: 4056fa54f645 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4056fa54f645 Added Files: sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.sql sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.err sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.sql sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.err sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out Modified Files: buildtools/ChangeLog.Apr2012 buildtools/doc/windowsbuild.rst configure.ag gdk/gdk.h gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_bbp.mx gdk/gdk_heap.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_search.mx gdk/gdk_storage.c gdk/gdk_utils.c monetdb5/scheduler/run_pipeline.mx sql/server/rel_bin.c sql/server/rel_psm.c sql/server/sql_rel2bin.c sql/server/sql_statement.c sql/server/sql_statement.h sql/storage/restrict/restrict_storage.c sql/storage/restrict/restrict_table.c sql/storage/store.c sql/test/BugTracker-2012/Tests/All sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.sql sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.err sql/test/BugTracker-2012/Tests/table_returning_func_returns_too_many_columns.Bug-3077.stable.err Branch: default Log Message:
Merge with Apr2012 branch. diffs (truncated from 1879 to 300 lines): diff --git a/buildtools/ChangeLog.Apr2012 b/buildtools/ChangeLog.Apr2012 --- a/buildtools/ChangeLog.Apr2012 +++ b/buildtools/ChangeLog.Apr2012 @@ -1,3 +1,6 @@ # ChangeLog file for buildtools # This file is updated with Maddlog +* Wed May 2 2012 Sjoerd Mullender <sjo...@acm.org> +- Windows: we now use OpenSSL 1.0.1b. + diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst --- a/buildtools/doc/windowsbuild.rst +++ b/buildtools/doc/windowsbuild.rst @@ -285,17 +285,17 @@ required for the MonetDB5 component, and the clients component when it needs to talk to a MonetDB5 server. Download the source from http://www.openssl.org/. We used the latest -stable version (1.0.0d). Follow the instructions in the file +stable version (1.0.1b). Follow the instructions in the file ``INSTALL.W32`` or ``INSTALL.W64``. We used the option ``enable-static-engine`` as described in the instructions. .. The actual commands used were:: - perl Configure VC-WIN32 no-asm enable-static-engine --prefix=C:\Libraries\openssl-1.0.0d.win32 + perl Configure VC-WIN32 no-asm enable-static-engine --prefix=C:\Libraries\openssl-1.0.1b.win32 ms\do_ms.bat nmake /f ms\ntdll.mak nmake /f ms\ntdll.mak install and:: - perl Configure VC-WIN64A enable-static-engine --prefix=C:\Libraries\openssl-1.0.0d.win64 + perl Configure VC-WIN64A enable-static-engine --prefix=C:\Libraries\openssl-1.0.1b.win64 ms\do_win64a nmake /f ms\ntdll.mak nmake /f ms\ntdll.mak install diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -2639,7 +2639,6 @@ AC_CHECK_FUNCS([\ strtoll \ strtoull \ sysconf \ - task_for_pid \ task_info \ times \ trunc \ diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -2194,7 +2194,7 @@ gdk_export void *GDKmmap(char *path, int gdk_export size_t GDK_mem_bigsize; /* size after which we use anonymous VM rather than malloc */ gdk_export size_t GDK_mem_maxsize; /* max allowed size of committed memory */ gdk_export size_t GDK_vm_maxsize; /* max allowed size of reserved vm */ -gdk_export int GDK_vm_trim; /* run vmtrim thread */ +gdk_export int GDK_vm_trim; /* allow trimming */ gdk_export size_t GDKmem_inuse(void); /* RAM/swapmem that MonetDB is really using now */ gdk_export size_t GDKmem_cursize(void); /* RAM/swapmem that MonetDB has claimed from OS */ diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c --- a/gdk/gdk_align.c +++ b/gdk/gdk_align.c @@ -471,7 +471,7 @@ BATmaterializeh(BAT *b) HASHdestroy(b); b->H->heap.filename = NULL; - if (HEAPalloc(&b->H->heap, cnt, sizeof(oid), b->batPersistence == PERSISTENT) < 0) { + if (HEAPalloc(&b->H->heap, cnt, sizeof(oid)) < 0) { b->H->heap = head; return NULL; } @@ -619,7 +619,7 @@ VIEWreset(BAT *b) if (head.filename == NULL) goto bailout; snprintf(head.filename, nmelen + 12, "%s.head", nme); - if (n->htype && HEAPalloc(&head, cnt, Hsize(n), b->batPersistence == PERSISTENT) < 0) + if (n->htype && HEAPalloc(&head, cnt, Hsize(n)) < 0) goto bailout; } if (n->ttype) { @@ -627,7 +627,7 @@ VIEWreset(BAT *b) if (tail.filename == NULL) goto bailout; snprintf(tail.filename, nmelen + 12, "%s.tail", nme); - if (n->ttype && HEAPalloc(&tail, cnt, Tsize(n), b->batPersistence == PERSISTENT) < 0) + if (n->ttype && HEAPalloc(&tail, cnt, Tsize(n)) < 0) goto bailout; } if (n->H->vheap) { diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c --- a/gdk/gdk_atoms.c +++ b/gdk/gdk_atoms.c @@ -1077,7 +1077,7 @@ strHeap(Heap *d, size_t cap) cap = MAX(cap, BATTINY); size = GDK_STRHASHTABLE * sizeof(stridx_t) + MIN(GDK_ELIMLIMIT, cap * GDK_VARALIGN); - if (HEAPalloc(d, size, 1, 0) >= 0) { + if (HEAPalloc(d, size, 1) >= 0) { d->free = GDK_STRHASHTABLE * sizeof(stridx_t); memset(d->base, 0, d->free); d->hashash = 1; /* new string heaps get the hash value (and length) stored */ diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -255,10 +255,10 @@ BATnewstorage(int ht, int tt, BUN cap) bn->U->capacity = cap; /* alloc the main heaps */ - if (ht && HEAPalloc(&bn->H->heap, cap, bn->H->width, 0) < 0) { + if (ht && HEAPalloc(&bn->H->heap, cap, bn->H->width) < 0) { return NULL; } - if (tt && HEAPalloc(&bn->T->heap, cap, bn->T->width, 0) < 0) { + if (tt && HEAPalloc(&bn->T->heap, cap, bn->T->width) < 0) { if (ht) HEAPfree(&bn->H->heap); return NULL; @@ -2359,7 +2359,7 @@ int BATmmap(BAT *b, int hb, int tb, int hhp, int thp, int force) { BATcheck(b, "BATmmap"); - IODEBUG THRprintf(GDKout, "#BATmmap(%s,%d,%d,%d,%d%s)\n", BATgetId(b), hb, tb, hhp, thp, force ? ",force" : ""); + IODEBUG THRprintf(GDKstdout, "#BATmmap(%s,%d,%d,%d,%d%s)\n", BATgetId(b), hb, tb, hhp, thp, force ? ",force" : ""); /* Reverse back if required, as this determines which heap is * saved in the "hheap" file and which in the "theap" file. @@ -2579,11 +2579,11 @@ backup_new(Heap *hp, int lockbat) /* no backup yet, so move the existing X.new there out * of the way */ ret = rename(batpath, bakpath); - IODEBUG THRprintf(GDKout, "#rename(%s,%s) = %d\n", batpath, bakpath, ret); + IODEBUG THRprintf(GDKstdout, "#rename(%s,%s) = %d\n", batpath, bakpath, ret); } else if (batret == 0) { /* there is a backup already; just remove the X.new */ ret = unlink(batpath); - IODEBUG THRprintf(GDKout, "#unlink(%s) = %d\n", batpath, ret); + IODEBUG THRprintf(GDKstdout, "#unlink(%s) = %d\n", batpath, ret); } for (xx = lockbat; xx >= 0; xx--) gdk_unset_lock(GDKtrimLock(xx), "TMsubcommit"); @@ -3051,7 +3051,7 @@ BATassertHeadProps(BAT *b) "%s.hash" SZFMT, nme, MT_getpid()); ext = GDKstrdup(hp->filename + nmelen + 1); if ((hs = HASHnew(hp, b->htype, BUNlast(b), - HASHmask(b->batCount), 0)) == NULL) { + HASHmask(b->batCount))) == NULL) { GDKfree(ext); GDKfree(hp->filename); GDKfree(hp); @@ -3214,7 +3214,7 @@ BATderiveHeadProps(BAT *b, int expensive "%s.hash" SZFMT, nme, MT_getpid()) < 0 || (ext = GDKstrdup(hp->filename + nmelen + 1)) == NULL || (hs = HASHnew(hp, b->htype, BUNlast(b), - HASHmask(b->batCount), 0)) == NULL) { + HASHmask(b->batCount))) == NULL) { if (hp) { if (hp->filename) GDKfree(hp->filename); diff --git a/gdk/gdk_bbp.mx b/gdk/gdk_bbp.mx --- a/gdk/gdk_bbp.mx +++ b/gdk/gdk_bbp.mx @@ -591,7 +591,7 @@ fixoidheapcolumn(BAT *b, const char *src w = b->H->width; /* remember old width */ b->H->width = 1; b->H->shift = 0; - if (HEAPalloc(&b->H->heap, b->U->capacity, SIZEOF_OID, 1) < 0) + if (HEAPalloc(&b->H->heap, b->U->capacity, SIZEOF_OID) < 0) GDKfatal("fixoidheap: allocating new %s heap " "for BAT %d failed\n", headtail, bid); @@ -654,7 +654,7 @@ fixoidheapcolumn(BAT *b, const char *src b->H->width = SIZEOF_OID; b->H->shift = 3; assert(b->H->width == (1 << b->H->shift)); - if (HEAPalloc(&b->H->heap, b->U->capacity, SIZEOF_OID, 1) < 0) + if (HEAPalloc(&b->H->heap, b->U->capacity, SIZEOF_OID) < 0) GDKfatal("fixoidheap: allocating new %s heap " "for BAT %d failed\n", headtail, bid); @@ -1107,7 +1107,7 @@ BBPheader(FILE *fp, int *BBPlimit, oid * } GDKfilepath(path, BATDIR, BBP_physical(bn->batCacheid), "@4"); GDKcreatedir(path); - IODEBUG mnstr_printf(GDKerr, "#symlink %s ->%s\n", @3, path); + IODEBUG mnstr_printf(GDKstdout, "#symlink %s ->%s\n", @3, path); if (symlink(@3, path) < 0) { GDKerror("BBPimportEntry: cannot link '%s' -> '%s'\n", path, @3); BBPdestroy(bn); @@ -1133,7 +1133,7 @@ BBPheader(FILE *fp, int *BBPlimit, oid * } GDKfilepath(path, BATDIR, BBP_physical(bn->batCacheid), "@3"); GDKcreatedir(path); - IODEBUG mnstr_printf(GDKerr, "#symlink %s ->%s\n", @2, path); + IODEBUG mnstr_printf(GDKstdout, "#symlink %s ->%s\n", @2, path); if (symlink(@2, path) < 0) { GDKerror("BBPimportEntry: cannot link '%s' -> '%s'\n", path, @2); BBPdestroy(bn); @@ -1179,7 +1179,7 @@ BBPimportEntry(char *nme) int BBPlimit; int bbpversion; - IODEBUG mnstr_printf(GDKerr,"#importEntry %s\n",nme); + IODEBUG mnstr_printf(GDKstdout,"#importEntry %s\n",nme); if (strlen(nme) >= sizeof(bbpdir)) { GDKerror("BBPimportEntry: file name too long\n"); return 0; @@ -1283,11 +1283,11 @@ BBPinit(void) GDKfilepath(buf, BAKDIR, "BBP", "bak"); if (stat(buf, &st) < 0) { /* no BBP.bak (nor BBP.dir or BACKUP/BBP.dir): create a new one */ - IODEBUG THRprintf(GDKout, "#BBPdir: initializing BBP.\n"); /* BBPdir instead of BBPinit for backward compatibility of error messages */ + IODEBUG THRprintf(GDKstdout, "#BBPdir: initializing BBP.\n"); /* BBPdir instead of BBPinit for backward compatibility of error messages */ if (BBPdir(0, NULL) < 0) goto bailout; } else if (GDKmove(BATDIR, "BBP", "bak", BATDIR, "BBP", "dir") == 0) - IODEBUG THRprintf(GDKout, "#BBPinit: reverting to dir saved in BBP.bak.\n"); + IODEBUG THRprintf(GDKstdout, "#BBPinit: reverting to dir saved in BBP.bak.\n"); if ((fp = GDKfilelocate("BBP", "r", "dir")) == NULL) goto bailout; @@ -1566,11 +1566,11 @@ BBPdir_subcommit(int cnt, bat *subcommit n = BBPsize; if (GDKdebug & (IOMASK | 1)) - THRprintf(GDKout, "#BBPdir: writing BBP.dir (%d bats).\n", n); + THRprintf(GDKstdout, "#BBPdir: writing BBP.dir (%d bats).\n", n); IODEBUG { - THRprintf(GDKout, "#BBPdir start oid="); - OIDwrite(GDKout); - THRprintf(GDKout, "\n"); + THRprintf(GDKstdout, "#BBPdir start oid="); + OIDwrite(GDKstdout); + THRprintf(GDKstdout, "\n"); } if (BBPdir_header(s, n) < 0) @@ -1596,7 +1596,7 @@ BBPdir_subcommit(int cnt, bat *subcommit if (BBP_status(i) & mask) { if (new_bbpentry(s, i) < 0) goto bailout; - IODEBUG new_bbpentry(GDKerr, i); + IODEBUG new_bbpentry(GDKstdout, i); } if (i == n) n = 0; /* read new entry (i.e. skip this one from old BBP.dir */ @@ -1607,7 +1607,7 @@ BBPdir_subcommit(int cnt, bat *subcommit } else { i = n; mnstr_printf(s, "%s", buf); - IODEBUG mnstr_printf(GDKerr, "%s", buf); + IODEBUG mnstr_printf(GDKstdout, "%s", buf); n = 0; } } @@ -1615,7 +1615,7 @@ BBPdir_subcommit(int cnt, bat *subcommit mnstr_close(s); mnstr_destroy(s); - IODEBUG THRprintf(GDKout, "#BBPdir end\n"); + IODEBUG THRprintf(GDKstdout, "#BBPdir end\n"); return 0; @@ -1641,11 +1641,11 @@ BBPdir(int cnt, bat *subcommit) return BBPdir_subcommit(cnt, subcommit); if (GDKdebug & (IOMASK | 1)) - THRprintf(GDKout, "#BBPdir: writing BBP.dir (%d bats).\n", (int) BBPsize); + THRprintf(GDKstdout, "#BBPdir: writing BBP.dir (%d bats).\n", (int) BBPsize); IODEBUG { - THRprintf(GDKout, "#BBPdir start oid="); - OIDwrite(GDKout); - THRprintf(GDKout, "\n"); + THRprintf(GDKstdout, "#BBPdir start oid="); + OIDwrite(GDKstdout); + THRprintf(GDKstdout, "\n"); } if ((fp = GDKfilelocate("BBP", "w", "dir")) == NULL) goto bailout; @@ -1664,14 +1664,14 @@ BBPdir(int cnt, bat *subcommit) if (BBP_status(i) & mask) { if (new_bbpentry(s, i) < 0) break; - IODEBUG new_bbpentry(GDKerr, i); + IODEBUG new_bbpentry(GDKstdout, i); } } mnstr_close(s); mnstr_destroy(s); - IODEBUG THRprintf(GDKout, "#BBPdir end\n"); + IODEBUG THRprintf(GDKstdout, "#BBPdir end\n"); if (i < BBPsize) goto bailout; @@ -1696,7 +1696,7 @@ BBPdump(void) BAT *b = BBP[i].b[0]; if (b == NULL) continue; - THRprintf(GDKout, + THRprintf(GDKstdout, _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
