Merge pull request #10840 from creative-commoners/pulls/5/eager-optimise

ENH Cache $item->ID for eager loading
silverstripe · Jun 28, 2023 · 87d82ee · 87d82ee
2 parents 0c40cc9 + ed07303
commit 87d82ee
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/ORM/DataList.php b/src/ORM/DataList.php
@@ -928,14 +928,16 @@ public function createDataObject($row)
 
     private function setDataObjectEagerLoadedData(DataObject $item): void
     {
+        // cache $item->ID at the top of this method to reduce calls to ViewableData::__get()
+        $itemID = $item->ID;
         foreach (array_keys($this->eagerLoadedData) as $eagerLoadRelation) {
             list($dataClasses, $relations) = $this->getEagerLoadVariables($eagerLoadRelation);
             $dataClass = $dataClasses[count($dataClasses) - 2];
             $relation = $relations[count($relations) - 1];
             foreach (array_keys($this->eagerLoadedData[$eagerLoadRelation]) as $eagerLoadID) {
                 $eagerLoadedData = $this->eagerLoadedData[$eagerLoadRelation][$eagerLoadID][$relation];
                 if ($dataClass === $dataClasses[0]) {
-                    if ($eagerLoadID === $item->ID) {
+                    if ($eagerLoadID === $itemID) {
                         $item->setEagerLoadedData($relation, $eagerLoadedData);
                     }
                 } elseif ($dataClass === $dataClasses[1]) {