Changeset: 9dbae57da32d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9dbae57da32d
Modified Files:
monetdb5/optimizer/opt_emptybind.c
monetdb5/optimizer/opt_support.c
sql/backends/monet5/rel_bin.c
sql/test/BugTracker-2024/Tests/7439-exps-cards-crash.test
Branch: nested
Log Message:
small revert of incorrect checked in changes
diffs (57 lines):
diff --git a/monetdb5/optimizer/opt_emptybind.c
b/monetdb5/optimizer/opt_emptybind.c
--- a/monetdb5/optimizer/opt_emptybind.c
+++ b/monetdb5/optimizer/opt_emptybind.c
@@ -230,7 +230,7 @@ OPTemptybindImplementation(Client cntxt,
continue;
}
if (getModuleId(p) == algebraRef && getFunctionId(p) ==
projectionRef) {
- if (empty[getArg(p, 1)] /*|| empty[getArg(p, 2)]*/) {
+ if (empty[getArg(p, 1)] || empty[getArg(p, 2)]) {
actions++;
emptyresult(0);
}
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -546,8 +546,6 @@ isDelta(InstrPtr p)
int
isFragmentGroup2(InstrPtr p)
{
- if (getModuleId(p) == batRef && getFunctionId(p) == appendRef)
- return TRUE;
if (getModuleId(p) == batRef && getFunctionId(p) == replaceRef)
return TRUE;
return (getModuleId(p) == algebraRef && (getFunctionId(p) ==
projectionRef))
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
@@ -3898,17 +3898,6 @@ rel2bin_join(backend *be, sql_rel *rel,
}
int op = rel->op;
- if (0 && (op == op_right || op == op_full || op == op_left)) {
- if (op == op_left || op == op_full) {
- jl = stmt_append(be, jl, ld);
- jr = stmt_append(be, jr, stmt_const(be, ld,
stmt_atom(be, atom_general(sql->sa, tail_type(ld), NULL, 0))));
- }
- if (op == op_right || op == op_full) {
- jl = stmt_append(be, jl, stmt_const(be, rd,
stmt_atom(be, atom_general(sql->sa, tail_type(rd), NULL, 0))));
- jr = stmt_append(be, jr, rd);
- }
- op = op_join;
- }
for (n = left->op4.lval->h; n; n = n->next) {
stmt *c = n->data;
sql_alias *rnme = table_name(sql->sa, c);
diff --git a/sql/test/BugTracker-2024/Tests/7439-exps-cards-crash.test
b/sql/test/BugTracker-2024/Tests/7439-exps-cards-crash.test
--- a/sql/test/BugTracker-2024/Tests/7439-exps-cards-crash.test
+++ b/sql/test/BugTracker-2024/Tests/7439-exps-cards-crash.test
@@ -1,7 +1,7 @@
statement ok
CREATE TABLE v0 ( v1 oid )
-statement error
+statement ok
DELETE FROM v0 WHERE NOT ( v1 IN ( SELECT MAX ( DISTINCT ( SELECT NULL WHERE
v1 AND v1 = 'aggordview1' GROUP BY v1 ) ) FROM v0 ) )
statement ok
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
