MonetDB: Jul2017 - Merge with Dec2016 branch.

[Sjoerd Mullender]

Changeset: 262f40f92641 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=262f40f92641
Modified Files:
        gdk/gdk_atoms.c
Branch: Jul2017
Log Message:

Merge with Dec2016 branch.


diffs (29 lines):

diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -1076,6 +1076,7 @@ strHash(const char *s)
 void
 strCleanHash(Heap *h, int rebuild)
 {
+       char oldhash[GDK_STRHASHSIZE];
        size_t pad, pos;
        const size_t extralen = h->hashash ? EXTRALEN : 0;
        stridx_t *bucket;
@@ -1085,6 +1086,8 @@ strCleanHash(Heap *h, int rebuild)
        (void) rebuild;
        if (!h->cleanhash)
                return;
+       /* copy old hash table so we can check whether we changed it */
+       memcpy(oldhash, h->base, sizeof(oldhash));
        h->cleanhash = 0;
        /* rebuild hash table for double elimination
         *
@@ -1127,6 +1130,8 @@ strCleanHash(Heap *h, int rebuild)
                }
        }
 #endif
+       /* only set dirty flag if the hash table actually changed */
+       h->dirty |= memcmp(oldhash, h->base, sizeof(oldhash)) != 0;
 }
 
 /*
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list