MonetDB: Jul2017 - for replicated tables leave dead expression (...

[Niels Nes]

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

for replicated tables leave dead expression (we rewriting we need them for now)


diffs (43 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
@@ -987,21 +987,18 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
        }
        if (strncmp(r+*pos, "HASHIDX",  strlen("HASHIDX")) == 0) {
                (*pos)+= (int) strlen("HASHIDX");
-               exp->p = prop_create(sql->sa, PROP_HASHIDX, exp->p);
                if (!find_prop(exp->p, PROP_HASHIDX))
                        exp->p = prop_create(sql->sa, PROP_HASHIDX, exp->p);
                skipWS(r,pos);
        }
        if (strncmp(r+*pos, "HASHCOL",  strlen("HASHCOL")) == 0) {
                (*pos)+= (int) strlen("HASHCOL");
-               exp->p = prop_create(sql->sa, PROP_HASHCOL, exp->p);
                if (!find_prop(exp->p, PROP_HASHCOL))
                        exp->p = prop_create(sql->sa, PROP_HASHCOL, exp->p);
                skipWS(r,pos);
        }
        if (strncmp(r+*pos, "FETCH",  strlen("FETCH")) == 0) {
                (*pos)+= (int) strlen("FETCH");
-               exp->p = prop_create(sql->sa, PROP_FETCH, exp->p);
                if (!find_prop(exp->p, PROP_FETCH))
                        exp->p = prop_create(sql->sa, PROP_FETCH, exp->p);
                skipWS(r,pos);
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
@@ -5962,7 +5962,13 @@ rel_remove_unused(mvc *sql, sql_rel *rel
                return rel;
 
        switch(rel->op) {
-       case op_basetable:
+       case op_basetable: {
+               sql_table *t = rel->l;
+
+               if (t && isReplicaTable(t)) /* TODO fix rewriting in 
rel_distribute.c */
+                       return rel;
+       }
+       /* fall through */
        case op_table:
                if (rel->exps) {
                        node *n;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list