MonetDB: Jul2017 - also handle tid and indices

[Niels Nes]

Changeset: 54780e03897f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=54780e03897f
Modified Files:
        sql/server/rel_dump.c
        sql/server/rel_optimizer.c
Branch: Jul2017
Log Message:

also handle tid and indices


diffs (33 lines):

diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -998,6 +998,7 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
                exp->p = prop_create(sql->sa, PROP_FETCH, exp->p);
                skipWS(r,pos);
        }
+       read_prop( sql, exp, r, pos);
 
        /* as alias */
        if (strncmp(r+*pos, "as", 2) == 0) {
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -7685,6 +7685,18 @@ rel_rename_part(mvc *sql, sql_rel *p, ch
 
                exp_setname(sql->sa, ne, tname, c->base.name);
        }
+       if (n) /* skip TID */
+               n = n->next;
+       if (mt->idxs.set) {
+               /* also possible index name mismatches */
+               for( m = mt->idxs.set->h; n && m; n = n->next, m = m->next) {
+                       sql_exp *ne = n->data;
+                       sql_idx *i = m->data;
+                       char *iname = sa_strconcat( sql->sa, "%", i->base.name);
+
+                       exp_setname(sql->sa, ne, tname, iname);
+               }
+       }
        return p;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list