Changeset: 57c3e1c6c858 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57c3e1c6c858
Modified Files:
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/emitter.c
sql/test/pg_regress/Tests/All
Branch: default
Log Message:
Merge with Oct2014 branch; not propagating pg_regress change.
diffs (42 lines):
diff --git a/sql/backends/monet5/datacell/basket.c
b/sql/backends/monet5/datacell/basket.c
--- a/sql/backends/monet5/datacell/basket.c
+++ b/sql/backends/monet5/datacell/basket.c
@@ -414,7 +414,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
throw(MAL, "basket.grab", "too early");
}
- bn = BATcopy(b, b->htype, b->ttype, TRUE);
+ bn = BATcopy(b, b->htype, b->ttype, TRUE, TRANSIENT);
v = BATslice(bn, baskets[bskt].winstride, BATcount(bn));
b = BATsetaccess(b, BAT_WRITE);
BATclear(b, TRUE);
@@ -432,7 +432,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
for (i = 0; i < baskets[bskt].colcount; i++) {
ret = (int *) getArgReference(stk, pci, i);
b = baskets[bskt].primary[i];
- bn = BATcopy(b, b->htype, b->ttype, TRUE);
+ bn = BATcopy(b, b->htype, b->ttype, TRUE, TRANSIENT);
cnt = (int) BATcount(b);
BATclear(b, TRUE);
*ret = bn->batCacheid;
diff --git a/sql/backends/monet5/datacell/emitter.c
b/sql/backends/monet5/datacell/emitter.c
--- a/sql/backends/monet5/datacell/emitter.c
+++ b/sql/backends/monet5/datacell/emitter.c
@@ -126,7 +126,7 @@ EMemitterStartInternal(int *ret, str *tb
throw(MAL, "receptor.new", "Could not access
descriptor");
}
- em->table.format[j].c = BATcopy(b, b->htype, b->ttype, FALSE);
+ em->table.format[j].c = BATcopy(b, b->htype, b->ttype, FALSE,
TRANSIENT);
em->table.format[j].ci = bat_iterator(em->table.format[j].c);
em->table.format[j].name = baskets[idx].cols[i];
em->table.format[j].sep = ",";
@@ -327,7 +327,7 @@ bodyRestart:
if (em->table.format[k].c)
BBPunfix(em->table.format[k].c->batCacheid);
b = baskets[em->bskt].primary[k];
- em->table.format[k].c = BATcopy(b, b->htype, b->ttype,
TRUE);
+ em->table.format[k].c = BATcopy(b, b->htype, b->ttype,
TRUE,TRANSIENT);
em->table.format[k].ci = bat_iterator(b);
BATclear(b, FALSE);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
