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

Fixed the broken recursive queries.

Browse Source
This commit is contained in:
dimitr 2010-01-22 08:23:36 +00:00
parent 48b4e11b86
commit 2e1b41114a
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jrd/recsrc/RecordSource.h
View File

@ -901,7 +901,7 @@ namespace Jrd
RecordSource* root, RecordSource* inner, RecordSource* root, RecordSource* inner,
jrd_nod* rootMap, jrd_nod* innerMap, jrd_nod* rootMap, jrd_nod* innerMap,
size_t streamCount, const UCHAR* innerStreams, size_t streamCount, const UCHAR* innerStreams,
size_t baseImpure); size_t saveOffset);
void open(thread_db* tdbb); void open(thread_db* tdbb);
void close(thread_db* tdbb); void close(thread_db* tdbb);
@ -922,7 +922,8 @@ namespace Jrd
jrd_nod* const m_rootMap; jrd_nod* const m_rootMap;
jrd_nod* const m_innerMap; jrd_nod* const m_innerMap;
StreamsArray m_innerStreams; StreamsArray m_innerStreams;
size_t m_impureSize; size_t m_saveOffset;
size_t m_saveSize;
}; };
} // namespace } // namespace

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

@ -41,17 +41,18 @@ RecursiveStream::RecursiveStream(CompilerScratch* csb, UCHAR stream, UCHAR mapSt
RecordSource* root, RecordSource* inner, RecordSource* root, RecordSource* inner,
jrd_nod* rootMap, jrd_nod* innerMap, jrd_nod* rootMap, jrd_nod* innerMap,
size_t streamCount, const UCHAR* innerStreams, size_t streamCount, const UCHAR* innerStreams,
size_t baseImpure) size_t saveOffset)
: RecordStream(csb, stream), : RecordStream(csb, stream),
m_mapStream(mapStream), m_mapStream(mapStream),
m_root(root), m_inner(inner), m_root(root), m_inner(inner),
m_rootMap(rootMap), m_innerMap(innerMap), m_rootMap(rootMap), m_innerMap(innerMap),
m_innerStreams(csb->csb_pool) m_innerStreams(csb->csb_pool),
m_saveOffset(saveOffset)
{ {
fb_assert(m_root && m_inner && m_rootMap && m_innerMap); fb_assert(m_root && m_inner && m_rootMap && m_innerMap);
m_impure = CMP_impure(csb, sizeof(Impure)); m_impure = CMP_impure(csb, sizeof(Impure));
m_impureSize = csb->csb_impure - baseImpure; m_saveSize = csb->csb_impure - saveOffset;
m_innerStreams.resize(streamCount); m_innerStreams.resize(streamCount);
@ -99,6 +100,7 @@ void RecursiveStream::close(thread_db* tdbb)
invalidateRecords(request); invalidateRecords(request);
Impure* const impure = (Impure*) ((UCHAR*) request + m_impure); Impure* const impure = (Impure*) ((UCHAR*) request + m_impure);
Impure* const saveImpure = (Impure*) ((UCHAR*) request + m_saveOffset);
if (impure->irsb_flags & irsb_open) if (impure->irsb_flags & irsb_open)
{ {
@ -111,7 +113,7 @@ void RecursiveStream::close(thread_db* tdbb)
delete[] impure->irsb_data; delete[] impure->irsb_data;
UCHAR* const tmp = impure->irsb_stack; UCHAR* const tmp = impure->irsb_stack;
memcpy(impure, tmp, m_impureSize); memcpy(saveImpure, tmp, m_saveSize);
delete[] tmp; delete[] tmp;
} }
@ -123,6 +125,7 @@ bool RecursiveStream::getRecord(thread_db* tdbb)
{ {
jrd_req* const request = tdbb->getRequest(); jrd_req* const request = tdbb->getRequest();
Impure* const impure = (Impure*) ((UCHAR*) request + m_impure); Impure* const impure = (Impure*) ((UCHAR*) request + m_impure);
Impure* const saveImpure = (Impure*) ((UCHAR*) request + m_saveOffset);
if (!(impure->irsb_flags & irsb_open)) if (!(impure->irsb_flags & irsb_open))
{ {
@ -150,10 +153,10 @@ bool RecursiveStream::getRecord(thread_db* tdbb)
} }
// Save where we are // Save where we are
UCHAR* const tmp = FB_NEW(*tdbb->getDefaultPool()) UCHAR[m_impureSize + rpbsSize]; UCHAR* const tmp = FB_NEW(*tdbb->getDefaultPool()) UCHAR[m_saveSize + rpbsSize];
memcpy(tmp, impure, m_impureSize); memcpy(tmp, saveImpure, m_saveSize);
UCHAR* p = tmp + m_impureSize; UCHAR* p = tmp + m_saveSize;
for (size_t i = 0; i < m_innerStreams.getCount(); i++) for (size_t i = 0; i < m_innerStreams.getCount(); i++)
{ {
const UCHAR stream = m_innerStreams[i]; const UCHAR stream = m_innerStreams[i];
@ -171,7 +174,7 @@ bool RecursiveStream::getRecord(thread_db* tdbb)
memcpy(impure->irsb_data, record->rec_data, record->rec_length); memcpy(impure->irsb_data, record->rec_data, record->rec_length);
const Impure r = *impure; const Impure r = *impure;
memset(impure, 0, m_impureSize); memset(saveImpure, 0, m_saveSize);
*impure = r; *impure = r;
// (Re-)Open a new child stream & reset record number // (Re-)Open a new child stream & reset record number
@ -199,9 +202,9 @@ bool RecursiveStream::getRecord(thread_db* tdbb)
delete[] impure->irsb_data; delete[] impure->irsb_data;
UCHAR* const tmp = impure->irsb_stack; UCHAR* const tmp = impure->irsb_stack;
memcpy(impure, tmp, m_impureSize); memcpy(saveImpure, tmp, m_saveSize);
UCHAR* p = tmp + m_impureSize; UCHAR* p = tmp + m_saveSize;
for (size_t i = 0; i < m_innerStreams.getCount(); i++) for (size_t i = 0; i < m_innerStreams.getCount(); i++)
{ {
const UCHAR stream = m_innerStreams[i]; const UCHAR stream = m_innerStreams[i];