Changeset: 443fadb55b71 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=443fadb55b71
Modified Files:
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/emitter.c
Branch: Jul2012
Log Message:
Also change call to BATclear in unused datacell.
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
@@ -354,7 +354,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
/* clean out basket */
bn = BATjoin( BATmirror(bs), b, BUN_NONE);
b = BATsetaccess(b, BAT_WRITE);
- BATclear(b);
+ BATclear(b, FALSE);
BATins(b,bn, FALSE);
BBPreleaseref(bn->batCacheid);
}
@@ -379,7 +379,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
bn = BATcopy(b, b->htype, b->ttype,TRUE);
v = BATslice(bn, baskets[bskt].winstride,BATcount(bn));
b = BATsetaccess(b, BAT_WRITE);
- BATclear(b);
+ BATclear(b, FALSE);
BATins(b,v, FALSE);
BATsetcount(bn, baskets[bskt].winsize);
cnt = (int) BATcount(bn);
@@ -395,7 +395,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
ret= (int*) getArgReference(stk,pci,i);
b = baskets[bskt].primary[i];
bn = BATcopy(b, b->htype, b->ttype,TRUE);
- BATclear(b);
+ BATclear(b, FALSE);
*ret = bn->batCacheid;
BBPkeepref(*ret);
}
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
@@ -417,7 +417,7 @@ bodyRestart:
b = baskets[em->bskt].primary[k];
em->table.format[k].c[0] = BATcopy(b, b->htype,
b->ttype,TRUE);
em->table.format[k].ci[0] = bat_iterator(b);
- BATclear(b);
+ BATclear(b, FALSE);
}
BSKTunlock(&em->lck, &em->name);
if ((cnt = BATcount(em->table.format[0].c[0]))) {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
