Changeset: 9a47be74b4ef for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9a47be74b4ef
Modified Files:
sql/backends/monet5/rel_bin.c
Branch: default
Log Message:
Revert rel2bin_hash_lookup removal. However MAL code is being generated twice
for that case. Someone help clean this on the join case
diffs (29 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
@@ -3627,12 +3627,25 @@ rel2bin_select(backend *be, sql_rel *rel
return predicate;
assert(0);
}
+ en = rel->exps->h;
if (!sub && predicate) {
list *l = sa_list(sql->sa);
assert(predicate);
append(l, predicate);
sub = stmt_list(be, l);
}
+ /* handle possible index lookups */
+ /* expressions are in index order ! */
+ if (sub && en) {
+ sql_exp *e = en->data;
+ prop *p;
+
+ if ((p=find_prop(e->p, PROP_HASHCOL)) != NULL) {
+ sql_idx *i = p->value;
+
+ sel = rel2bin_hash_lookup(be, rel, sub, NULL, i, en);
+ }
+ }
for( en = rel->exps->h; en; en = en->next ) {
sql_exp *e = en->data;
stmt *s = exp_bin(be, e, sub, NULL, NULL, NULL, NULL, sel, 0,
1, 0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
