Changeset: c16f7f456fb9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c16f7f456fb9
Modified Files:
MonetDB5/src/modules/mal/tablet.mx
Branch: default
Log Message:
make "COPY INTO ... LOCKED" also work with property checking (-d10) enabled:
since we "mis"use BATpropcheck to set rather than verify properties on
the newly loaded slice, we locally disable property errors.
diffs (28 lines):
diff -r ed5747601dbf -r c16f7f456fb9 MonetDB5/src/modules/mal/tablet.mx
--- a/MonetDB5/src/modules/mal/tablet.mx Mon Dec 27 00:06:47 2010 +0100
+++ b/MonetDB5/src/modules/mal/tablet.mx Mon Dec 27 00:08:58 2010 +0100
@@ -1352,12 +1352,16 @@
if (bats == NULL)
return NULL;
for (i = 0; i < as->nr_attrs; i++) {
+ int GDKdebug_bak = GDKdebug;
BAT *b = fmt[i].c[0];
BAT *bv = NULL;
BATsetaccess(b, BAT_READ);
bv = BATslice(b, offset, BATcount(b));
BUNins(bats, (ptr) fmt[i].name, (ptr) &bv->batCacheid, FALSE);
+ /* we "mis"use BATpropcheck to set rather than verify
properties on
+ * the newly loaded slice; hence, we locally disable property
errors */
+ GDKdebug &= ~PROPMASK;
BATaccessBegin(bv, USE_ALL, MMAP_WILLNEED);
BATpropcheck(bv, BATPROPS_ALL);
/* drop the hashes, we don't need them now and they consume
space */
@@ -1367,6 +1371,7 @@
/* drop the hashes, we don't need them now and they consume
space */
HASHremove(BATmirror(b));
BATaccessEnd(bv, USE_ALL, MMAP_WILLNEED);
+ GDKdebug = GDKdebug_bak;
b->hkey &= bv->hkey;
b->tkey &= bv->tkey;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
