MonetDB: label - more clean up

[Niels Nes via checkin-list]

Changeset: c96fd5fd3241 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c96fd5fd3241
Modified Files:
        sql/server/rel_exp.c
        sql/server/rel_exp.h
        sql/server/rel_unnest.c
Branch: label
Log Message:

more clean up


diffs (59 lines):

diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -1264,23 +1264,6 @@ exps_find_exp( list *l, sql_exp *e)
        return NULL;
 }
 
-sql_exp*
-exps_find_equal_exp( list *l, sql_exp *e)
-{
-       node *n;
-
-       if (!l || !l->h)
-               return NULL;
-
-       for(n=l->h; n; n = n->next) {
-               sql_exp *s = n->data;
-               if (exp_match(n->data, e) || (s->nid && s->nid == e->nid))
-                       return n->data;
-       }
-       return NULL;
-}
-
-
 /* c refers to the parent p */
 int
 exp_refers( sql_exp *p, sql_exp *c)
diff --git a/sql/server/rel_exp.h b/sql/server/rel_exp.h
--- a/sql/server/rel_exp.h
+++ b/sql/server/rel_exp.h
@@ -147,7 +147,6 @@ extern int exp_refers( sql_exp *p, sql_e
 extern sql_exp *exps_refers( sql_exp *p, list *exps);
 extern int exp_match( sql_exp *e1, sql_exp *e2);
 extern sql_exp* exps_find_exp( list *l, sql_exp *e);
-extern sql_exp* exps_find_equal_exp( list *l, sql_exp *e);
 extern int exp_match_exp( sql_exp *e1, sql_exp *e2);
 extern int exp_match_exp_semantics( sql_exp *e1, sql_exp *e2, bool semantics);
 extern sql_exp* exps_any_match(list *l, sql_exp *e);
diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -3793,7 +3793,7 @@ rewrite_groupings(visitor *v, sql_rel *r
 
                                                for (node *nn = groups->h ; nn 
; nn = nn->next) {
                                                        sql_exp *exp = 
(sql_exp*) nn->data;
-                                                       if 
(!exps_find_equal_exp(l, exp)) {
+                                                       if (!exps_find_exp(l, 
exp)) {
                                                                switch 
(ATOMstorage(a->data.vtype)) {
                                                                        case 
TYPE_bte:
                                                                                
a->data.val.btval += (bte) (1 << counter);
@@ -3822,7 +3822,7 @@ rewrite_groupings(visitor *v, sql_rel *r
                                                ne = exp_atom(v->sql->sa, a);
                                                if (exp_name(e))
                                                        
exp_prop_alias(v->sql->sa, ne, e);
-                                       } else if (e->type == e_column && 
!exps_find_equal_exp(l, e) && !has_label(e)) {
+                                       } else if (e->type == e_column && 
!exps_find_exp(l, e) && !has_label(e)) {
                                                /* do not include in the output 
of the group by, but add to the project as null */
                                                ne = exp_atom(v->sql->sa, 
atom_general(v->sql->sa, exp_subtype(e), NULL, 0));
                                                if (exp_name(e))
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org