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

A few additional adjustments for CORE-1295: Bad optimization of queries with DB_KEY.

Browse Source
This commit is contained in:
dimitr 2012-11-27 17:22:42 +00:00
parent b1e465c84a
commit b07ef45ae6
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/jrd/Optimizer.cpp
View File

@ -1029,7 +1029,7 @@ void OptimizerRetrieval::getInversionCandidates(InversionCandidateList* inversio
}
}
ValueExprNode* OptimizerRetrieval::findDbKey(ValueExprNode* dbkey, StreamType stream, SLONG* position) const
ValueExprNode* OptimizerRetrieval::findDbKey(ValueExprNode* dbkey, SLONG* position) const
{
/**************************************
*
@ -1058,12 +1058,12 @@ ValueExprNode* OptimizerRetrieval::findDbKey(ValueExprNode* dbkey, StreamType st
if (concatNode)
{
ValueExprNode* dbkey_temp = findDbKey(concatNode->arg1, stream, position);
ValueExprNode* dbkey_temp = findDbKey(concatNode->arg1, position);
if (dbkey_temp)
return dbkey_temp;
dbkey_temp = findDbKey(concatNode->arg2, stream, position);
dbkey_temp = findDbKey(concatNode->arg2, position);
if (dbkey_temp)
return dbkey_temp;
@ -2021,12 +2021,13 @@ InversionCandidate* OptimizerRetrieval::matchDbKey(BoolExprNode* boolean) const
SLONG n = 0;
if (dbkey->is<ConcatenateNode>())
{
dbkey = findDbKey(dbkey, stream, &n);
dbkey = findDbKey(dbkey, &n);
if (!dbkey)
return NULL;
}
// Make sure we have the correct stream
keyNode = dbkey->as<RecordKeyNode>();
fb_assert(keyNode && keyNode->blrOp == blr_dbkey);
@ -2035,12 +2036,15 @@ InversionCandidate* OptimizerRetrieval::matchDbKey(BoolExprNode* boolean) const
// If this is a dbkey for the appropriate stream, it's invertable
const double cardinality = csb->csb_rpt[stream].csb_cardinality;
InversionCandidate* const invCandidate = FB_NEW(pool) InversionCandidate(pool);
invCandidate->indexes = 0;
invCandidate->selectivity = 1 / csb->csb_rpt[stream].csb_cardinality;
invCandidate->cost = 0;
invCandidate->unique = true;
invCandidate->selectivity = cardinality ? 1 / cardinality : DEFAULT_SELECTIVITY;
invCandidate->cost = 1;
invCandidate->matches.add(boolean);
boolean->findDependentFromStreams(this, &invCandidate->dependentFromStreams);
invCandidate->dependencies = (int) invCandidate->dependentFromStreams.getCount();
if (createIndexScanNodes)
{

2
src/jrd/Optimizer.h
View File

@ -180,7 +180,7 @@ protected:
InversionCandidate* matchDbKey(BoolExprNode* boolean) const;
InversionCandidate* matchOnIndexes(IndexScratchList* indexScratches,
BoolExprNode* boolean, USHORT scope) const;
ValueExprNode* findDbKey(ValueExprNode* dbkey, StreamType stream, SLONG* position) const;
ValueExprNode* findDbKey(ValueExprNode* dbkey, SLONG* position) const;
#ifdef OPT_DEBUG_RETRIEVAL
void printCandidate(const InversionCandidate* candidate) const;