Changeset: ca4ed6d90384 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca4ed6d90384
Modified Files:
sql/storage/store.c
Branch: Nov2019
Log Message:
first reset all tables pointers (p) pointing back into the merge and replica
tables
then set all members again as part of these merge and replica tables.
diffs (46 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1044,25 +1044,25 @@ set_members(changeset *ts)
{
node *n, *m;
- if (ts && ts->set)
- for (n = ts->set->h; n; n = n->next) {
- sql_table *t = n->data;
-
- if (isMergeTable(t) || isReplicaTable(t)) {
- if (t->members.set)
- for (m = t->members.set->h; m; m = m->next) {
- sql_part *p = m->data;
- sql_table *pt = find_sql_table(t->s,
p->base.name);
-
- p->t = pt;
- pt->p = t;
+ if (ts && ts->set) {
+ for (n = ts->set->h; n; n = n->next) {
+ sql_table *t = n->data;
+ t->p = NULL;
+ }
+ for (n = ts->set->h; n; n = n->next) {
+ sql_table *t = n->data;
+
+ if (isMergeTable(t) || isReplicaTable(t)) {
+ if (t->members.set)
+ for (m = t->members.set->h; m; m = m->next) {
+ sql_part *p = m->data;
+ sql_table *pt = find_sql_table(t->s,
p->base.name);
+
+ p->t = pt;
+ pt->p = t;
+ }
}
}
- if(t->p) {
- sql_part *pt = find_sql_part(t->p, t->base.name);
- if(!pt)
- t->p = NULL;
- }
}
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
