Changeset: 4faf8a4342e3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/4faf8a4342e3 Modified Files: gdk/gdk_bat.c gdk/gdk_batop.c Branch: Jan2022 Log Message:
changes to: Set minpos/maxpos properties before calling BUNappend; reuse
iterator's values.
diffs (truncated from 466 to 300 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -1163,15 +1163,13 @@ BUNappendmulti(BAT *b, const void *value
int (*atomcmp) (const void *, const void *) =
ATOMcompare(b->ttype);
const void *atomnil = ATOMnilptr(b->ttype);
MT_lock_set(&b->theaplock);
- BUN minpos = b->tminpos;
- BUN maxpos = b->tmaxpos;
MT_lock_unset(&b->theaplock);
const void *minvalp = NULL, *maxvalp = NULL;
BATiter bi = bat_iterator_nolock(b);
- if (minpos != BUN_NONE)
- minvalp = BUNtail(bi, minpos);
- if (maxpos != BUN_NONE)
- maxvalp = BUNtail(bi, maxpos);
+ if (bi.minpos != BUN_NONE)
+ minvalp = BUNtail(bi, bi.minpos);
+ if (bi.maxpos != BUN_NONE)
+ maxvalp = BUNtail(bi, bi.maxpos);
if (b->tvarsized) {
const void *vbase = b->tvheap->base;
for (BUN i = 0; i < count; i++) {
@@ -1189,27 +1187,27 @@ BUNappendmulti(BAT *b, const void *value
* we don't know) */
bi = bat_iterator_nolock(b);
vbase = b->tvheap->base;
- if (minpos != BUN_NONE)
- minvalp = BUNtvar(bi, minpos);
- if (maxpos != BUN_NONE)
- maxvalp = BUNtvar(bi, maxpos);
+ if (bi.minpos != BUN_NONE)
+ minvalp = BUNtvar(bi,
bi.minpos);
+ if (bi.maxpos != BUN_NONE)
+ maxvalp = BUNtvar(bi,
bi.maxpos);
}
if (b->thash) {
HASHappend_locked(b, p, t);
}
if (atomcmp(t, atomnil) != 0) {
if (p == 0) {
- minpos = maxpos = 0;
+ bi.minpos = bi.maxpos = 0;
minvalp = maxvalp = t;
} else {
- if (minpos != BUN_NONE &&
+ if (bi.minpos != BUN_NONE &&
atomcmp(minvalp, t) > 0) {
- minpos = p;
+ bi.minpos = p;
minvalp = t;
}
- if (maxpos != BUN_NONE &&
+ if (bi.maxpos != BUN_NONE &&
atomcmp(maxvalp, t) < 0) {
- maxpos = p;
+ bi.maxpos = p;
maxvalp = t;
}
}
@@ -1217,7 +1215,7 @@ BUNappendmulti(BAT *b, const void *value
p++;
}
} else if (ATOMstorage(b->ttype) == TYPE_msk) {
- minpos = maxpos = BUN_NONE;
+ bi.minpos = bi.maxpos = BUN_NONE;
minvalp = maxvalp = NULL;
for (BUN i = 0; i < count; i++) {
t = (void *) ((char *) values + (i <<
b->tshift));
@@ -1237,17 +1235,17 @@ BUNappendmulti(BAT *b, const void *value
}
if (atomcmp(t, atomnil) != 0) {
if (p == 0) {
- minpos = maxpos = 0;
+ bi.minpos = bi.maxpos = 0;
minvalp = maxvalp = t;
} else {
- if (minpos != BUN_NONE &&
+ if (bi.minpos != BUN_NONE &&
atomcmp(minvalp, t) > 0) {
- minpos = p;
+ bi.minpos = p;
minvalp = t;
}
- if (maxpos != BUN_NONE &&
+ if (bi.maxpos != BUN_NONE &&
atomcmp(maxvalp, t) < 0) {
- maxpos = p;
+ bi.maxpos = p;
maxvalp = t;
}
}
@@ -1256,8 +1254,8 @@ BUNappendmulti(BAT *b, const void *value
}
}
MT_lock_set(&b->theaplock);
- b->tminpos = minpos;
- b->tmaxpos = maxpos;
+ b->tminpos = bi.minpos;
+ b->tmaxpos = bi.maxpos;
MT_lock_unset(&b->theaplock);
} else {
for (BUN i = 0; i < count; i++) {
@@ -1411,8 +1409,6 @@ BUNinplacemulti(BAT *b, const oid *posit
} else if (count > BATcount(b) / GDK_UNIQUE_ESTIMATE_KEEP_FRACTION) {
b->tunique_est = 0;
}
- BUN minpos = b->tminpos;
- BUN maxpos = b->tmaxpos;
MT_lock_unset(&b->theaplock);
MT_rwlock_wrlock(&b->thashlock);
for (BUN i = 0; i < count; i++) {
@@ -1453,36 +1449,36 @@ BUNinplacemulti(BAT *b, const oid *posit
b->tnil = false;
}
if (b->ttype != TYPE_void) {
- if (maxpos != BUN_NONE) {
- if (!isnil && ATOMcmp(b->ttype,
BUNtail(bi, maxpos), t) < 0) {
+ if (bi.maxpos != BUN_NONE) {
+ if (!isnil && ATOMcmp(b->ttype,
BUNtail(bi, bi.maxpos), t) < 0) {
/* new value is larger
* than previous
* largest */
- maxpos = p;
- } else if (maxpos == p &&
ATOMcmp(b->ttype, BUNtail(bi, maxpos), t) != 0) {
+ bi.maxpos = p;
+ } else if (bi.maxpos == p &&
ATOMcmp(b->ttype, BUNtail(bi, bi.maxpos), t) != 0) {
/* old value is equal to
* largest and new value
* is smaller or nil (see
* above), so we don't
* know anymore which is
* the largest */
- maxpos = BUN_NONE;
+ bi.maxpos = BUN_NONE;
}
}
- if (minpos != BUN_NONE) {
- if (!isnil && ATOMcmp(b->ttype,
BUNtail(bi, minpos), t) > 0) {
+ if (bi.minpos != BUN_NONE) {
+ if (!isnil && ATOMcmp(b->ttype,
BUNtail(bi, bi.minpos), t) > 0) {
/* new value is smaller
* than previous
* smallest */
- minpos = p;
- } else if (minpos == p &&
ATOMcmp(b->ttype, BUNtail(bi, minpos), t) != 0) {
+ bi.minpos = p;
+ } else if (bi.minpos == p &&
ATOMcmp(b->ttype, BUNtail(bi, bi.minpos), t) != 0) {
/* old value is equal to
* smallest and new value
* is larger or nil (see
* above), so we don't
* know anymore which is
* the largest */
- minpos = BUN_NONE;
+ bi.minpos = BUN_NONE;
}
}
}
@@ -1497,8 +1493,8 @@ BUNinplacemulti(BAT *b, const oid *posit
doHASHdestroy(b, hs);
}
MT_lock_set(&b->theaplock);
- minpos = BUN_NONE;
- maxpos = BUN_NONE;
+ bi.minpos = BUN_NONE;
+ bi.maxpos = BUN_NONE;
b->tunique_est = 0.0;
MT_lock_unset(&b->theaplock);
}
@@ -1539,7 +1535,14 @@ BUNinplacemulti(BAT *b, const oid *posit
}
}
/* reinitialize iterator after possible heap upgrade */
- bi = bat_iterator_nolock(b);
+ {
+ /* save and restore minpos/maxpos */
+ BUN minpos = bi.minpos;
+ BUN maxpos = bi.maxpos;
+ bi = bat_iterator_nolock(b);
+ bi.minpos = minpos;
+ bi.maxpos = maxpos;
+ }
_ptr = BUNtloc(bi, p);
switch (b->twidth) {
default: /* only three or four cases possible */
@@ -1644,8 +1647,8 @@ BUNinplacemulti(BAT *b, const oid *posit
}
MT_rwlock_wrunlock(&b->thashlock);
MT_lock_set(&b->theaplock);
- b->tminpos = minpos;
- b->tmaxpos = maxpos;
+ b->tminpos = bi.minpos;
+ b->tmaxpos = bi.maxpos;
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
@@ -1114,8 +1114,6 @@ BATappend_or_update(BAT *b, BAT *p, cons
if (ni.count > BATcount(b) / GDK_UNIQUE_ESTIMATE_KEEP_FRACTION) {
b->tunique_est = 0;
}
- BUN minpos = b->tminpos;
- BUN maxpos = b->tmaxpos;
MT_lock_unset(&b->theaplock);
/* load hash so that we can maintain it */
(void) BATcheckhash(b);
@@ -1160,6 +1158,13 @@ BATappend_or_update(BAT *b, BAT *p, cons
MT_rwlock_wrunlock(&b->thashlock);
locked = false;
}
+ if (b->tminpos != bi.minpos ||
+ b->tmaxpos != bi.maxpos) {
+ MT_lock_set(&b->theaplock);
+ b->tminpos = bi.minpos;
+ b->tmaxpos = bi.maxpos;
+ MT_lock_unset(&b->theaplock);
+ }
if (BATcount(b) < updid &&
BUNappendmulti(b, NULL, (BUN) (updid -
BATcount(b)), force) != GDK_SUCCEED) {
bat_iterator_end(&ni);
@@ -1169,7 +1174,14 @@ BATappend_or_update(BAT *b, BAT *p, cons
bat_iterator_end(&ni);
return GDK_FAIL;
}
- bi = bat_iterator_nolock(b);
+ {
+ /* save and restore minpos/maxpos */
+ BUN minpos = bi.minpos;
+ BUN maxpos = bi.maxpos;
+ bi = bat_iterator_nolock(b);
+ bi.minpos = minpos;
+ bi.maxpos = maxpos;
+ }
continue;
}
@@ -1194,36 +1206,36 @@ BATappend_or_update(BAT *b, BAT *p, cons
}
b->tnonil &= !isnil;
b->tnil |= isnil;
- if (maxpos != BUN_NONE) {
+ if (bi.maxpos != BUN_NONE) {
if (!isnil &&
- atomcmp(BUNtvar(bi, maxpos), new) < 0) {
+ atomcmp(BUNtvar(bi, bi.maxpos), new) < 0) {
/* new value is larger than
* previous largest */
- maxpos = updid;
- } else if (atomcmp(BUNtvar(bi, maxpos), old) ==
0 &&
+ bi.maxpos = updid;
+ } else if (atomcmp(BUNtvar(bi, bi.maxpos), old)
== 0 &&
atomcmp(new, old) != 0) {
/* old value is equal to
* largest and new value is
* smaller, so we don't know
* anymore which is the
* largest */
- maxpos = BUN_NONE;
+ bi.maxpos = BUN_NONE;
}
}
- if (minpos != BUN_NONE) {
+ if (bi.minpos != BUN_NONE) {
if (!isnil &&
- atomcmp(BUNtvar(bi, minpos), new) > 0) {
+ atomcmp(BUNtvar(bi, bi.minpos), new) > 0) {
/* new value is smaller than
* previous smallest */
- minpos = updid;
- } else if (atomcmp(BUNtvar(bi, minpos), old) ==
0 &&
+ bi.minpos = updid;
+ } else if (atomcmp(BUNtvar(bi, bi.minpos), old)
== 0 &&
atomcmp(new, old) != 0) {
/* old value is equal to
* smallest and new value is
* larger, so we don't know
* anymore which is the
* smallest */
- minpos = BUN_NONE;
+ bi.minpos = BUN_NONE;
}
}
if (!locked) {
@@ -1262,7 +1274,14 @@ BATappend_or_update(BAT *b, BAT *p, cons
/* in case ATOMreplaceVAR and/or
* GDKupgradevarheap replaces a heap, we need to
* reinitialize the iterator */
- bi = bat_iterator_nolock(b);
+ {
+ /* save and restore minpos/maxpos */
+ BUN minpos = bi.minpos;
+ BUN maxpos = bi.maxpos;
+ bi = bat_iterator_nolock(b);
+ bi.minpos = minpos;
+ bi.maxpos = maxpos;
+ }
switch (b->twidth) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
