From 323cdd144123c17a0cb0192d6fcc05e659665b00 Mon Sep 17 00:00:00 2001
From: Dave Woestenborghs <dave.woestenborghs@gmail.com>
Date: Thu, 22 Oct 2020 08:12:03 +0200
Subject: [PATCH] Optimized so valuesets are build once instead of per index

---
 src/Umbraco.Examine/ContentIndexPopulator.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Examine/ContentIndexPopulator.cs b/src/Umbraco.Examine/ContentIndexPopulator.cs
index 01a7046723..837c230313 100644
--- a/src/Umbraco.Examine/ContentIndexPopulator.cs
+++ b/src/Umbraco.Examine/ContentIndexPopulator.cs
@@ -98,9 +98,13 @@ namespace Umbraco.Examine
 
                 if (content.Length > 0)
                 {
+                    var valueSets = _contentValueSetBuilder.GetValueSets(content).ToList();
+
                     // ReSharper disable once PossibleMultipleEnumeration
                     foreach (var index in indexes)
-                        index.IndexItems(_contentValueSetBuilder.GetValueSets(content));
+                    {
+                        index.IndexItems(valueSets);
+                    }
                 }
 
                 pageIndex++;
@@ -145,9 +149,11 @@ namespace Umbraco.Examine
                         }
                     }
 
+                    var valueSets = _contentValueSetBuilder.GetValueSets(indexableContent.ToArray()).ToList();
+
                     // ReSharper disable once PossibleMultipleEnumeration
                     foreach (var index in indexes)
-                        index.IndexItems(_contentValueSetBuilder.GetValueSets(indexableContent.ToArray()));
+                        index.IndexItems(valueSets);
                 }
 
                 pageIndex++;