Changeset: 8f4ed90a8011 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8f4ed90a8011
Modified Files:
gdk/gdk_delta.c
gdk/gdk_search.h
Branch: default
Log Message:
Cleanup.
We can afford to loose the hash in BATundo (never called in practice);
and HASHins_oid is not called at all.
diffs (49 lines):
diff --git a/gdk/gdk_delta.c b/gdk/gdk_delta.c
--- a/gdk/gdk_delta.c
+++ b/gdk/gdk_delta.c
@@ -171,9 +171,6 @@ BATundo(BAT *b)
bunfirst = b->batDeleted;
bunlast = b->batFirst;
if (bunlast > b->batDeleted) {
- BUN i = bunfirst;
- BAT *bm = BBP_cache(-b->batCacheid);
-
/* elements are 'inserted' => zap properties */
b->hsorted = 0;
b->hrevsorted = 0;
@@ -183,18 +180,7 @@ BATundo(BAT *b)
BATkey(b, FALSE);
if (b->tkey)
BATkey(BATmirror(b), FALSE);
-
- for (p = bunfirst; p < bunlast; p++, i++) {
- ptr h = BUNhead(bi, p);
- ptr t = BUNtail(bi, p);
-
- if (b->H->hash) {
- HASHins(bm, i, h);
- }
- if (b->T->hash) {
- HASHins(b, i, t);
- }
- }
+ HASHremove(b);
}
b->batFirst = b->batDeleted;
BATsetcount(b, b->batInserted);
diff --git a/gdk/gdk_search.h b/gdk/gdk_search.h
--- a/gdk/gdk_search.h
+++ b/gdk/gdk_search.h
@@ -225,12 +225,6 @@ gdk_export BUN HASHlist(Hash *h, BUN i);
} \
} while (0)
-#define HASHins_oid(h,i,v) \
- do { \
- BUN _c = hash_oid(h,v); \
- HASHputall(h,i,_c); \
- } while (0)
-
/* Functions to perform a binary search on a sorted BAT.
* See gdk_search.c for details. */
gdk_export BUN SORTfnd(BAT *b, const void *v);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
