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

Apply forgotten opt.cpp changes in Optimizer.cpp

Browse Source
This commit is contained in:
asfernandes 2005-06-03 01:25:47 +00:00
parent f1307dadd5
commit ad1a65f798
1 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/jrd/Optimizer.cpp
View File

@ -32,6 +32,7 @@
#include "../jrd/jrd.h"
#include "../jrd/exe.h"
#include "../jrd/btr.h"
#include "../jrd/intl.h"
#include "../jrd/rse.h"
#include "../jrd/ods.h"
#include "../jrd/Optimizer.h"
@ -41,6 +42,7 @@
#include "../jrd/cmp_proto.h"
#include "../jrd/dpm_proto.h"
#include "../jrd/evl_proto.h"
#include "../jrd/intl_proto.h"
#include "../jrd/mov_proto.h"
#include "../jrd/par_proto.h"
@ -1334,6 +1336,23 @@ RecordSource* OptimizerRetrieval::generateNavigation()
usableIndex = false;
break;
}
dsc desc;
CMP_get_desc(tdbb, csb, node, &desc);
// ASF: "desc.dsc_ttype() > ttype_last_internal" is to avoid recursion
// when looking for charsets/collations
if ((idx->idx_flags & idx_unique) && DTYPE_IS_TEXT(desc.dsc_dtype) &&
desc.dsc_ttype() > ttype_last_internal)
{
TextType* tt = INTL_texttype_lookup(tdbb, desc.dsc_ttype(), NULL, NULL);
if (tt->getFlags() & TEXTTYPE_UNSORTED_UNIQUE)
{
usableIndex = false;
break;
}
}
}
if (!usableIndex) {
@ -1691,6 +1710,50 @@ jrd_nod* OptimizerRetrieval::makeIndexScanNode(IndexScratch* indexScratch) const
retrieval->irb_generic |= irb_starting;
}
for (IndexScratchSegment** tail = indexScratch->segments.begin();
tail != indexScratch->segments.end() && ((*tail)->lowerValue || (*tail)->upperValue); ++tail)
{
bool changed = false;
dsc dsc0;
dsc *desc0 = &dsc0;
CMP_get_desc(tdbb, optimizer->opt_csb, (*tail)->matches[0]->nod_arg[0], desc0);
// ASF: "dsc0.dsc_ttype() > ttype_last_internal" is to avoid recursion
// when looking for charsets/collations
if (!(indexScratch->idx->idx_flags & idx_unique) && DTYPE_IS_TEXT(dsc0.dsc_dtype) &&
dsc0.dsc_ttype() > ttype_last_internal)
{
TextType* tt = INTL_texttype_lookup(tdbb, dsc0.dsc_ttype(), NULL, NULL);
if (tt->getFlags() & TEXTTYPE_SEPARATE_UNIQUE)
{
// ASF: Order is more precise than equivalence class.
// It's necessary to use the partial key.
// For multi-segmented indices, don't use all segments.
retrieval->irb_generic |= irb_starting;
int diff = indexScratch->lowerCount - indexScratch->upperCount;
if (diff >= 0)
{
retrieval->irb_lower_count = tail - indexScratch->segments.begin() + 1;
retrieval->irb_upper_count = tail - indexScratch->segments.begin() + 1 - diff;
}
else
{
retrieval->irb_lower_count = tail - indexScratch->segments.begin() + 1 + diff;
retrieval->irb_upper_count = tail - indexScratch->segments.begin() + 1;
}
changed = true;
}
}
if (changed)
break;
}
// This index is never used for IS NULL, thus we can ignore NULLs
// already at index scan. But this rule doesn't apply to nod_equiv
// which requires NULLs to be found in the index.