MonetDB: Jun2020-mmt - The list of members contains a sql_part, ...

[Pedro Ferreira]

Changeset: 5d3c98bdf176 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d3c98bdf176
Modified Files:
        sql/server/rel_optimizer.c
Branch: Jun2020-mmt
Log Message:

The list of members contains a sql_part, not a sql_table


diffs (58 lines):

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
@@ -27,6 +27,18 @@ typedef struct global_props {
 
 static sql_subfunc *find_func(mvc *sql, char *name, list *exps);
 
+static int
+find_member_pos(list *l, sql_table *t)
+{
+       int i = 0;
+       for (node *n = l->h; n ; n = n->next, i++) {
+               sql_part *pt = n->data;
+               if (pt->member->base.id == t->base.id)
+                       return i;
+       }
+       return -1;
+}
+
 /* The important task of the relational optimizer is to optimize the
    join order.
 
@@ -70,7 +82,7 @@ name_find_column( sql_rel *rel, const ch
                        if (strcmp(c->base.name, name) == 0) {
                                *bt = rel;
                                if (pnr < 0 || (mt &&
-                                       list_position(mt->members, c->t) == 
pnr))
+                                       find_member_pos(mt->members, c->t) == 
pnr))
                                        return c;
                        }
                }
@@ -80,7 +92,7 @@ name_find_column( sql_rel *rel, const ch
                        if (strcmp(i->base.name, name+1 /* skip % */) == 0) {
                                *bt = rel;
                                if (pnr < 0 || (mt &&
-                                       list_position(mt->members, i->t) == 
pnr)) {
+                                       find_member_pos(mt->members, i->t) == 
pnr)) {
                                        sql_kc *c = i->columns->h->data;
                                        return c->c;
                                }
@@ -5025,7 +5037,7 @@ rel_part_nr( sql_rel *rel, sql_exp *e )
                return -1;
        sql_table *pp = c->t;
        sql_table *mt = bt->r;
-       return list_position(mt->members, pp);
+       return find_member_pos(mt->members, pp);
 }
 
 static int
@@ -5048,7 +5060,7 @@ rel_uses_part_nr( sql_rel *rel, sql_exp 
        if (c && bt && bt->r) {
                sql_table *pp = c->t;
                sql_table *mt = bt->r;
-               if (list_position(mt->members, pp) == pnr)
+               if (find_member_pos(mt->members, pp) == pnr)
                        return 1;
        }
        /* for projects we may need to do a rename! */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list