Skip to content

perf(magicmapper): check the once-per-process table guard before doing work #2326

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
rubenvdlinde merged 1 commit into from
Aug 4, 2026
Merged

perf(magicmapper): check the once-per-process table guard before doing work #2326

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
30 changes: 29 additions & 1 deletion lib/Db/MagicMapper/MagicTableHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,39 @@ public function __construct(
*/
public function ensureTableForRegisterSchema(Register $register, Schema $schema, bool $force=false): bool
{
$tableName = $this->getTableNameForRegisterSchema(register: $register, schema: $schema);
$registerId = $register->getId();
$schemaId = $schema->getId();
$cacheKey = $this->magicMapper->getCacheKey(registerId: $registerId, schemaId: $schemaId);

// Verified once per process, checked FIRST.
//
// Every insert, update and find path in MagicMapper calls this method, so
// it runs once per object operation rather than once per register+schema.
// Importing OpenCatalogi's configuration produced 1,137 calls for 225
// object saves — and each one built a table name, resolved two slugs, and
// wrote an info log before reaching the identical fast path inside
// handleExistingTable() and returning true.
//
// This is that exact predicate, hoisted: same two conditions, same
// meaning, evaluated before the work rather than after it. It does not
// reduce how often callers CALL this method; it makes the redundant calls
// cost two comparisons instead of a log write and an existence check.
//
// Both conditions are load-bearing and neither may be dropped.
// hasRegisterSchemaChanged() compares the stored schema VERSION, so a
// schema updated mid-process (an import bumping a version, then saving
// objects against it) still falls through and re-syncs its columns.
// isTableColumnsVerified() is process-scoped, so a fresh request always
// re-verifies at least once. `force` bypasses both, as before.
if ($force === false
&& MagicMapper::isTableColumnsVerified(cacheKey: $cacheKey) === true
&& $this->magicMapper->hasRegisterSchemaChanged(register: $register, schema: $schema) === false
) {
return true;
}

$tableName = $this->getTableNameForRegisterSchema(register: $register, schema: $schema);

$this->logger->info(
message: '[MagicTableHandler] Creating/updating table for register+schema',
context: [
Expand Down
Loading