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

Misc.

Browse Source
This commit is contained in:
dimitr 2010-01-15 11:40:08 +00:00
parent 23fc6c9566
commit 5186898135
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jrd/Optimizer.cpp
View File

@ -2834,8 +2834,6 @@ InnerJoinStreamInfo::InnerJoinStreamInfo(MemoryPool& p) :
baseIndexes = 0;
baseConjunctionMatches = 0;
used = false;
indexedRelationships.shrink(0);
previousExpectedStreams = 0;
}
@ -2905,13 +2903,13 @@ OptimizerInnerJoin::~OptimizerInnerJoin()
for (size_t i = 0; i < innerStreams.getCount(); i++)
{
for (size_t j = 0; j < innerStreams[i]->indexedRelationships.getCount(); j++) {
for (size_t j = 0; j < innerStreams[i]->indexedRelationships.getCount(); j++)
{
delete innerStreams[i]->indexedRelationships[j];
}
innerStreams[i]->indexedRelationships.clear();
delete innerStreams[i];
}
innerStreams.clear();
}
void OptimizerInnerJoin::calculateCardinalities()
@ -3150,6 +3148,7 @@ int OptimizerInnerJoin::findJoinOrder()
if (optimizer->opt_best_count == 0)
{
IndexedRelationships indexedRelationships(pool);
for (i = 0; i < innerStreams.getCount(); i++)
{
if (!innerStreams[i]->used)