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

Correction for one of my past commits. Also, unified the code a bit.

Browse Source
This commit is contained in:
dimitr 2010-11-29 16:02:13 +00:00
parent a6aa95ce5e
commit ade2a92943
2 changed files with 31 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/jrd/Optimizer.cpp
View File

@ -1312,22 +1312,6 @@ InversionCandidate* OptimizerRetrieval::generateInversion(RecordSource** rsb)
invCandidate->cost += csb->csb_rpt[stream].csb_cardinality * invCandidate->selectivity; invCandidate->cost += csb->csb_rpt[stream].csb_cardinality * invCandidate->selectivity;
} }
// Adjust the effective selectivity by treating computable conjunctions as filters
for (const OptimizerBlk::opt_conjunct* tail = optimizer->opt_conjuncts.begin();
tail < optimizer->opt_conjuncts.end(); tail++)
{
jrd_nod* const node = tail->opt_conjunct_node;
if (!(tail->opt_conjunct_flags & opt_conjunct_used) &&
OPT_computable(optimizer->opt_csb, node, stream, false, true) &&
!invCandidate->matches.exist(node))
{
const double factor = (node->nod_type == nod_eql) ?
REDUCE_SELECTIVITY_FACTOR_EQUALITY :
REDUCE_SELECTIVITY_FACTOR_INEQUALITY;
invCandidate->selectivity *= factor;
}
}
// Add the streams where this stream is depending on // Add the streams where this stream is depending on
for (size_t i = 0; i < invCandidate->matches.getCount(); i++) { for (size_t i = 0; i < invCandidate->matches.getCount(); i++) {
findDependentFromStreams(invCandidate->matches[i], findDependentFromStreams(invCandidate->matches[i],
@ -1504,40 +1488,6 @@ RecordSource* OptimizerRetrieval::generateNavigation()
return NULL; return NULL;
} }
InversionCandidate* OptimizerRetrieval::getCost()
{
/**************************************
*
* g e t C o s t
*
**************************************
*
* Functional description
*
**************************************/
createIndexScanNodes = false;
setConjunctionsMatched = false;
InversionCandidate* inversion = generateInversion(NULL);
if (inversion) {
return inversion;
}
else {
// No index will be used, thus
InversionCandidate* invCandidate = FB_NEW(pool) InversionCandidate(pool);
invCandidate->indexes = 0;
invCandidate->selectivity = MAXIMUM_SELECTIVITY;
invCandidate->cost = csb->csb_rpt[stream].csb_cardinality;
/*
OptimizerBlk::opt_conjunct* tail = optimizer->opt_conjuncts.begin();
for (; tail < optimizer->opt_conjuncts.end(); tail++) {
findDependentFromStreams(tail->opt_conjunct_node,
&invCandidate->dependentFromStreams);
}
*/
return invCandidate;
}
}
InversionCandidate* OptimizerRetrieval::getInversion(RecordSource** rsb) InversionCandidate* OptimizerRetrieval::getInversion(RecordSource** rsb)
{ {
/************************************** /**************************************
@ -1553,20 +1503,37 @@ InversionCandidate* OptimizerRetrieval::getInversion(RecordSource** rsb)
* an InversionCandidate; * an InversionCandidate;
* *
**************************************/ **************************************/
createIndexScanNodes = true; createIndexScanNodes = rsb ? true : false;
setConjunctionsMatched = true; setConjunctionsMatched = rsb ? true : false;
InversionCandidate* inversion = generateInversion(rsb);
if (inversion) { InversionCandidate* invCandidate = generateInversion(rsb);
return inversion;
} if (!invCandidate)
else { {
// No index will be used // No index will be used
InversionCandidate* invCandidate = FB_NEW(pool) InversionCandidate(pool); invCandidate = FB_NEW(pool) InversionCandidate(pool);
invCandidate->indexes = 0; invCandidate->indexes = 0;
invCandidate->selectivity = MAXIMUM_SELECTIVITY; invCandidate->selectivity = MAXIMUM_SELECTIVITY;
invCandidate->cost = csb->csb_rpt[stream].csb_cardinality; invCandidate->cost = csb->csb_rpt[stream].csb_cardinality;
return invCandidate;
} }
// Adjust the effective selectivity by treating computable conjunctions as filters
for (const OptimizerBlk::opt_conjunct* tail = optimizer->opt_conjuncts.begin();
tail < optimizer->opt_conjuncts.end(); tail++)
{
jrd_nod* const node = tail->opt_conjunct_node;
if (!(tail->opt_conjunct_flags & opt_conjunct_used) &&
OPT_computable(optimizer->opt_csb, node, stream, false, true) &&
!invCandidate->matches.exist(node))
{
const double factor = (node->nod_type == nod_eql) ?
REDUCE_SELECTIVITY_FACTOR_EQUALITY :
REDUCE_SELECTIVITY_FACTOR_INEQUALITY;
invCandidate->selectivity *= factor;
}
}
return invCandidate;
} }
bool OptimizerRetrieval::getInversionCandidates(InversionCandidateList* inversions, bool OptimizerRetrieval::getInversionCandidates(InversionCandidateList* inversions,

6
src/jrd/Optimizer.h
View File

@ -174,9 +174,13 @@ public:
bool outer, bool inner, jrd_nod** sortNode); bool outer, bool inner, jrd_nod** sortNode);
~OptimizerRetrieval(); ~OptimizerRetrieval();
InversionCandidate* getCost();
InversionCandidate* getInversion(RecordSource** rsb); InversionCandidate* getInversion(RecordSource** rsb);
InversionCandidate* getCost()
{
return getInversion(NULL);
}
protected: protected:
jrd_nod* composeInversion(jrd_nod* node1, jrd_nod* node2, NOD_T node_type) const; jrd_nod* composeInversion(jrd_nod* node1, jrd_nod* node2, NOD_T node_type) const;
void findDependentFromStreams(jrd_nod* node, SortedStreamList* streamList) const; void findDependentFromStreams(jrd_nod* node, SortedStreamList* streamList) const;