Changeset: 61fedb197d28 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/61fedb197d28
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2024/Tests/7574-startswith-bug.test
Branch: Aug2024
Log Message:
postpone push down of filter functions
diffs (35 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -1702,14 +1702,12 @@ push_join_exp(mvc *sql, sql_rel *rel, sq
static sql_rel *
rel_select_push_filter_exp_down(mvc *sql, sql_rel *rel, sql_exp *e, list *l,
list *r, int ff)
{
- sql_exp *ll, *rr;
+ sql_exp *ll;
if (exps_card(r) <= CARD_ATOM && (exps_are_atoms(r) ||
exps_have_freevar(sql, r) || exps_have_freevar(sql, l))) {
if (exps_card(l) == exps_card(r) || rel->processed) /* bin
compare op */
return rel_select(sql->sa, rel, e);
if ((ll = exps_find_one_multi_exp(l)))
return push_select_exp(sql, rel, e, ll, ff);
- } else if ((ll = exps_find_one_multi_exp(l)) && (rr =
exps_find_one_multi_exp(r))) { /* join */
- return push_join_exp(sql, rel, e, ll, rr, NULL, ff);
}
if (is_outerjoin(rel->op))
return rel_select(sql->sa, rel, e);
diff --git a/sql/test/BugTracker-2024/Tests/7574-startswith-bug.test
b/sql/test/BugTracker-2024/Tests/7574-startswith-bug.test
--- a/sql/test/BugTracker-2024/Tests/7574-startswith-bug.test
+++ b/sql/test/BugTracker-2024/Tests/7574-startswith-bug.test
@@ -4,10 +4,9 @@ CREATE TABLE t1(c0 INTEGER, c1 VARCHAR)
statement ok
CREATE VIEW v0(c0) AS SELECT 'a' FROM t1
-skipif knownfail
-statement error
+query IIT
SELECT * FROM t1, v0 WHERE STARTSWITH(t1.c0, v0.c0, t1.c1)
--- sql/backends/monet5/rel_bin.c:4582: rel2bin_select: Assertion
`sql->session->status == -10' failed.
+----
statement ok
DROP VIEW v0
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
