Fix performance issues with Wildcard resolver

Due to an extremely inefficient algorithm, the usage of wildcard was nearly impractical (14min to generate 4K objects) versus 1min30 now.
sddxyg · Nov 12, 2016 · 7843c89 · 7843c89
1 parent 19f06ac
commit 7843c89
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 20 deletions.
diff --git a/src/FixtureBag.php b/src/FixtureBag.php
@@ -99,6 +99,11 @@ public function get(string $id): FixtureInterface
      */
     public function getIterator()
     {
-        return new \ArrayIterator(array_values($this->fixtures));
+        return new \ArrayIterator($this->fixtures);
+    }
+
+    public function toArray(): array
+    {
+        return $this->fixtures;
     }
 }
diff --git a/src/Generator/Resolver/Value/Chainable/FixtureWildcardReferenceResolver.php b/src/Generator/Resolver/Value/Chainable/FixtureWildcardReferenceResolver.php
@@ -38,6 +38,8 @@ final class FixtureWildcardReferenceResolver implements ChainableValueResolverIn
      */
     private $resolver;
 
+    private $idsByPattern = [];
+
     public function __construct(ValueResolverInterface $resolver = null)
     {
         $this->resolver = $resolver;
@@ -108,26 +110,25 @@ public function resolve(
      */
     private function getSuitableIds(FixtureMatchReferenceValue $value, ResolvedFixtureSet $fixtureSet): array
     {
-        $ids = [];
-
-        $fixtures = $fixtureSet->getFixtures();
-        foreach ($fixtures as $fixture) {
-            /** @var FixtureInterface $fixture */
-            $id = $fixture->getId();
-            if ($value->match($id)) {
-                $ids[$id] = true;
-            }
+        if (array_key_exists($pattern = $value->getValue(), $this->idsByPattern)) {
+            return $this->idsByPattern[$pattern];
         }
 
-        $objects = $fixtureSet->getObjects();
-        foreach ($objects as $object) {
-            /** @var ObjectInterface $object */
-            $id = $object->getId();
-            if ($value->match($id)) {
-                $ids[$id] = true;
-            }
-        }
+        $fixtureKeys = array_flip(
+            preg_grep(
+                $pattern,
+                array_keys($fixtureSet->getFixtures()->toArray())
+            )
+        );
+        $objectKeys = array_flip(
+            preg_grep(
+                $pattern,
+                array_keys($fixtureSet->getObjects()->toArray())
+            )
+        );
+
+        $this->idsByPattern[$pattern] = array_keys($fixtureKeys + $objectKeys);
 
-        return array_keys($ids);
+        return $this->idsByPattern[$pattern];
     }
 }
diff --git a/tests/FixtureBagTest.php b/tests/FixtureBagTest.php
@@ -173,7 +173,26 @@ public function testIsIterable()
             $fixtures[$key] = $value;
         }
 
-        $this->assertSame($fixtures, array_values($this->propRefl->getValue($bag)));
+        $this->assertSame($fixtures, $this->propRefl->getValue($bag));
+    }
+
+    public function testToArray()
+    {
+        $fixture1 = new DummyFixture('foo');
+        $fixture2 = new DummyFixture('bar');
+
+        $bag = (new FixtureBag())
+            ->with($fixture1)
+            ->with($fixture2)
+        ;
+
+        $this->assertEquals(
+            [
+                'foo' => $fixture1,
+                'bar' => $fixture2,
+            ],
+            $bag->toArray()
+        );
     }
 
     private function assertSameFixtures(array $expected, FixtureBag $actual)