firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 00:03:03 +01:00
Code Issues

Don't forget the OR operations Arno

Browse Source
This commit is contained in:
arnobrinkman 2003-09-08 08:56:13 +00:00
parent 82d9cfee47
commit 6770751035
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/jrd/opt.cpp
View File

@ -4416,13 +4416,6 @@ static RSB gen_retrieval(TDBB tdbb,
}
}
// If no index is used then leave other nodes alone, because they could be used for
// building a SORT/MERGE.
if (!index_used && !outer_flag) {
return gen_rsb(tdbb, opt, rsb, inversion, stream, relation, alias,
NULL, csb_tail->csb_cardinality);
}
if (outer_flag) {
// Now make another pass thru the outer conjuncts only, finding unused,
// computable booleans. When one is found, roll it into a final
@ -4464,10 +4457,23 @@ static RSB gen_retrieval(TDBB tdbb,
compose(&inversion, make_inversion(tdbb, opt, node, stream),
nod_bit_and);
}
compose(&opt_boolean, node, nod_and);
tail->opt_flags |= opt_used;
if (!outer_flag && !(tail->opt_flags & opt_matched)) {
csb_tail->csb_flags |= csb_unmatched;
}
}
// If no index is used then leave other nodes alone, because they could be used for
// building a SORT/MERGE.
tail = opt->opt_rpt;
if (outer_flag || inversion) {
for (; tail < opt_end; tail++) {
node = tail->opt_conjunct;
if (!(tail->opt_flags & opt_used)
&& computable(csb, node, -1, false))
{
compose(&opt_boolean, node, nod_and);
tail->opt_flags |= opt_used;
if (!outer_flag && !(tail->opt_flags & opt_matched)) {
csb_tail->csb_flags |= csb_unmatched;
}
}
}
}