Optimize TypeRegistry::lookupName() from O(N) to O(1)

doctrine · Jul 15, 2023 · ccfe3e6 · ccfe3e6
1 parent 7844191
commit ccfe3e6
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/src/Types/TypeRegistry.php b/src/Types/TypeRegistry.php
@@ -6,8 +6,8 @@
 
 use Doctrine\DBAL\Exception;
 
-use function array_search;
-use function in_array;
+use function assert;
+use function spl_object_id;
 
 /**
  * The type registry is responsible for holding a map of all known DBAL types.
@@ -17,11 +17,14 @@ final class TypeRegistry
 {
     /** @var array<string, Type> Map of type names and their corresponding flyweight objects. */
     private array $instances;
+    /** @var array<int, string> */
+    private array $instancesReverseIndex;
 
     /** @param array<string, Type> $instances */
     public function __construct(array $instances = [])
     {
-        $this->instances = [];
+        $this->instances             = [];
+        $this->instancesReverseIndex = [];
         foreach ($instances as $name => $type) {
             $this->register($name, $type);
         }
@@ -34,11 +37,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 +84,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 +95,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,10 +123,9 @@ public function getMap(): array
 
     private function findTypeName(Type $type): ?string
     {
-        $name = array_search($type, $this->instances, true);
-
-        if ($name === false) {
-            return null;
+        $name = $this->instancesReverseIndex[spl_object_id($type)] ?? null;
+        if ($name !== null) {
+            assert($this->instances[$name] === $type);
         }
 
         return $name;