MonetDB: Oct2014 - Simplify stmt_unique.

[Sjoerd Mullender]

Changeset: 3a6594ecbb94 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3a6594ecbb94
Modified Files:
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql_statement.c
        sql/backends/monet5/sql_statement.h
Branch: Oct2014
Log Message:

Simplify stmt_unique.
It is called in one place with three NULL params, so we change it to
not include those params.


diffs (46 lines):

diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -509,7 +509,7 @@ exp_bin(mvc *sql, sql_exp *e, stmt *left
                                                grp = stmt_project(sql->sa, 
next, grp);
                                                stmt_group_done(g);
                                        } else
-                                               as = stmt_unique(sql->sa, as, 
NULL, NULL, NULL);
+                                               as = stmt_unique(sql->sa, as);
                                }
                                append(l, as);
                        }
diff --git a/sql/backends/monet5/sql_statement.c 
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -826,14 +826,14 @@ stmt_reorder(sql_allocator *sa, stmt *s,
 }
 
 stmt *
-stmt_unique(sql_allocator *sa, stmt *s, stmt *g, stmt *e, stmt *c)
+stmt_unique(sql_allocator *sa, stmt *s)
 {
        stmt *ns = stmt_create(sa, st_unique);
 
        ns->op1 = s;
-       ns->op2 = g;
-       ns->op3 = e;
-       ns->op4.stval = c;
+       ns->op2 = NULL;
+       ns->op3 = NULL;
+       ns->op4.stval = NULL;
        ns->nrcols = s->nrcols;
        ns->key = 1;
        ns->aggr = s->aggr;
diff --git a/sql/backends/monet5/sql_statement.h 
b/sql/backends/monet5/sql_statement.h
--- a/sql/backends/monet5/sql_statement.h
+++ b/sql/backends/monet5/sql_statement.h
@@ -245,7 +245,7 @@ extern stmt *stmt_binop(sql_allocator *s
 extern stmt *stmt_Nop(sql_allocator *sa, stmt *ops, sql_subfunc *op);
 extern stmt *stmt_func(sql_allocator *sa, stmt *ops, char *name, sql_rel *imp);
 extern stmt *stmt_aggr(sql_allocator *sa, stmt *op1, stmt *grp, stmt *ext, 
sql_subaggr *op, int reduce, int no_nil);
-extern stmt *stmt_unique(sql_allocator *sa, stmt *s, stmt *grp, stmt *ext, 
stmt *cnt);
+extern stmt *stmt_unique(sql_allocator *sa, stmt *s);
 
 extern stmt *stmt_alias(sql_allocator *sa, stmt *op1, char *tname, char *name);
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list