tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-05 02:49:27 +02:00
Code Issues Projects Releases Wiki Activity

FIX: pre-cache loop content within SSViewer.

Browse Source 
SSViewer iterates on Iterators that it receives twice: first to get the
total number of items, then to actually render each item.

This necessitates a rewind. In order to make more use of generators,
which are not rewindable, I’d like to remove the need for a rewind.

I’ve done this by caching the content of the iterator as an array
within SSViewer_Scope.

Although this means a bit of memory usage, there are no cases in which
code will get to this point without iterating on all items, which would
use the memory anyway. It would only create onerous impacts in cases
where you are iterating on very long iterators, which would mean you’re
rendering a very large page anyway, and probably have other performance
issues.
This commit is contained in:
Sam Minnee 2017-01-18 09:24:12 +13:00 committed by Guy Sartorelli
parent 1b8f601023
commit 6ef5785fc5
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/View/SSViewer_Scope.php
View File

@ -289,14 +289,20 @@ class SSViewer_Scope
}
if (!$this->itemIterator) {
// Turn the iterator into an array. This lets us get the count and iterate on it, even if it's a generator.
if (is_array($this->item)) {
$this->itemIterator = new ArrayIterator($this->item);
$arrayVersion = $this->item;
} else {
$this->itemIterator = $this->item->getIterator();
$arrayVersion = [];
foreach ($this->item as $record) {
$arrayVersion[] = $record;
}
}
$this->itemIterator = new ArrayIterator($arrayVersion);
$this->itemStack[$this->localIndex][SSViewer_Scope::ITEM_ITERATOR] = $this->itemIterator;
$this->itemIteratorTotal = iterator_count($this->itemIterator); // Count the total number of items
$this->itemIteratorTotal = count($arrayVersion); // Count the total number of items
$this->itemStack[$this->localIndex][SSViewer_Scope::ITEM_ITERATOR_TOTAL] = $this->itemIteratorTotal;
$this->itemIterator->rewind();
} else {