Changeset: f6aee12fe3e4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f6aee12fe3e4
Modified Files:
sql/server/rel_optimize_sel.c
Branch: cmp-or-patterns
Log Message:
Do not re-remove the first occurrence of a multi cmp_eq
(both for single and multi col exps)
diffs (27 lines):
diff --git a/sql/server/rel_optimize_sel.c b/sql/server/rel_optimize_sel.c
--- a/sql/server/rel_optimize_sel.c
+++ b/sql/server/rel_optimize_sel.c
@@ -557,8 +557,10 @@ detect_col_cmp_eqs(mvc *sql, list *eqs,
eas->l = append(eas->l, re);
found = col_multivalue_cmp_eq = true;
}
- if (eas->first)
+ if (eas->first) {
list_remove_data(eqs, NULL, eas->first);
+ eas->first = NULL;
+ }
list_remove_node(eqs, NULL, n);
}
@@ -630,8 +632,10 @@ detect_multicol_cmp_eqs(mvc *sql, list *
/* remove this and the previous occurrence
(which means that's the first time
* that we found the *same* multi cmp_eq exp)
*/
- if (mcas->first)
+ if (mcas->first) {
list_remove_data(mce_ands, NULL,
mcas->first);
+ mcas->first = NULL;
+ }
list_remove_data(mce_ands, NULL, sl);
}
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
