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

Fixed CORE-3683 - Recursive query with GROUP BY in root part: wrong results if no index exists for fields that are grouped.

Browse Source
This commit is contained in:
asfernandes 2011-12-03 20:22:14 +00:00
parent 1fb40d535f
commit 3009484b26
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jrd/recsrc/AggregatedStream.cpp
View File

@ -236,6 +236,7 @@ void AggregatedStream::print(thread_db* tdbb, string& plan,
void AggregatedStream::markRecursive()
{
m_recursive = true;
m_next->markRecursive();
}
@ -247,6 +248,10 @@ void AggregatedStream::invalidateRecords(jrd_req* request) const
void AggregatedStream::findUsedStreams(StreamList& streams) const
{
RecordStream::findUsedStreams(streams);
if (m_recursive)
m_next->findUsedStreams(streams);
if (m_bufferedStream)
m_bufferedStream->findUsedStreams(streams);
}

20
src/jrd/recsrc/RecursiveStream.cpp
View File

@ -54,15 +54,21 @@ RecursiveStream::RecursiveStream(CompilerScratch* csb, UCHAR stream, UCHAR mapSt
m_impure = CMP_impure(csb, sizeof(Impure));
m_saveSize = csb->csb_impure - saveOffset;
m_innerStreams.resize(streamCount);
for (size_t i = 0; i < streamCount; i++)
{
m_innerStreams[i] = innerStreams[i];
}
m_root->markRecursive();
m_inner->markRecursive();
// To make aggregates inside the inner stream work, we need to get its own and child streams.
// See CORE-3683 for a test case.
StreamList childStreams;
m_inner->findUsedStreams(childStreams);
m_innerStreams.resize(streamCount + childStreams.getCount());
for (size_t i = 0; i < streamCount; i++)
m_innerStreams[i] = innerStreams[i];
for (size_t i = 0; i < childStreams.getCount(); i++)
m_innerStreams[streamCount + i] = childStreams[i];
}
void RecursiveStream::open(thread_db* tdbb) const