Changeset: f6276aca50aa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f6276aca50aa
Modified Files:
NT/mkodbcwxs.py
NT/mksqlwxs.py
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_heap.c
gdk/gdk_private.h
gdk/gdk_storage.c
sql/storage/bat/bat_storage.c
Branch: Jan2022
Log Message:
Merge with Jul2021 branch.
diffs (truncated from 355 to 300 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -3776,9 +3776,14 @@ BATmin_skipnil(BAT *b, void *aggr, bit s
bi.width, 0, bi.count,
ATOMnilptr(b->ttype), 1, 1);
if (r == 0) {
- b->tnonil = true;
- b->batDirtydesc = true;
+ MT_lock_set(&b->theaplock);
+ if (b->batCount == bi.count) {
+ b->tnonil = true;
+ b->batDirtydesc = true;
+ }
+ MT_lock_unset(&b->theaplock);
}
+ bat_iterator_end(&bi);
} else {
r = 0;
}
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -377,10 +377,10 @@ VIEWdestroy(BAT *b)
IMPSdestroy(b);
OIDXdestroy(b);
STRMPdestroy(b);
- PROPdestroy(b);
VIEWunlink(b);
MT_lock_set(&b->theaplock);
+ PROPdestroy_nolock(b);
/* heaps that are left after VIEWunlink are ours, so need to be
* destroyed (and files deleted) */
if (b->theap) {
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -696,7 +696,7 @@ BATdestroy(BAT *b)
ATOMIC_DESTROY(&b->tvheap->refs);
GDKfree(b->tvheap);
}
- PROPdestroy(b);
+ PROPdestroy_nolock(b);
MT_lock_destroy(&b->theaplock);
MT_lock_destroy(&b->batIdxLock);
MT_rwlock_destroy(&b->thashlock);
@@ -1014,7 +1014,6 @@ BUNappendmulti(BAT *b, const void *value
}
ALIGNapp(b, force, GDK_FAIL);
- b->batDirtydesc = true;
if (b->ttype == TYPE_void && BATtdense(b)) {
const oid *ovals = values;
@@ -1033,7 +1032,9 @@ BUNappendmulti(BAT *b, const void *value
return GDK_SUCCEED;
} else {
/* we need to materialize b; allocate enough capacity */
+ MT_lock_set(&b->theaplock);
b->batCapacity = BATcount(b) + count;
+ MT_lock_unset(&b->theaplock);
if (BATmaterialize(b) != GDK_SUCCEED)
return GDK_FAIL;
}
@@ -1057,6 +1058,7 @@ BUNappendmulti(BAT *b, const void *value
}
MT_lock_set(&b->theaplock);
+ b->batDirtydesc = true;
if (count > BATcount(b) / GDK_UNIQUE_ESTIMATE_KEEP_FRACTION)
b->tunique_est = 0;
b->theap->dirty = true;
@@ -1298,6 +1300,7 @@ BUNdelete(BAT *b, oid o)
BUN p;
BATiter bi = bat_iterator_nolock(b);
const void *val;
+ bool locked = false;
assert(!is_oid_nil(b->hseqbase) || BATcount(b) == 0);
if (o < b->hseqbase || o >= b->hseqbase + BATcount(b)) {
@@ -1311,7 +1314,6 @@ BUNdelete(BAT *b, oid o)
return GDK_FAIL;
}
TRC_DEBUG(ALGO, ALGOBATFMT " deleting oid " OIDFMT "\n", ALGOBATPAR(b),
o);
- b->batDirtydesc = true;
val = BUNtail(bi, p);
/* writing the values should be locked, reading could be done
* unlocked (since we're the only thread that should be changing
@@ -1345,25 +1347,30 @@ BUNdelete(BAT *b, oid o)
memcpy(Tloc(b, p), val, Tsize(b));
HASHinsert(b, p, val);
MT_lock_set(&b->theaplock);
+ locked = true;
if (b->tminpos == BUNlast(b) - 1)
b->tminpos = p;
if (b->tmaxpos == BUNlast(b) - 1)
b->tmaxpos = p;
- MT_lock_unset(&b->theaplock);
}
/* no longer sorted */
+ if (!locked) {
+ MT_lock_set(&b->theaplock);
+ locked = true;
+ }
b->tsorted = b->trevsorted = false;
b->theap->dirty = true;
}
+ if (!locked)
+ MT_lock_set(&b->theaplock);
+ b->batDirtydesc = true;
if (b->tnosorted >= p)
b->tnosorted = 0;
if (b->tnorevsorted >= p)
b->tnorevsorted = 0;
- MT_lock_set(&b->theaplock);
b->batCount--;
if (BATcount(b) < GDK_UNIQUE_ESTIMATE_KEEP_FRACTION)
b->tunique_est = 0;
- MT_lock_unset(&b->theaplock);
if (b->batCount <= 1) {
/* some trivial properties */
b->tkey = true;
@@ -1374,6 +1381,7 @@ BUNdelete(BAT *b, oid o)
b->tnonil = true;
}
}
+ MT_lock_unset(&b->theaplock);
IMPSdestroy(b);
OIDXdestroy(b);
return GDK_SUCCEED;
@@ -1455,7 +1463,9 @@ BUNinplacemulti(BAT *b, const oid *posit
* isn't, we're not sure anymore about
* the nil property, so we must clear
* it */
+ MT_lock_set(&b->theaplock);
b->tnil = false;
+ MT_lock_unset(&b->theaplock);
}
if (b->ttype != TYPE_void) {
if (bi.maxpos != BUN_NONE) {
@@ -1615,6 +1625,7 @@ BUNinplacemulti(BAT *b, const oid *posit
prv = p > 0 ? p - 1 : BUN_NONE;
nxt = p < last ? p + 1 : BUN_NONE;
+ MT_lock_set(&b->theaplock);
if (BATtordered(b)) {
if (prv != BUN_NONE &&
ATOMcmp(tt, t, BUNtail(bi, prv)) < 0) {
@@ -1656,11 +1667,13 @@ BUNinplacemulti(BAT *b, const oid *posit
b->tnokey[0] = b->tnokey[1] = 0;
if (b->tnonil && ATOMstorage(b->ttype) != TYPE_msk)
b->tnonil = t && ATOMcmp(b->ttype, t,
ATOMnilptr(b->ttype)) != 0;
+ MT_lock_unset(&b->theaplock);
}
MT_rwlock_wrunlock(&b->thashlock);
MT_lock_set(&b->theaplock);
b->tminpos = bi.minpos;
b->tmaxpos = bi.maxpos;
+ b->batDirtydesc = true;
b->theap->dirty = true;
if (b->tvheap)
b->tvheap->dirty = true;
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -2793,7 +2793,7 @@ BATconstant(oid hseq, int tailtype, cons
*/
void
-PROPdestroy(BAT *b)
+PROPdestroy_nolock(BAT *b)
{
PROPrec *p = b->tprops;
PROPrec *n;
@@ -2808,6 +2808,14 @@ PROPdestroy(BAT *b)
}
}
+void
+PROPdestroy(BAT *b)
+{
+ MT_lock_set(&b->theaplock);
+ PROPdestroy_nolock(b);
+ MT_lock_unset(&b->theaplock);
+}
+
ValPtr
BATgetprop_nolock(BAT *b, enum prop_t idx)
{
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1792,8 +1792,8 @@ BBPexit(void)
HEAPdecref(b->tvheap, false);
b->tvheap = NULL;
}
+ PROPdestroy_nolock(b);
MT_lock_unset(&b->theaplock);
- PROPdestroy(b);
BATfree(b);
}
BBP_pid(i) = 0;
@@ -3031,6 +3031,7 @@ decref(bat i, bool logical, bool release
* (sub)commit happened in parallel to an
* update; we must undo the turning off of the
* dirty bits */
+ assert(b->batDirtydesc);
b->batDirtydesc = true;
if (b->theap)
b->theap->dirty = true;
@@ -3314,7 +3315,7 @@ BBPdestroy(BAT *b)
HASHdestroy(b);
IMPSdestroy(b);
OIDXdestroy(b);
- PROPdestroy(b);
+ PROPdestroy_nolock(b);
if (tp == 0) {
/* bats that get destroyed must unfix their atoms */
gdk_return (*tunfix) (const void *) =
BATatoms[b->ttype].atomUnfix;
@@ -3615,6 +3616,7 @@ do_backup(const char *srcdir, const char
char extnew[16];
bool istail = strncmp(ext, "tail", 4) == 0;
+ h->dirty |= dirty;
if (h->wasempty) {
return GDK_SUCCEED;
}
@@ -3981,8 +3983,16 @@ BBPsync(int cnt, bat *restrict subcommit
break;
/* we once again have a saved heap */
}
- if (idx < cnt)
+ if (idx < cnt) {
ret = GDK_FAIL;
+ while (idx > 0) {
+ bat i = subcommit ? subcommit[idx] : idx;
+ MT_lock_set(&BBP_desc(i)->theaplock);
+ BBP_desc(i)->batDirtydesc = true;
+ MT_lock_unset(&BBP_desc(i)->theaplock);
+ idx--;
+ }
+ }
}
TRC_DEBUG(PERF, "write time %d\n", (t0 = GDKms()) - t1);
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -832,6 +832,7 @@ HEAPload_intern(Heap *h, const char *nme
if (h->base == NULL)
return GDK_FAIL; /* file could not be read satisfactorily */
+ h->dirty = false; /* we just read it, so it's clean */
return GDK_SUCCEED;
}
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -251,6 +251,8 @@ void persistOIDX(BAT *b)
__attribute__((__visibility__("hidden")));
void PROPdestroy(BAT *b)
__attribute__((__visibility__("hidden")));
+void PROPdestroy_nolock(BAT *b)
+ __attribute__((__visibility__("hidden")));
gdk_return rangejoin(BAT *r1, BAT *r2, BAT *l, BAT *rl, BAT *rh, struct
canditer *lci, struct canditer *rci, bool li, bool hi, bool anti, bool
symmetric, BUN maxsize)
__attribute__((__warn_unused_result__))
__attribute__((__visibility__("hidden")));
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -625,16 +625,6 @@ GDKload(int farmid, const char *nme, con
* merely copies the data into place. Failure to read or write the
* BAT results in a NULL, otherwise it returns the BAT pointer.
*/
-static void
-DESCclean(BAT *b)
-{
- b->batDirtyflushed = DELTAdirty(b);
- b->batDirtydesc = false;
- b->theap->dirty = false;
- if (b->tvheap)
- b->tvheap->dirty = false;
-}
-
static BAT *
DESCload(int i)
{
@@ -662,7 +652,6 @@ DESCload(int i)
* descriptor, so loaded mode may be stale) */
b->batTransient = (BBP_status(b->batCacheid) & BBPPERSISTENT) == 0;
b->batCopiedtodisk = true;
- DESCclean(b);
return b;
}
@@ -862,7 +851,6 @@ BATsave_locked(BAT *b, BATiter *bi, BUN
} else {
b->batCopiedtodisk = true;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
