Changeset: 04300e4ce39b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/04300e4ce39b
Modified Files:
monetdb5/mal/mal_interpreter.c
Branch: Jan2022
Log Message:
No need to call both BBPquickdesc and BATdescriptor in quick succession.
diffs (24 lines):
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -861,17 +861,14 @@ str runMALsequence(Client cntxt, MalBlkP
if (garbage[i] == -1 &&
stk->stk[getArg(pci, i)].vtype == TYPE_bat &&
!is_bat_nil(stk->stk[getArg(pci, i)].val.bval)) {
assert(stk->stk[getArg(pci,
i)].val.bval > 0);
- b =
BBPquickdesc(stk->stk[getArg(pci, i)].val.bval);
+ b =
BATdescriptor(stk->stk[getArg(pci, i)].val.bval);
if (b == NULL) {
if (ret == MAL_SUCCEED)
ret =
createException(MAL, "mal.propertyCheck", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
continue;
}
- b =
BATdescriptor(stk->stk[getArg(pci, i)].val.bval);
- if (b) {
- BATassertProps(b);
- BBPunfix(b->batCacheid);
- }
+ BATassertProps(b);
+ BBPunfix(b->batCacheid);
}
}
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
