Skip to content

Package Constant: Check missing dsc_address instead of dsc_dtype and restore impure after using existing request #9065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Noremos wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −2
Open

Package Constant: Check missing dsc_address instead of dsc_dtype and restore impure after using existing request #9065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions src/jrd/Package.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@ dsc* ConstantValue::makeValue(thread_db* tdbb, Request* request)
{
{
ReadLockGuard guard(m_makeValueLock, FB_FUNCTION);
if (m_value.vlu_desc.dsc_dtype != dtype_unknown)
if (m_value.vlu_desc.dsc_address != nullptr)
return &m_value.vlu_desc;
}

WriteLockGuard guard(m_makeValueLock, FB_FUNCTION);
if (m_value.vlu_desc.dsc_dtype != dtype_unknown) // Extra check in case of two callers waiting
if (m_value.vlu_desc.dsc_address != nullptr) // Extra check in case of two callers waiting
return &m_value.vlu_desc;

Attachment* attachment = tdbb->getAttachment();
Expand All @@ -196,6 +196,8 @@ dsc* ConstantValue::makeValue(thread_db* tdbb, Request* request)

MET_parse_blob(tdbb, &name.schema, nullptr, &constantBid, &csb, nullptr, false, false);
fb_assert(csb->csb_node != nullptr);
csb->csb_node->pass1(tdbb, csb);
csb->csb_node->pass2(tdbb, csb);

if (request == nullptr)
{
Expand All @@ -216,7 +218,27 @@ dsc* ConstantValue::makeValue(thread_db* tdbb, Request* request)
executeCsbNode(tdbb, csb);
}
else
{
// A csb->csb_node will use impureArea from the incoming request
// but it contains other data
// Backup the current data and restore it later

// Reusing a small chunk is faster instead of makeing a new request
// And using existing space for a temporally value is better instead of adding this to request->impureArea
// and carrying it for whole request live

const auto nodeImpureSize = csb->csb_impure;
if (request->impureArea.getCount() < nodeImpureSize)
request->impureArea.grow(nodeImpureSize - request->impureArea.getCount());

const Array<UCHAR> backup(request->impureArea.begin(), nodeImpureSize);

fb_assert(tdbb->getRequest() == request);
executeCsbNode(tdbb, csb);

// Restore
memcpy(request->impureArea.begin(), backup.begin(), nodeImpureSize);
}
}
catch (const Exception& ex)
{
Expand Down
1 change: 1 addition & 0 deletions src/jrd/Package.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class ConstantValue final : public Firebird::PermanentStorage
delete m_value.vlu_string;
m_value = {};
m_value.vlu_desc = typeDesc;
m_value.vlu_desc.dsc_address = nullptr; // Make sure to call makeValue
}

void updateValue(const bid blobId)
Expand Down
Loading