Changeset: 52784dab57a5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=52784dab57a5
Modified Files:
gdk/gdk_hash.c
gdk/gdk_hash.h
Branch: linear-hashing
Log Message:
Move check outside of function.
diffs (32 lines):
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -294,15 +294,6 @@ HASHupgradehashheap(BAT *b)
gdk_return
HASHgrowbucket(BAT *b)
{
- switch (ATOMsize(b->ttype)) {
- case 1:
- case 2:
- /* no need to grow bucket list */
- return GDK_SUCCEED;
- default:
- break;
- }
-
Hash *h = b->thash;
BUN nbucket;
BUN onbucket = NHASHBUCKETS(h);
diff --git a/gdk/gdk_hash.h b/gdk/gdk_hash.h
--- a/gdk/gdk_hash.h
+++ b/gdk/gdk_hash.h
@@ -290,7 +290,8 @@ HASHgetlink(Hash *h, BUN i)
Hash *_h = (b)->thash; \
if (_h == (Hash *) 1 || \
_h == NULL || \
- HASHgrowbucket(b) != GDK_SUCCEED || \
+ (ATOMsize(b->ttype) > 2 && \
+ HASHgrowbucket(b) != GDK_SUCCEED) || \
(((i) + 1) * _h->width > _h->heaplink.size && \
HEAPextend(&_h->heaplink, \
(i) * _h->width + GDK_mmap_pagesize, \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
