Changeset: 8e183f6d15b7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8e183f6d15b7
Modified Files:
sql/backends/monet5/rel_bin.c
sql/server/rel_optimize_others.c
Branch: nested
Log Message:
cleanup
diffs (41 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
@@ -4057,7 +4057,7 @@ rel2bin_antijoin(backend *be, sql_rel *r
en = jexps->h;
} else {
if (list_length(sexps))
- list_merge(jexps, sexps, NULL);
+ jexps = list_join(jexps, sexps);
en = jexps->h;
sql_exp *e = en->data;
if (e->type == e_cmp && (e->flag == cmp_equal || e->flag ==
cmp_notequal)) {
diff --git a/sql/server/rel_optimize_others.c b/sql/server/rel_optimize_others.c
--- a/sql/server/rel_optimize_others.c
+++ b/sql/server/rel_optimize_others.c
@@ -13,6 +13,7 @@
#include "monetdb_config.h"
#include "rel_optimizer.h"
#include "rel_optimizer_private.h"
+#include "rel_optimizer.h"
#include "rel_exp.h"
#include "rel_select.h"
@@ -247,7 +248,7 @@ exp_range_overlap(atom *min, atom *max,
}
-/* if local_proj is > -1, the current expression is from the same projection
+/* if local_proj is >= -1, the current expression is from the same projection
if local_proj is -1, then we don't care about self references (eg used to
check for order by exps) */
static int exp_mark_used(sql_rel *subrel, sql_exp *e, int local_proj);
@@ -705,7 +706,7 @@ rel_mark_used(mvc *sql, sql_rel *rel, in
}
}
-static sql_rel * rel_dce_sub(mvc *sql, sql_rel *rel);
+static sql_rel *rel_dce_sub(mvc *sql, sql_rel *rel);
static sql_rel *
rel_remove_unused(mvc *sql, sql_rel *rel)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
