Changeset: e2158fb8d7e8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e2158fb8d7e8
Modified Files:
monetdb5/modules/mal/projectionpath.c
Branch: resource_management
Log Message:
revert change
diffs (30 lines):
diff --git a/monetdb5/modules/mal/projectionpath.c
b/monetdb5/modules/mal/projectionpath.c
--- a/monetdb5/modules/mal/projectionpath.c
+++ b/monetdb5/modules/mal/projectionpath.c
@@ -28,7 +28,7 @@ ALGprojectionpath(Client cntxt, MalBlkPt
if (pci->argc <= 1)
throw(MAL, "algebra.projectionpath", SQLSTATE(HY013) "INTERNAL
ERROR");
- joins = (BAT **) ma_zalloc(mb->ma, pci->argc * sizeof(BAT *));
+ joins = (BAT **) GDKzalloc(pci->argc * sizeof(BAT *));
if (joins == NULL)
throw(MAL, "algebra.projectionpath", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
for (i = pci->retc; i < pci->argc; i++) {
@@ -39,7 +39,7 @@ ALGprojectionpath(Client cntxt, MalBlkPt
&& b->ttype != TYPE_msk)) {
while (--i >= pci->retc)
BBPunfix(joins[i - pci->retc]->batCacheid);
- //GDKfree(joins);
+ GDKfree(joins);
BBPreclaim(b);
throw(MAL, "algebra.projectionpath", "%s",
b ? SEMANTIC_TYPE_MISMATCH :
INTERNAL_BAT_ACCESS);
@@ -50,7 +50,7 @@ ALGprojectionpath(Client cntxt, MalBlkPt
b = BATprojectchain(joins);
for (i = pci->retc; i < pci->argc; i++)
BBPunfix(joins[i - pci->retc]->batCacheid);
- //GDKfree(joins);
+ GDKfree(joins);
if (b) {
*r = b->batCacheid;
BBPkeepref(b);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
