Skip to content

refactor(vio): Initialize schema search path statically in VIO_store() to remove unnecessary memory allocations #8800

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

Merged
merged 5 commits into from
Nov 7, 2025
+23 −2
Merged

refactor(vio): Initialize schema search path statically in VIO_store() to remove unnecessary memory allocations #8800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
88a237e
refactor(init): Add wrapper for static local variables
Nov 6, 2025
023fd6d
refactor(vio): Initialize schema search path statically
Nov 6, 2025
ce8e17d
Revert "refactor(init): Add wrapper for static local variables"
Nov 7, 2025
894956d
refactor(vio): Use GlobalPtr
Nov 7, 2025
61f1321
Refactor after review
Nov 7, 2025
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
18 changes: 18 additions & 0 deletions src/common/classes/init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ class GlobalPtr : private InstanceControl
FB_NEW InstanceControl::InstanceLink<GlobalPtr, P>(this);
}

template <typename TFunc>
requires(std::invocable<TFunc, MemoryPool&>)
GlobalPtr(TFunc initializationFunc)
{
instance = initializationFunc(*getDefaultMemoryPool());
FB_NEW InstanceControl::InstanceLink<GlobalPtr, P>(this);
}

T* operator->() noexcept
{
return instance;
Expand All @@ -160,6 +168,16 @@ class GlobalPtr : private InstanceControl
return instance;
}

T* get() noexcept
{
return instance;
}

const T* get() const noexcept
{
return instance;
}

operator bool() noexcept
{
return instance;
Expand Down
7 changes: 5 additions & 2 deletions src/jrd/vio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4223,7 +4223,10 @@ void VIO_store(thread_db* tdbb, record_param* rpb, jrd_tra* transaction)
}},
};

ObjectsArray<MetaString> schemaSearchPath({SYSTEM_SCHEMA, PUBLIC_SCHEMA});
static const GlobalPtr<ObjectsArray<MetaString>> schemaSearchPath([](MemoryPool& pool)
{
return FB_NEW_POOL(pool) ObjectsArray<MetaString>(pool, {SYSTEM_SCHEMA, PUBLIC_SCHEMA});
});

if (const auto relSchemaFields = schemaFields.find(relation->rel_id); relSchemaFields != schemaFields.end())
{
Expand All @@ -4242,7 +4245,7 @@ void VIO_store(thread_db* tdbb, record_param* rpb, jrd_tra* transaction)
{
MOV_get_metaname(tdbb, &desc, depName.object);

if (MET_qualify_existing_name(tdbb, depName, {dependency->objType}, &schemaSearchPath))
if (MET_qualify_existing_name(tdbb, depName, {dependency->objType}, schemaSearchPath.get()))
schemaName = depName.schema.c_str();
}

Expand Down
Loading