Changeset: b1651a1e0777 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b1651a1e0777
Modified Files:
gdk/gdk_private.h
gdk/gdk_storage.c
gdk/gdk_string.c
Branch: string-dedup
Log Message:
No need to clean string hash (there is none).
diffs (43 lines):
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -249,8 +249,6 @@ const char *gettailname(const BAT *b)
__attribute__((__visibility__("hidden")));
void settailname(Heap *restrict tail, const char *restrict physnme, int tt,
int width)
__attribute__((__visibility__("hidden")));
-void strCleanHash(Heap *hp, bool rebuild)
- __attribute__((__visibility__("hidden")));
void strDestroy(BAT *b)
__attribute__((__visibility__("hidden")));
gdk_return strHeap(Heap *d, size_t cap)
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -944,9 +944,7 @@ BATload_intern(bat bid, bool lock)
HEAPfree(b->tvheap, false);
return NULL;
}
- if (ATOMstorage(b->ttype) == TYPE_str) {
- strCleanHash(b->tvheap, false); /* ensure consistency */
- } else {
+ if (ATOMstorage(b->ttype) != TYPE_str) {
HEAP_recover(b->tvheap, (const var_t *) Tloc(b, 0),
BATcount(b));
}
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -335,13 +335,6 @@ strHeap(Heap *d, size_t cap)
return HEAPalloc(d, cap, 8, 1);
}
-void
-strCleanHash(Heap *h, bool rebuild)
-{
- (void) h;
- (void) rebuild;
-}
-
var_t
strPut(BAT *b, var_t *dst, const void *v)
{
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
