Changeset: 93e7f9dbca06 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=93e7f9dbca06
Modified Files:
sql/storage/bat/bat_storage.c
Branch: Jul2015
Log Message:
make sure we do have a delta structure to merge
diffs (30 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
@@ -2115,7 +2115,7 @@ update_table(sql_trans *tr, sql_table *f
destroy_dbat(tr, b->next);
b->next = NULL;
}
- } else if (ft->base.allocated) {
+ } else if (tt->data && ft->base.allocated) {
tr_update_dbat(tr, tt->data, ft->data, ft->cleared);
} else if (store_nr_active == 1 && !ft->base.allocated) {
tr_merge_dbat(tr, tt->data);
@@ -2150,7 +2150,7 @@ update_table(sql_trans *tr, sql_table *f
destroy_bat(tr, b->next);
b->next = NULL;
}
- } else if (cc->base.allocated) {
+ } else if (oc->data && cc->base.allocated) {
tr_update_delta(tr, oc->data, cc->data,
cc->unique == 1);
} else if (store_nr_active == 1 && !cc->base.allocated)
{
tr_merge_delta(tr, oc->data, oc->unique == 1);
@@ -2210,7 +2210,7 @@ update_table(sql_trans *tr, sql_table *f
destroy_bat(tr, b->next);
b->next = NULL;
}
- } else if (ci->base.allocated) {
+ } else if (oi->data && ci->base.allocated) {
tr_update_delta(tr, oi->data, ci->data,
0);
} else if (store_nr_active == 1 &&
!ci->base.allocated) {
tr_merge_delta(tr, oi->data, 0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
