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

Fix #7625 - Issue with "ALTER SESSION RESET" and implicit cursor close.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2023-06-30 22:28:16 -03:00
parent d839d637ae
commit 8a74600f8a
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dsql/StmtNodes.cpp
View File

@ -8965,11 +8965,11 @@ void SetTransactionNode::genTableLock(DsqlCompilerScratch* dsqlScratch,
//--------------------
void SessionResetNode::execute(thread_db* tdbb, DsqlRequest* request, jrd_tra** traHandle) const
void SessionResetNode::execute(thread_db* tdbb, DsqlRequest* request, jrd_tra**) const
{
SET_TDBB(tdbb);
Attachment* const attachment = tdbb->getAttachment();
attachment->resetSession(tdbb, traHandle);
const auto attachment = tdbb->getAttachment();
attachment->scheduleResetSession();
}

7
src/jrd/Attachment.cpp
View File

@ -505,6 +505,11 @@ static void runDBTriggers(thread_db* tdbb, TriggerAction action)
}
}
void Jrd::Attachment::scheduleResetSession()
{
att_flags |= ATT_reset_scheduled;
}
void Jrd::Attachment::resetSession(thread_db* tdbb, jrd_tra** traHandle)
{
jrd_tra* oldTran = traHandle ? *traHandle : nullptr;
@ -578,6 +583,8 @@ void Jrd::Attachment::resetSession(thread_db* tdbb, jrd_tra** traHandle)
// reset GTT's
releaseGTTs(tdbb);
att_flags &= ~ATT_reset_scheduled;
// Run ON CONNECT trigger after reset
if (!(att_flags & ATT_no_db_triggers))
runDBTriggers(tdbb, TRIGGER_CONNECT);

4
src/jrd/Attachment.h
View File

@ -167,7 +167,8 @@ const ULONG ATT_monitor_init = 0x100000L; // Attachment is registered in monito
const ULONG ATT_repl_reset = 0x200000L; // Replication set has been reset
const ULONG ATT_replicating = 0x400000L; // Replication is active
const ULONG ATT_resetting = 0x800000L; // Session reset is in progress
const ULONG ATT_worker = 0x1000000L; // Worker attachment, managed by the engine
const ULONG ATT_reset_scheduled = 0x1000000L; // Session reset scheduled
const ULONG ATT_worker = 0x2000000L; // Worker attachment, managed by the engine
const ULONG ATT_NO_CLEANUP = (ATT_no_cleanup | ATT_notify_gc);
@ -726,6 +727,7 @@ public:
const Firebird::ByteChunk& chunk);
void releaseGTTs(thread_db* tdbb);
void scheduleResetSession();
void resetSession(thread_db* tdbb, jrd_tra** traHandle);
void signalCancel();

12
src/jrd/jrd.cpp
View File

@ -855,6 +855,18 @@ EngineContextHolder::EngineContextHolder(CheckStatusWrapper* status, I* interfac
validateHandle(*this, interfacePtr->getHandle());
}
EngineContextHolder::~EngineContextHolder()
{
thread_db* const tdbb = *this;
const auto attachment = tdbb->getAttachment();
if (attachment && attachment->att_use_count == 1 && (attachment->att_flags & ATT_reset_scheduled))
{
auto transaction = tdbb->getTransaction();
attachment->resetSession(tdbb, &transaction);
}
}
// Used in ProfilerManager.cpp
template EngineContextHolder::EngineContextHolder(
CheckStatusWrapper* status, JAttachment* interfacePtr, const char* from, unsigned lockFlags);

1
src/jrd/jrd.h
View File

@ -1069,6 +1069,7 @@ namespace Jrd {
template <typename I>
EngineContextHolder(Firebird::CheckStatusWrapper* status, I* interfacePtr, const char* from,
unsigned lockFlags = 0);
~EngineContextHolder();
};
class AstLockHolder : public Firebird::ReadLockGuard