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

Cleanup batches inside the engine if they were not released explicitly before disconnection. This avoids a resource leak (it's mostly about TempSpace). (#8341)

Browse Source
This commit is contained in:
Dmitry Yemanov 2024-12-05 12:59:45 +03:00 committed by GitHub
parent 30b77ddd13
commit c60acb0028
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dsql/DsqlBatch.cpp
View File

@ -151,15 +151,20 @@ DsqlBatch::DsqlBatch(DsqlDmlRequest* req, const dsql_msg* /*message*/, IMessageM
// assign initial default BPB
setDefBpb(FB_NELEM(initBlobParameters), initBlobParameters);
}
if (const auto att = m_dsqlRequest->req_dbb->dbb_attachment)
att->registerBatch(this);
}
DsqlBatch::~DsqlBatch()
{
if (m_batch)
m_batch->resetHandle();
if (m_dsqlRequest)
m_dsqlRequest->req_batch = NULL;
m_dsqlRequest->req_batch = nullptr;
if (const auto att = m_dsqlRequest->req_dbb->dbb_attachment)
att->deregisterBatch(this);
}
Attachment* DsqlBatch::getAttachment() const

10
src/jrd/Attachment.cpp
View File

@ -47,6 +47,7 @@
#include "../jrd/replication/Applier.h"
#include "../jrd/replication/Manager.h"
#include "../dsql/DsqlBatch.h"
#include "../dsql/DsqlStatementCache.h"
#include "../common/classes/fb_string.h"
@ -288,9 +289,6 @@ Jrd::Attachment::~Attachment()
delete att_trace_manager;
for (unsigned n = 0; n < att_batches.getCount(); ++n)
att_batches[n]->resetHandle();
for (Function** iter = att_functions.begin(); iter < att_functions.end(); ++iter)
{
Function* const function = *iter;
@ -449,6 +447,12 @@ void Jrd::Attachment::storeBinaryBlob(thread_db* tdbb, jrd_tra* transaction,
blob->BLB_close(tdbb);
}
void Jrd::Attachment::releaseBatches()
{
while (att_batches.hasData())
delete att_batches.pop();
}
void Jrd::Attachment::releaseGTTs(thread_db* tdbb)
{
if (!att_relations)

7
src/jrd/Attachment.h
View File

@ -734,6 +734,7 @@ public:
void storeBinaryBlob(thread_db* tdbb, jrd_tra* transaction, bid* blobId,
const Firebird::ByteChunk& chunk);
void releaseBatches();
void releaseGTTs(thread_db* tdbb);
void resetSession(thread_db* tdbb, jrd_tra** traHandle);
@ -796,12 +797,12 @@ public:
}
// batches control
void registerBatch(JBatch* b)
void registerBatch(DsqlBatch* b)
{
att_batches.add(b);
}
void deregisterBatch(JBatch* b)
void deregisterBatch(DsqlBatch* b)
{
att_batches.findAndRemove(b);
}
@ -864,7 +865,7 @@ private:
unsigned int att_stmt_timeout; // milliseconds
Firebird::RefPtr<Firebird::TimerImpl> att_idle_timer;
Firebird::Array<JBatch*> att_batches;
Firebird::Array<DsqlBatch*> att_batches;
InitialOptions att_initial_options; // Initial session options
DebugOptions att_debug_options;
Firebird::AutoPtr<ProfilerManager> att_profiler_manager; // ProfilerManager

6
src/jrd/jrd.cpp
View File

@ -6070,7 +6070,6 @@ JBatch* JStatement::createBatch(Firebird::CheckStatusWrapper* status, Firebird::
batch = FB_NEW JBatch(dsqlBatch, this, inMetadata);
batch->addRef();
dsqlBatch->setInterfacePtr(batch);
tdbb->getAttachment()->registerBatch(batch);
}
catch (const Exception& ex)
{
@ -6146,9 +6145,6 @@ void JBatch::freeEngineData(Firebird::CheckStatusWrapper* user_status)
try
{
Attachment* att = getAttachment()->getHandle();
if (att)
att->deregisterBatch(this);
delete batch;
batch = nullptr;
}
@ -7726,6 +7722,8 @@ void release_attachment(thread_db* tdbb, Jrd::Attachment* attachment, XThreadEns
if (attachment->att_event_session)
dbb->eventManager()->deleteSession(attachment->att_event_session);
attachment->releaseBatches();
// CMP_release() changes att_requests.
while (attachment->att_requests.hasData())
CMP_release(tdbb, attachment->att_requests.back());