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

Fixed the issue reported by Alex privately.

Browse Source
This commit is contained in:
dimitr 2013-06-25 17:46:13 +00:00
parent d0136fb54e
commit b3781ed537
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jrd/opt.cpp
View File

@ -2371,19 +2371,29 @@ static RecordSource* gen_retrieval(thread_db* tdbb,
if (!rsb)
{
if (inversion)
if (inversion && condition)
{
rsb = FB_NEW(*tdbb->getDefaultPool()) BitmapTableScan(csb, alias, stream, inversion);
if (condition &&
condition->computable(csb, INVALID_STREAM, false) &&
if (condition->computable(csb, INVALID_STREAM, false) &&
!condition->jrdStreamFinder(stream))
{
RecordSource* const other_rsb =
RecordSource* const rsb1 =
FB_NEW(*tdbb->getDefaultPool()) FullTableScan(csb, alias, stream);
RecordSource* const rsb2 =
FB_NEW(*tdbb->getDefaultPool()) BitmapTableScan(csb, alias, stream, inversion);
rsb = FB_NEW(*tdbb->getDefaultPool()) ConditionalStream(csb, other_rsb, rsb, condition);
rsb = FB_NEW(*tdbb->getDefaultPool()) ConditionalStream(csb, rsb1, rsb2, condition);
}
else
{
rsb = FB_NEW(*tdbb->getDefaultPool()) FullTableScan(csb, alias, stream);
if (boolean)
csb->csb_rpt[stream].csb_flags |= csb_unmatched;
}
}
else if (inversion)
{
rsb = FB_NEW(*tdbb->getDefaultPool()) BitmapTableScan(csb, alias, stream, inversion);
}
else
{