From 430c9ae25f22bf36aaf9dd68c5366e82412dc2aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sat, 15 Jul 2023 15:53:39 +0200 Subject: [PATCH] Optimize TypeRegistry::lookupName() from O(N) to O(1) --- src/Types/TypeRegistry.php | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/Types/TypeRegistry.php b/src/Types/TypeRegistry.php index 762cc3f8672..9b64c6faf9a 100644 --- a/src/Types/TypeRegistry.php +++ b/src/Types/TypeRegistry.php @@ -6,8 +6,7 @@ use Doctrine\DBAL\Exception; -use function array_search; -use function in_array; +use function spl_object_id; /** * The type registry is responsible for holding a map of all known DBAL types. @@ -17,11 +16,14 @@ final class TypeRegistry { /** @var array Map of type names and their corresponding flyweight objects. */ private array $instances; + /** @var array */ + private array $instancesReverseIndex; /** @param array $instances */ public function __construct(array $instances = []) { - $this->instances = []; + $this->instances = []; + $this->instancesReverseIndex = []; foreach ($instances as $name => $type) { $this->register($name, $type); } @@ -34,11 +36,12 @@ public function __construct(array $instances = []) */ public function get(string $name): Type { - if (! isset($this->instances[$name])) { + $type = $this->instances[$name] ?? null; + if ($type === null) { throw Exception::unknownColumnType($name); } - return $this->instances[$name]; + return $type; } /** @@ -80,7 +83,8 @@ public function register(string $name, Type $type): void throw Exception::typeAlreadyRegistered($type); } - $this->instances[$name] = $type; + $this->instances[$name] = $type; + $this->instancesReverseIndex[spl_object_id($type)] = $name; } /** @@ -90,15 +94,18 @@ public function register(string $name, Type $type): void */ public function override(string $name, Type $type): void { - if (! isset($this->instances[$name])) { + $origType = $this->instances[$name] ?? null; + if ($origType === null) { throw Exception::typeNotFound($name); } - if (! in_array($this->findTypeName($type), [$name, null], true)) { + if (($this->findTypeName($type) ?? $name) !== $name) { throw Exception::typeAlreadyRegistered($type); } - $this->instances[$name] = $type; + unset($this->instancesReverseIndex[spl_object_id($origType)]); + $this->instances[$name] = $type; + $this->instancesReverseIndex[spl_object_id($type)] = $name; } /** @@ -115,12 +122,6 @@ public function getMap(): array private function findTypeName(Type $type): ?string { - $name = array_search($type, $this->instances, true); - - if ($name === false) { - return null; - } - - return $name; + return $this->instancesReverseIndex[spl_object_id($type)] ?? null; } }