Memory usage optimization

kirill533 · Aug 10, 2019 · 99caf30 · 99caf30
1 parent 02920ec
commit 99caf30
Show file tree

Hide file tree

Showing 10 changed files with 179 additions and 14 deletions.
diff --git a/src/POData/BaseService.php b/src/POData/BaseService.php
@@ -452,6 +452,7 @@ protected function serializeResult(RequestDescription $request, IUriProcessor $u
                     }
                 } else {
                     $odataModelInstance = $objectModelSerializer->writeTopLevelElements($entryObjects);
+                    unset($entryObjects);
                     if (!$odataModelInstance instanceof ODataFeed) {
                         throw new InvalidOperationException('!$odataModelInstance instanceof ODataFeed');
                     }

diff --git a/src/POData/ObjectModel/ArrayEntryProvider.php b/src/POData/ObjectModel/ArrayEntryProvider.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace POData\ObjectModel;
+
+class ArrayEntryProvider implements EntryProviderInterface
+{
+    protected $entries;
+    /**
+     * EntryProvider constructor.
+     * @param EntryProviderInterface $provider
+     */
+    function __construct(array &$entries)
+    {
+        $this->entries = $entries;
+    }
+
+    function getNextEntry()
+    {
+        return array_shift($this->entries);
+    }
+}
diff --git a/src/POData/ObjectModel/CynicSerialiser.php b/src/POData/ObjectModel/CynicSerialiser.php
@@ -258,7 +258,7 @@ public function writeTopLevelElement(QueryResult $entryObject)
      */
     public function writeTopLevelElements(QueryResult &$entryObjects)
     {
-        $res = $entryObjects->results;
+        $res = &$entryObjects->results;
         if (!(is_array($res) || $res instanceof Collection)) {
             throw new InvalidOperationException('!is_array($entryObjects->results)');
         }
@@ -293,16 +293,24 @@ public function writeTopLevelElements(QueryResult &$entryObjects)
         if ($this->getRequest()->queryType == QueryType::ENTITIES_WITH_COUNT()) {
             $odata->rowCount = $this->getRequest()->getCountValue();
         }
-        foreach ($res as $entry) {
-            if (!$entry instanceof QueryResult) {
-                $query = new QueryResult();
-                $query->results = $entry;
-            } else {
-                $query = $entry;
-            }
-            $odata->entries[] = $this->writeTopLevelElement($query);
+
+        if ($entryObjects->hasEntryProvider()) {
+            $entryProvider = $entryObjects;
+        } else {
+            $entryProvider = new ArrayEntryProvider($entryObjects->results);
         }
 
+        $odata->setEntryProvider(new ODataEntryProvider($entryProvider, $this));
+//        while ($entry = $entryProvider->getNextEntry()) {
+//            if (!$entry instanceof QueryResult) {
+//                $query = new QueryResult();
+//                $query->results = $entry;
+//            } else {
+//                $query = $entry;
+//            }
+//            $odata->entries[] = $this->writeTopLevelElement($query);
+//        }
+
         $resourceSet = $this->getRequest()->getTargetResourceSetWrapper()->getResourceSet();
         $requestTop = $this->getRequest()->getTopOptionCount();
         $pageSize = $this->getService()->getConfiguration()->getEntitySetPageSize($resourceSet);

diff --git a/src/POData/ObjectModel/EntryProvider.php b/src/POData/ObjectModel/EntryProvider.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace POData\ObjectModel;
+
+class EntryProvider implements EntryProviderInterface
+{
+    protected $provider;
+    /**
+     * EntryProvider constructor.
+     * @param EntryProviderInterface $provider
+     */
+    function __construct(EntryProviderInterface $provider)
+    {
+        $this->setEntryProvider($provider);
+    }
+
+    function setEntryProvider($provider)
+    {
+        $this->provider = $provider;
+    }
+
+    function getNextEntry()
+    {
+        return $this->provider->getNextEntry();
+    }
+}
diff --git a/src/POData/ObjectModel/EntryProviderInterface.php b/src/POData/ObjectModel/EntryProviderInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace POData\ObjectModel;
+
+interface EntryProviderInterface
+{
+    function getNextEntry();
+}
diff --git a/src/POData/ObjectModel/ODataEntryProvider.php b/src/POData/ObjectModel/ODataEntryProvider.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace POData\ObjectModel;
+
+use POData\Providers\Query\QueryResult;
+
+class ODataEntryProvider implements EntryProviderInterface
+{
+    protected $provider;
+    protected $serializer;
+    /**
+     * EntryProvider constructor.
+     * @param EntryProviderInterface $provider
+     */
+    function __construct(EntryProviderInterface $provider, $serializer)
+    {
+        $this->setEntryProvider($provider);
+        $this->serializer = $serializer;
+    }
+
+    function setEntryProvider($provider)
+    {
+        $this->provider = $provider;
+    }
+
+    function getNextEntry()
+    {
+        $entry = $this->provider->getNextEntry();
+
+        if (!$entry instanceof QueryResult) {
+            $query = new QueryResult();
+            $query->results = $entry;
+        } else {
+            $query = $entry;
+        }
+
+        return $this->serializer->writeTopLevelElement($query);
+    }
+}
diff --git a/src/POData/ObjectModel/ODataFeed.php b/src/POData/ObjectModel/ODataFeed.php
@@ -5,7 +5,7 @@
 /**
  * Class ODataFeed.
  */
-class ODataFeed
+class ODataFeed implements EntryProviderInterface
 {
     /**
      * Feed iD.
@@ -44,6 +44,11 @@ class ODataFeed
      */
     public $entries = [];
 
+    /**
+     * @var EntryProviderInterface
+     */
+    protected $entryProvider;
+
     /**
      * Last updated timestamp.
      *
@@ -93,4 +98,22 @@ public function setEntries(array $entries)
     {
         $this->entries = $entries;
     }
+
+    public function hasEntryProvider()
+    {
+        return $this->entryProvider !== null;
+    }
+
+    public function getNextEntry()
+    {
+        if (isset($this->entryProvider)) {
+            return $this->entryProvider->getNextEntry();
+        }
+        return null;
+    }
+
+    public function setEntryProvider(EntryProviderInterface $provider)
+    {
+        $this->entryProvider = $provider;
+    }
 }
diff --git a/src/POData/Providers/Query/QueryResult.php b/src/POData/Providers/Query/QueryResult.php
@@ -2,13 +2,20 @@
 
 namespace POData\Providers\Query;
 
-class QueryResult
+use \POData\ObjectModel\EntryProviderInterface;
+
+class QueryResult implements EntryProviderInterface
 {
     /**
      * @var object[]|object|null
      */
     public $results;
 
+    /**
+     * @var EntryProviderInterface
+     */
+    protected $entryProvider;
+
     /***
      * @var int|null
      */
@@ -50,4 +57,22 @@ public static function adjustCountForPaging($count, $top, $skip)
 
         return intval(min($count, $top)); //count is top, unless there aren't enough records
     }
-}
+
+    public function hasEntryProvider()
+    {
+        return $this->entryProvider !== null;
+    }
+
+    public function getNextEntry()
+    {
+        if (isset($this->entryProvider)) {
+            return $this->entryProvider->getNextEntry();
+        }
+        return null;
+    }
+
+    public function setEntryProvider(EntryProviderInterface $provider)
+    {
+        $this->entryProvider = $provider;
+    }
+}
diff --git a/src/POData/Writers/Atom/AtomODataWriter.php b/src/POData/Writers/Atom/AtomODataWriter.php
@@ -212,7 +212,13 @@ protected function writeFeed(ODataFeed $feed, $isTopLevel = false)
             $this->xmlWriter->endElement();
         }
 
-        foreach ($feed->entries as $entry) {
+        if ($feed->hasEntryProvider()) {
+            $entryProvider = $feed;
+        } else {
+            $entryProvider = new \POData\ObjectModel\ArrayEntryProvider($feed->entries);
+        }
+
+        while ($entry = $entryProvider->getNextEntry()) {
             $this->writeEntry($entry);
         }
 

diff --git a/src/POData/Writers/Json/JsonODataV1Writer.php b/src/POData/Writers/Json/JsonODataV1Writer.php
@@ -6,6 +6,7 @@
 use POData\Common\ODataConstants;
 use POData\Common\ODataException;
 use POData\Common\Version;
+use POData\ObjectModel\ArrayEntryProvider;
 use POData\ObjectModel\ODataBagContent;
 use POData\ObjectModel\ODataCategory;
 use POData\ObjectModel\ODataEntry;
@@ -135,7 +136,14 @@ public function writeUrlCollection(ODataURLCollection $urls)
      */
     protected function writeFeed(ODataFeed $feed)
     {
-        foreach ($feed->entries as $entry) {
+
+        if ($feed->hasEntryProvider()) {
+            $entryProvider = $feed;
+        } else {
+            $entryProvider = new ArrayEntryProvider($feed->entries);
+        }
+
+        while ($entry = $entryProvider->getNextEntry()) {
             $this->writer->startObjectScope();
             $this->writeEntry($entry);
             $this->writer->endScope();