tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
ENH Cache $item->ID for eager loading
This commit is contained in:
Guy Sartorelli 2023-06-28 15:07:49 +12:00 committed by GitHub
commit 87d82ee0ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ORM/DataList.php
View File

@ -928,6 +928,8 @@ class DataList extends ViewableData implements SS_List, Filterable, Sortable, Li
private function setDataObjectEagerLoadedData(DataObject $item): void 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) { foreach (array_keys($this->eagerLoadedData) as $eagerLoadRelation) {
list($dataClasses, $relations) = $this->getEagerLoadVariables($eagerLoadRelation); list($dataClasses, $relations) = $this->getEagerLoadVariables($eagerLoadRelation);
$dataClass = $dataClasses[count($dataClasses) - 2]; $dataClass = $dataClasses[count($dataClasses) - 2];
@ -935,7 +937,7 @@ class DataList extends ViewableData implements SS_List, Filterable, Sortable, Li
foreach (array_keys($this->eagerLoadedData[$eagerLoadRelation]) as $eagerLoadID) { foreach (array_keys($this->eagerLoadedData[$eagerLoadRelation]) as $eagerLoadID) {
$eagerLoadedData = $this->eagerLoadedData[$eagerLoadRelation][$eagerLoadID][$relation]; $eagerLoadedData = $this->eagerLoadedData[$eagerLoadRelation][$eagerLoadID][$relation];
if ($dataClass === $dataClasses[0]) { if ($dataClass === $dataClasses[0]) {
if ($eagerLoadID === $item->ID) { if ($eagerLoadID === $itemID) {
$item->setEagerLoadedData($relation, $eagerLoadedData); $item->setEagerLoadedData($relation, $eagerLoadedData);
} }
} elseif ($dataClass === $dataClasses[1]) { } elseif ($dataClass === $dataClasses[1]) {