Changeset: 8a80ed406b79 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8a80ed406b79
Modified Files:
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/iterator.c
Branch: Dec2025
Log Message:
Allocate using allocator.
diffs (60 lines):
diff --git a/monetdb5/modules/mal/calc.c b/monetdb5/modules/mal/calc.c
--- a/monetdb5/modules/mal/calc.c
+++ b/monetdb5/modules/mal/calc.c
@@ -584,7 +584,7 @@ CALCmin(Client cntxt, MalBlkPtr mb, MalS
p1 = nil;
else if (ATOMcmp(t, p1, p2) > 0)
p1 = p2;
- if (VALinit(NULL, &stk->stk[getArg(pci, 0)], t, p1) == NULL)
+ if (VALinit(mb->ma, &stk->stk[getArg(pci, 0)], t, p1) == NULL)
return mythrow(MAL, "calc.min", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
return MAL_SUCCEED;
}
@@ -621,7 +621,7 @@ CALCmin_no_nil(Client cntxt, MalBlkPtr m
p1 = p2;
}
}
- if (VALinit(NULL, &stk->stk[getArg(pci, 0)], t, p1) == NULL)
+ if (VALinit(mb->ma, &stk->stk[getArg(pci, 0)], t, p1) == NULL)
return mythrow(MAL, "calc.min", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
return MAL_SUCCEED;
}
@@ -647,7 +647,7 @@ CALCmax(Client cntxt, MalBlkPtr mb, MalS
p1 = nil;
else if (ATOMcmp(t, p1, p2) < 0)
p1 = p2;
- if (VALinit(NULL, &stk->stk[getArg(pci, 0)], t, p1) == NULL)
+ if (VALinit(mb->ma, &stk->stk[getArg(pci, 0)], t, p1) == NULL)
return mythrow(MAL, "calc.max", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
return MAL_SUCCEED;
}
@@ -717,7 +717,7 @@ CALCmax_no_nil(Client cntxt, MalBlkPtr m
p1 = p2;
}
}
- if (VALinit(NULL, &stk->stk[getArg(pci, 0)], t, p1) == NULL)
+ if (VALinit(mb->ma, &stk->stk[getArg(pci, 0)], t, p1) == NULL)
return mythrow(MAL, "calc.max", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
return MAL_SUCCEED;
}
diff --git a/monetdb5/modules/mal/iterator.c b/monetdb5/modules/mal/iterator.c
--- a/monetdb5/modules/mal/iterator.c
+++ b/monetdb5/modules/mal/iterator.c
@@ -152,7 +152,7 @@ ITRbunIterator(Client cntxt, MalBlkPtr m
*head = 0;
bi = bat_iterator(b);
- if (VALinit(NULL, tail, ATOMtype(b->ttype), BUNtail(bi, *head)) ==
NULL) {
+ if (VALinit(mb->ma, tail, ATOMtype(b->ttype), BUNtail(bi, *head)) ==
NULL) {
bat_iterator_end(&bi);
BBPunfix(b->batCacheid);
throw(MAL, "iterator.nextChunk", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -188,7 +188,7 @@ ITRbunNext(Client cntxt, MalBlkPtr mb, M
return MAL_SUCCEED;
}
bi = bat_iterator(b);
- if (VALinit(NULL, tail, ATOMtype(b->ttype), BUNtail(bi, *head)) ==
NULL) {
+ if (VALinit(mb->ma, tail, ATOMtype(b->ttype), BUNtail(bi, *head)) ==
NULL) {
bat_iterator_end(&bi);
BBPunfix(b->batCacheid);
throw(MAL, "iterator.nextChunk", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
