MonetDB: check - serialize used columns

[Yunus Koning via checkin-list]

Changeset: d4f871ae47a4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d4f871ae47a4
Modified Files:
        sql/server/rel_basetable.c
        sql/server/rel_schema.c
Branch: check
Log Message:

serialize used columns


diffs (29 lines):

diff --git a/sql/server/rel_basetable.c b/sql/server/rel_basetable.c
--- a/sql/server/rel_basetable.c
+++ b/sql/server/rel_basetable.c
@@ -567,9 +567,9 @@ rel_base_dump_exps( stream *fout, sql_re
                }
        }
        if (rel_base_is_used(ba, i)) {
-               mnstr_printf(fout, "%s\"%s\".\"%%TID\"", comma?", ":"", 
t->base.name);
+               mnstr_printf(fout, "%s\"%s\".\"%%TID%%\"", comma?", ":"", 
t->base.name);
                if (ba->name)
-                       mnstr_printf(fout, " as \"%s\".\"%%TID\"", ba->name);
+                       mnstr_printf(fout, " as \"%s\".\"%%TID%%\"", ba->name);
                comma = 1;
        }
        i++;
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
@@ -410,7 +410,9 @@ str serialize_check_plan(sql_query *quer
        exp_kind ek = {type_value, card_value, FALSE};
        sql_rel* rel = rel_basetable(sql, t, t->base.name);
        sql_exp *e = rel_logical_value_exp(query, &rel, s->data.sym, sql_sel, 
ek);
-       rel = rel_project_exp(sql, e);
+       list *pexps = sa_list(sql->sa);
+       pexps = append(pexps, e);
+       rel = rel_project(sql->sa, rel, pexps);
        str check = rel2str(sql, rel);
        return check;
 }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org