MonetDB: Jul2015 - backport of persistent hash disable code

[Niels Nes]

Changeset: 1804aee0571a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1804aee0571a
Modified Files:
        gdk/gdk_search.c
Branch: Jul2015
Log Message:

backport of persistent hash disable code


diffs (31 lines):

diff --git a/gdk/gdk_search.c b/gdk/gdk_search.c
--- a/gdk/gdk_search.c
+++ b/gdk/gdk_search.c
@@ -333,7 +333,9 @@ BAThash(BAT *b, BUN masksize)
                const char *nme = BBP_physical(b->batCacheid);
                const char *ext = b->batCacheid > 0 ? "thash" : "hhash";
                BATiter bi = bat_iterator(b);
+#ifdef PERSISTENTHASH
                int fd;
+#endif
 
                ALGODEBUG fprintf(stderr, "#BAThash: create hash(" BUNFMT 
");\n", BATcount(b));
                if ((hp = GDKzalloc(sizeof(*hp))) == NULL ||
@@ -505,7 +507,8 @@ BAThash(BAT *b, BUN masksize)
                        }
                        break;
                }
-               if (0 && (BBP_status(b->batCacheid) & BBPEXISTING) &&
+#ifdef PERSISTENTHASH
+               if ((BBP_status(b->batCacheid) & BBPEXISTING) &&
                    b->batInserted == b->batCount &&
                    HEAPsave(hp, nme, ext) == GDK_SUCCEED &&
                    (fd = GDKfdlocate(hp->farmid, nme, "rb+", ext)) >= 0) {
@@ -525,6 +528,7 @@ BAThash(BAT *b, BUN masksize)
                        close(fd);
                } else
                        ALGODEBUG fprintf(stderr, "#BAThash: NOT persisting 
hash %d\n", b->batCacheid);
+#endif
                b->T->hash = h;
                t1 = GDKusec();
                ALGODEBUG fprintf(stderr, "#BAThash: hash construction " LLFMT 
" usec\n", t1 - t0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list