MonetDB: cmp-or-patterns - Merges default

[stefanos mavros via checkin-list]

Changeset: f1fd65631f85 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f1fd65631f85
Branch: cmp-or-patterns
Log Message:

Merges default


diffs (44 lines):

diff --git a/sql/backends/monet5/sql_gencode.c 
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -1691,6 +1691,13 @@ void
 }
 
 void
+_exps_print(mvc *sql, list *l) {
+       if (l)
+               for (node *n = l->h; n; n = n->next)
+                       _exp_print(sql, n->data);
+}
+
+void
 rel_print(mvc *sql, sql_rel *rel, int depth)
 {
        list *refs = sa_list(sql->sa);
diff --git a/sql/backends/monet5/sql_gencode.h 
b/sql/backends/monet5/sql_gencode.h
--- a/sql/backends/monet5/sql_gencode.h
+++ b/sql/backends/monet5/sql_gencode.h
@@ -35,6 +35,7 @@ extern void rel_print(mvc *sql, sql_rel 
 extern void _rel_print(mvc *sql, sql_rel *rel);
 
 extern void _exp_print(mvc *sql, sql_exp *e);
+extern void _exps_print(mvc *sql, list *l);
 
 extern int constantAtom(backend *be, MalBlkPtr mb, atom *a);
 extern InstrPtr table_func_create_result(MalBlkPtr mb, InstrPtr q, sql_func 
*f, list *restypes);
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
@@ -1215,12 +1215,6 @@ exp_equal( sql_exp *e1, sql_exp *e2)
        if (e1->alias.label && e1->alias.label == e2->alias.label)
                return 0;
        return -1;
-       if (e1->alias.rname && e2->alias.rname && strcmp(e1->alias.rname, 
e2->alias.rname) == 0)
-               if (e1->alias.name && e2->alias.name && strcmp(e1->alias.name, 
e2->alias.name) == 0)
-                       return 0;
-       if (!e1->alias.rname && !e2->alias.rname && /*has_label(e1) &&*/ 
e1->alias.label == e2->alias.label && e1->alias.name && e2->alias.name)
-               return strcmp(e1->alias.name, e2->alias.name);
-       return -1;
 }
 
 int
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org