Changeset: ab5e72af45db for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab5e72af45db
Modified Files:
gdk/gdk_join.c
gdk/gdk_orderidx.c
sql/storage/bat/bat_storage.c
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (57 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -524,11 +524,14 @@ mergejoin_void(BAT **r1p, BAT **r2p, BAT
r1 = mg;
if (r1 == NULL)
return GDK_FAIL;
+ } else {
+ BBPunfix(r2->batCacheid);
}
+ r2 = NULL;
}
*r1p = r1;
if (r2p == NULL)
- return GDK_SUCCEED;
+ goto doreturn2;
if (BATtdense(r1) && BATtdense(l)) {
r2 = BATdense(0, l->tseqbase + r1->tseqbase -
l->hseqbase + r->hseqbase - r->tseqbase, BATcount(r1));
if (r2 == NULL) {
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -77,12 +77,12 @@ BATcheckorderidx(BAT *b)
if (b == NULL)
return false;
+ ACCELDEBUG t = GDKusec();
assert(b->batCacheid > 0);
/* we don't need the lock just to read the value b->torderidx */
if (b->torderidx == (Heap *) 1) {
/* but when we want to change it, we need the lock */
assert(!GDKinmemory());
- ACCELDEBUG t = GDKusec();
MT_lock_set(&GDKhashLock(b->batCacheid));
if (b->torderidx == (Heap *) 1) {
Heap *hp;
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -2380,8 +2380,6 @@ tr_update_delta( sql_trans *tr, sql_delt
temp_destroy(cbat->bid);
temp_destroy(cbat->ibid);
cbat->bid = cbat->ibid = 0;
- //if (!cur->batTransient)
- //BATmsync(cur);
}
obat->cnt = cbat->cnt = obat->ibase = cbat->ibase =
BATcount(cur);
temp_destroy(obat->ibid);
@@ -2485,8 +2483,6 @@ tr_merge_delta( sql_trans *tr, sql_delta
return LOG_ERR;
}
PROPdestroy(cur);
- //if (!cur->batTransient)
- //BATmsync(cur);
}
obat->cnt = obat->ibase = BATcount(cur);
temp_destroy(obat->ibid);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
