Changeset: 8de58bfc4c1f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8de58bfc4c1f
Modified Files:
sql/storage/bat/bat_storage.c
Branch: default
Log Message:
fix for incorrect insert counts (in the storage we cannot use argument bats
directly anymore, ie we need an extra copy)
diffs (22 lines):
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -247,11 +247,17 @@
bat->cached = NULL;
}
bat->cnt += BATcount(i);
+ /* We simply use the to be inserted bat directly.
+ * Disabled this optimization: sometimes the bat is used later in the
+ * mal plan.
+ * This should be solved by changing the input into a view (somehow)
if (BATcount(b) == 0 && !isVIEW(i) && BBP_lrefs(i->batCacheid) <= 1 &&
i->htype == TYPE_void && i->ttype != TYPE_void && bat->ibase == i->H->seq){
temp_destroy(bat->ibid);
bat->ibid = temp_create(i);
BATseqbase(i, bat->ibase);
- } else if (!isEbat(b)){
+ } else
+ */
+ if (!isEbat(b)){
/* try to use mmap() */
if (BATcount(b)+BATcount(i) > (BUN) REMAP_PAGE_MAXSIZE) {
BATmmap(b, STORE_MMAP, STORE_MMAP, STORE_MMAP,
STORE_MMAP, 1);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
