Changeset: 0abf631b78d0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0abf631b78d0 Modified Files: gdk/ChangeLog.Aug2018 gdk/gdk_private.h monetdb5/optimizer/opt_multiplex.c Branch: default Log Message:
Merge with Aug2018 branch. diffs (35 lines): diff --git a/gdk/ChangeLog.Aug2018 b/gdk/ChangeLog.Aug2018 --- a/gdk/ChangeLog.Aug2018 +++ b/gdk/ChangeLog.Aug2018 @@ -2,6 +2,7 @@ # This file is updated with Maddlog * Mon Jul 30 2018 Sjoerd Mullender <[email protected]> +- Hash indexes are now persistent across server restarts. - The macros bunfastapp and tfastins and variants no longer set the dirty flag of the heap they write to. This now needs to be done separately (and preferably outside of the inner loop). diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h --- a/gdk/gdk_private.h +++ b/gdk/gdk_private.h @@ -13,7 +13,7 @@ #endif /* persist hash heaps for persistent BATs */ -/* #define PERSISTENTHASH 1 */ +#define PERSISTENTHASH 1 /* persist order index heaps for persistent BATs */ #define PERSISTENTIDX 1 diff --git a/monetdb5/optimizer/opt_multiplex.c b/monetdb5/optimizer/opt_multiplex.c --- a/monetdb5/optimizer/opt_multiplex.c +++ b/monetdb5/optimizer/opt_multiplex.c @@ -94,7 +94,7 @@ OPTexpandMultiplex(Client cntxt, MalBlkP if (alias == NULL || resB == NULL) { GDKfree(alias); GDKfree(resB); - return NULL; + throw(MAL, "optimizer.multiplex", SQLSTATE(HY001) MAL_MALLOC_FAIL); } /* resB := new(refBat) */ _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
