[6.x] Speed up Stache warming for large structured collections

Author: o1y

src/Entries/Entry.php

@@ -561,10 +561,7 @@ public function order()
             return $this->value('order');
         }
 
-        return $this->structure()->in($this->locale())
-            ->flattenedPages()
-            ->map->reference()
-            ->flip()->get($this->id) + 1;
+        return $this->structure()->in($this->locale())->entryOrder($this->id) + 1;
     }
 
     public function template($template = null)

src/Structures/CollectionStructure.php

@@ -27,22 +27,13 @@ public function collection()
         });
     }
 
-    private function flattenedPages($entry)
-    {
-        return Blink::once('collection-structure-flattened-pages-collection'.$this->handle().'-'.$entry->locale(), function () use ($entry) {
-            return $this->in($entry->locale())->flattenedPages();
-        });
-    }
-
     public function entryUri($entry)
     {
         if (! $this->route($entry->locale())) {
             return null;
         }
 
-        $page = $this->flattenedPages($entry)
-            ->keyBy->reference()
-            ->get($entry->id());
+        $page = $this->in($entry->locale())->findByEntry($entry->id());
 
         $page?->setEntry($entry);
 

src/Structures/Pages.php

@@ -92,7 +92,10 @@ public function flattenedPages()
 
         foreach ($this->all() as $page) {
             $flattened->push($page);
-            $flattened = $flattened->merge($page->flattenedPages());
+
+            foreach ($page->flattenedPages() as $descendant) {
+                $flattened->push($descendant);
+            }
         }
 
         return $flattened;

src/Structures/Tree.php

@@ -22,6 +22,9 @@ abstract class Tree implements ContainsQueryableValues, Contract, Localization
     protected $locale;
     protected $tree = [];
     protected $cachedFlattenedPages;
+    protected $cachedFlattenedPagesById;
+    protected $cachedFlattenedPagesByReference;
+    protected $cachedFlattenedPageOrder;
     protected $withEntries = false;
     protected $uriCacheEnabled = true;
 
@@ -143,17 +146,17 @@ public function uriCacheEnabled()
 
     public function find($id): ?Page
     {
-        return $this->flattenedPages()
-            ->keyBy->id()
-            ->get($id);
+        return ($this->cachedFlattenedPagesById ??= $this->flattenedPages()->keyBy->id())->get($id);
     }
 
     public function findByEntry($id)
     {
-        return $this->flattenedPages()
-            ->filter->reference()
-            ->keyBy->reference()
-            ->get($id);
+        return ($this->cachedFlattenedPagesByReference ??= $this->flattenedPages()->filter->reference()->keyBy->reference())->get($id);
+    }
+
+    public function entryOrder($reference)
+    {
+        return ($this->cachedFlattenedPageOrder ??= $this->flattenedPages()->map->reference()->flip())->get($reference);
     }
 
     public function save()
@@ -163,8 +166,10 @@ public function save()
         }
 
         $this->cachedFlattenedPages = null;
+        $this->cachedFlattenedPagesById = null;
+        $this->cachedFlattenedPagesByReference = null;
+        $this->cachedFlattenedPageOrder = null;
 
-        Blink::forget('collection-structure-flattened-pages-collection*');
         Blink::forget('collection-structure-tree*');
 
         $this->repository()->save($this);

tests/Data/Structures/CollectionStructureTest.php

@@ -174,14 +174,13 @@ public function it_gets_an_entry_uri()
         $this->collection->shouldReceive('route')->with('en')->once()->andReturn('{slug}');
 
         $page = $this->mock(Page::class);
-        $page->shouldReceive('reference')->andReturn('the-entry-id');
         $page->shouldReceive('setEntry')->once()->andReturnSelf();
         $page->shouldReceive('uri')->andReturn('/the-uri-from-the-page');
 
         $tree = $this->mock(Tree::class);
         $tree->shouldReceive('structure')->andReturn($structure);
         $tree->shouldReceive('locale')->andReturn('en');
-        $tree->shouldReceive('flattenedPages')->andReturn(collect([$page]));
+        $tree->shouldReceive('findByEntry')->with('the-entry-id')->andReturn($page);
 
         CollectionTreeRepository::shouldReceive('find')->with('test', 'en')->andReturn($tree);