Merge pull request #35 from dachcom-digital/backports

Use generators to index data
dachcom-digital · Oct 23, 2023 · 514596e · 514596e
2 parents 44c804b + 722f181
commit 514596e
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 19 deletions.
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -1,9 +1,9 @@
 name: Codeception
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
 
 jobs:
     codeception:

diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
@@ -1,9 +1,9 @@
 name: Easy Coding Standards
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
 
 jobs:
     ecs:

diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
@@ -1,9 +1,9 @@
 name: PHP Stan
 on:
     push:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
     pull_request:
-        branches: [ 'master' ]
+        branches: [ '2.x' ]
 
 jobs:
     stan:

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,8 @@
 # Upgrade Notes
 
+## 2.0.3
+- [BACKPORT][IMPROVEMENT] Use Generator to index data which will increase processing speed significant
+
 ## 2.0.2
 - [BUGFIX] `object_relations_getter_extractor` respect arguments (#23)
 - [FEATURE] `object_getter_extractor` more flexibility (#24)

diff --git a/src/DsTrinityDataBundle/Service/Builder/AssetListBuilder.php b/src/DsTrinityDataBundle/Service/Builder/AssetListBuilder.php
@@ -20,11 +20,15 @@ public function __construct(Connection $db, EventDispatcherInterface $eventDispa
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    public function buildByList(array $options): array
+    public function buildByList(array $options): \Generator
     {
         $list = $this->getList($options);
 
-        return $list->getAssets();
+        foreach ($list->loadIdList() as $id) {
+            if ($asset = Asset::getById($id)) {
+                yield $asset;
+            }
+        }
     }
 
     public function buildByIdList(int $id, array $options): ?ElementInterface

diff --git a/src/DsTrinityDataBundle/Service/Builder/DataBuilderInterface.php b/src/DsTrinityDataBundle/Service/Builder/DataBuilderInterface.php
@@ -6,7 +6,7 @@
 
 interface DataBuilderInterface
 {
-    public function buildByList(array $options): array;
+    public function buildByList(array $options): \Generator;
 
     public function buildByIdList(int $id, array $options): ?ElementInterface;
 

diff --git a/src/DsTrinityDataBundle/Service/Builder/DocumentListBuilder.php b/src/DsTrinityDataBundle/Service/Builder/DocumentListBuilder.php
@@ -20,11 +20,15 @@ public function __construct(Connection $db, EventDispatcherInterface $eventDispa
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    public function buildByList(array $options): array
+    public function buildByList(array $options): \Generator
     {
         $list = $this->getList($options);
 
-        return $list->getDocuments();
+        foreach ($list->loadIdList() as $id) {
+            if ($doc = Document::getById($id)) {
+                yield $doc;
+            }
+        }
     }
 
     public function buildByIdList(int $id, array $options): ?ElementInterface

diff --git a/src/DsTrinityDataBundle/Service/Builder/ObjectListBuilder.php b/src/DsTrinityDataBundle/Service/Builder/ObjectListBuilder.php
@@ -20,11 +20,15 @@ public function __construct(Connection $db, EventDispatcherInterface $eventDispa
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    public function buildByList(array $options): array
+    public function buildByList(array $options): \Generator
     {
         $list = $this->getList($options);
 
-        return $list->getObjects();
+        foreach ($list->loadIdList() as $id) {
+            if ($object = DataObject::getById($id)) {
+                yield $object;
+            }
+        }
     }
 
     public function buildByIdList(int $id, array $options): ?ElementInterface

diff --git a/src/DsTrinityDataBundle/Service/DataProviderService.php b/src/DsTrinityDataBundle/Service/DataProviderService.php
@@ -142,24 +142,31 @@ protected function fetchByTypeAndId(string $type, string $providerBehaviour, int
 
         $element = $builder->buildById($id);
 
-        $this->dispatchData([$element], $providerBehaviour, $resourceMeta);
+        if ($element instanceof ElementInterface) {
+            $this->dispatchElement($element, $providerBehaviour, $resourceMeta);
+        }
     }
 
     protected function log(string $level, string $message): void
     {
         $this->logger->log($level, $message, DsTrinityDataBundle::PROVIDER_NAME, $this->contextName);
     }
 
-    protected function dispatchData(array $elements, string $providerBehaviour, ?ResourceMetaInterface $resourceMeta = null): void
+    protected function dispatchData(\Generator $elements, string $providerBehaviour, ?ResourceMetaInterface $resourceMeta = null): void
     {
         foreach ($elements as $element) {
-            $newDataEvent = new NewDataEvent($this->contextDispatchType, $this->contextName, $element, $providerBehaviour, $resourceMeta);
-            $this->eventDispatcher->dispatch($newDataEvent, DynamicSearchEvents::NEW_DATA_AVAILABLE);
-
-            $this->dispatchProcessControlSignal();
+            $this->dispatchElement($element, $providerBehaviour, $resourceMeta);
         }
     }
 
+    protected function dispatchElement(ElementInterface $element, string $providerBehaviour, ?ResourceMetaInterface $resourceMeta = null): void
+    {
+        $newDataEvent = new NewDataEvent($this->contextDispatchType, $this->contextName, $element, $providerBehaviour, $resourceMeta);
+        $this->eventDispatcher->dispatch($newDataEvent, DynamicSearchEvents::NEW_DATA_AVAILABLE);
+
+        $this->dispatchProcessControlSignal();
+    }
+
     protected function addSignalListener(): void
     {
         if (php_sapi_name() !== 'cli') {