Changeset: d4016daeaedd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4016daeaedd
Modified Files:
sql/storage/store.c
Branch: Oct2020
Log Message:
Merged with Jun2020
diffs (69 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -4215,7 +4215,7 @@ rollforward_drop_part(sql_trans *tr, sql
(void) tr;
if (mode == R_APPLY) {
sql_table *mt = p->t;
- sql_table *pt = find_sql_table(mt->s, p->base.name);
+ sql_table *pt = find_sql_table_id(mt->s, p->base.id);
assert(isMergeTable(mt) || isReplicaTable(mt));
if (pt)
@@ -4463,7 +4463,7 @@ rollforward_update_table(sql_trans *tr,
ft->cleared = 0;
tt->access = ft->access;
if (ft->p) {
- tt->p = find_sql_table(tt->s, ft->p->base.name);
+ tt->p = find_sql_table_id(tt->s, ft->p->base.id);
assert(isMergeTable(tt->p) || isReplicaTable(tt->p));
} else
tt->p = NULL;
@@ -4765,7 +4765,7 @@ reset_type(sql_trans *tr, sql_type *ft,
ft->localtype = pft->localtype;
ft->digits = pft->digits;
ft->scale = pft->scale;
- ft->s = find_sql_schema(tr, pft->s->base.name);
+ ft->s = find_sql_schema_id(tr, pft->s->base.id);
}
return LOG_OK;
}
@@ -4790,7 +4790,7 @@ reset_func(sql_trans *tr, sql_func *ff,
ff->fix_scale = pff->fix_scale;
ff->system = pff->system;
ff->semantics = pff->semantics;
- ff->s = find_sql_schema(tr, pff->s->base.name);
+ ff->s = find_sql_schema_id(tr, pff->s->base.id);
ff->sa = tr->sa;
}
return LOG_OK;
@@ -4847,9 +4847,9 @@ reset_part(sql_trans *tr, sql_part *ft,
if (pft->t) {
sql_table *mt = pft->t;
- sql_schema *s = find_sql_schema(tr, mt->s->base.name);
+ sql_schema *s = find_sql_schema_id(tr, mt->s->base.id);
if (s) {
- sql_table *fmt = find_sql_table(s,
mt->base.name);
+ sql_table *fmt = find_sql_table_id(s,
mt->base.id);
assert(isMergeTable(fmt) ||
isReplicaTable(fmt));
ft->t = fmt;
}
@@ -4888,7 +4888,7 @@ reset_table(sql_trans *tr, sql_table *ft
ft->cleared = 0;
ft->access = pft->access;
if (pft->p) {
- ft->p = find_sql_table(ft->s, pft->p->base.name);
+ ft->p = find_sql_table_id(ft->s, pft->p->base.id);
//Check if this assert can be removed definitely.
//the parent (merge or replica table) maybe created
later!
//assert(isMergeTable(ft->p) || isReplicaTable(ft->p));
@@ -5047,7 +5047,7 @@ sql_trans_validate(sql_trans *tr)
if (isTempSchema(s))
continue;
- os = find_sql_schema(tr->parent, s->base.name);
+ os = find_sql_schema_id(tr->parent, s->base.id);
if (os && (s->base.wtime != 0 || s->base.rtime != 0)) {
if (!validate_tables(s, os))
return false;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
