MonetDB: Jun2020-mmt - Be more defensive

[Pedro Ferreira]

Changeset: 41b95d7ecfd3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41b95d7ecfd3
Modified Files:
        sql/server/rel_schema.c
        sql/storage/store.c
Branch: Jun2020-mmt
Log Message:

Be more defensive


diffs (43 lines):

diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1605,9 +1605,6 @@ sql_alter_table(sql_query *query, dlist 
                        return rel_drop(sql->sa, ddl_drop_constraint, sname, 
kname, drop_action, 0);
                }
 
-               if (t->s && !nt->s)
-                       nt->s = t->s;
-
                res = rel_table(sql, ddl_alter_table, sname, nt, 0);
 
                if (!isTable(nt))
@@ -2167,8 +2164,6 @@ rel_create_index(mvc *sql, char *iname, 
 
        if (t->persistence != SQL_DECLARED_TABLE)
                sname = s->base.name;
-       if (t->s && !nt->s)
-               nt->s = t->s;
 
        /* add index here */
        i = mvc_create_idx(sql, nt, iname, itype);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1760,7 +1760,8 @@ dup_sql_part(sql_allocator *sa, sql_tabl
        }
        list_append(mt->members, p);
        p->t = mt;
-       p->member = op->member;
+       p->member = find_sql_table_id(mt->s, op->member->base.id);
+       assert(p->member);
        return p;
 }
 
@@ -1775,6 +1776,7 @@ dup_sql_table(sql_allocator *sa, sql_tab
        nt->access = t->access;
        nt->partition = t->partition;
        nt->query = (t->query) ? sa_strdup(sa, t->query) : NULL;
+       nt->s = t->s;
 
        if (isPartitionedByExpressionTable(nt)) {
                nt->part.pexp = SA_ZNEW(sa, sql_expression);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list