Changeset: 3627a9314bcf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3627a9314bcf
Modified Files:
gdk/gdk_bat.c
gdk/gdk_hash.c
Branch: Jan2022
Log Message:
We don't do hashes on BATs of type msk.
diffs (27 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -1331,11 +1331,10 @@ BUNdelete(BAT *b, oid o)
return GDK_FAIL;
if (ATOMstorage(b->ttype) == TYPE_msk) {
msk mval = mskGetVal(b, BUNlast(b) - 1);
- HASHdelete(b, BUNlast(b) - 1, &mval);
+ assert(b->thash == NULL);
mskSetVal(b, p, mval);
/* don't leave garbage */
mskClr(b, BUNlast(b) - 1);
- HASHinsert(b, p, &mval);
} else {
val = Tloc(b, BUNlast(b) - 1);
HASHdelete(b, BUNlast(b) - 1, val);
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -750,6 +750,7 @@ BAThash_impl(BAT *restrict b, struct can
}
assert(strcmp(ext, "thash") != 0 || !hascand);
+ assert(b->ttype != TYPE_msk);
MT_thread_setalgorithm(hascand ? "create hash with candidates" :
"create hash");
TRC_DEBUG_IF(ACCELERATOR) t0 = GDKusec();
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
