DYN-8331: Lucene performance regression (#15859)

pinzart90 · web-flow · commit 7b1c5ba0dd83 · 2025-02-26T13:27:10.000-05:00
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -1621,7 +1621,7 @@ private void InitializeIncludedNodes()
 
             SearchModel?.Add(symbolSearchElement);
             SearchModel?.Add(outputSearchElement);
-            LuceneUtility.AddNodeTypeToSearchIndexBulk([cnbNode, symbolSearchElement, outputSearchElement], iDoc);
+            LuceneUtility.AddNodeTypeToSearchIndex([cnbNode, symbolSearchElement, outputSearchElement], iDoc);
 
         }
 
@@ -1785,7 +1785,7 @@ private void LoadNodeModels(List<TypeLoadData> nodes, bool isPackageMember)
                     Logger.Log(e);
                 }
             }
-            LuceneUtility.AddNodeTypeToSearchIndexBulk(nodeSearchElements, iDoc);
+            LuceneUtility.AddNodeTypeToSearchIndex(nodeSearchElements, iDoc);
         }
 
         private void InitializePreferences()
@@ -3500,7 +3500,7 @@ internal void AddZeroTouchNodesToSearch(IEnumerable<FunctionGroup> functionGroup
                     }
                 }
             }
-            LuceneUtility.AddNodeTypeToSearchIndexBulk(nodes, iDoc);
+            LuceneUtility.AddNodeTypeToSearchIndex(nodes, iDoc);
         }
 
         /// <summary>
diff --git a/src/DynamoCore/Search/NodeSearchModel.cs b/src/DynamoCore/Search/NodeSearchModel.cs
@@ -11,6 +11,7 @@
 using Dynamo.Utilities;
 using DynamoUtilities;
 using Lucene.Net.Documents;
+using Lucene.Net.Index;
 using Lucene.Net.QueryParsers.Classic;
 using Lucene.Net.Search;
 
@@ -245,10 +246,8 @@ internal IEnumerable<NodeSearchElement> Search(string search, LuceneSearchUtilit
 
             if (luceneSearchUtility != null)
             {
-                if (luceneSearchUtility.Searcher == null)
-                {
-                    throw new Exception("Invalid IndexSearcher found");
-                }
+                luceneSearchUtility.dirReader = luceneSearchUtility.writer != null ? luceneSearchUtility.writer.GetReader(applyAllDeletes: true) : DirectoryReader.Open(luceneSearchUtility.indexDir);
+                luceneSearchUtility.Searcher = new(luceneSearchUtility.dirReader);
 
                 string searchTerm = search.Trim();
                 var candidates = new List<NodeSearchElement>();
diff --git a/src/DynamoCore/Utilities/LuceneSearchUtility.cs b/src/DynamoCore/Utilities/LuceneSearchUtility.cs
@@ -50,7 +50,7 @@ internal class LuceneSearchUtility
         internal Lucene.Net.Store.Directory indexDir;
 
         /// <summary>
-        /// Lucene Index write. Make sure to call InitializeIndexSearcher after every index change.
+        /// Lucene Index write.
         /// </summary>
         internal IndexWriter writer;
 
@@ -190,16 +190,6 @@ internal void CreateLuceneIndexWriter(OpenMode mode = OpenMode.CREATE)
             }
         }
 
-        /// <summary>
-        /// InitializeIndexSearcher initializes the dirReader and Searcher of this class.
-        /// This method should be called after every index change. 
-        /// </summary>
-        private void InitializeIndexSearcher()
-        {
-            dirReader = writer != null ? writer.GetReader(applyAllDeletes: true) : DirectoryReader.Open(indexDir);
-            Searcher = new(dirReader);
-        }
-
         /// <summary>
         /// Initialize Lucene index document object for reuse
         /// </summary>
@@ -263,7 +253,7 @@ internal void UpdateIndexedNodesInfo(List<NodeSearchElement> nodeList)
             {
                 writer.DeleteAll();
                 var iDoc = InitializeIndexDocumentForNodes();
-                AddNodeTypeToSearchIndexBulk(nodeList, iDoc);
+                AddNodeTypeToSearchIndex(nodeList, iDoc);
             }         
         }
 
@@ -594,16 +584,14 @@ internal void CommitWriterChanges()
         {
             //Commit the info indexed if index writer exists
             writer?.Commit();
-
-            InitializeIndexSearcher();
         }
 
         /// <summary>
         /// Add node information to existing Lucene index
         /// </summary>
         /// <param name="node">node info that will be indexed</param>
         /// <param name="doc">Lucene document in which the node info will be indexed</param>
-        internal void AddNodeTypeToSearchIndex_uninitialized(NodeSearchElement node, Document doc)
+        internal void AddNodeTypeToSearchIndex(NodeSearchElement node, Document doc)
         {
             if (addedFields == null) return;
             // During DynamoModel initialization, the index writer should still be valid here
@@ -642,18 +630,13 @@ internal void AddNodeTypeToSearchIndex_uninitialized(NodeSearchElement node, Doc
 
             writer?.AddDocument(doc);
         }
-        internal void AddNodeTypeToSearchIndex(NodeSearchElement node, Document doc)
-        {
-            AddNodeTypeToSearchIndex_uninitialized(node,doc);
-            InitializeIndexSearcher();
-        }
-        internal void AddNodeTypeToSearchIndexBulk(List<NodeSearchElement> nodes, Document doc)
+
+        internal void AddNodeTypeToSearchIndex(List<NodeSearchElement> nodes, Document doc)
         {
             foreach(var node in nodes)
             {
-                AddNodeTypeToSearchIndex_uninitialized(node, doc);
+                AddNodeTypeToSearchIndex(node, doc);
             }
-            InitializeIndexSearcher();
         }
     }
 
diff --git a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
@@ -750,7 +750,7 @@ internal void SearchAutoCompleteCandidates(string input)
                     //Memory indexing process for Node Autocomplete (indexing just the nodes returned by the NodeAutocomplete service so we limit the scope of the query search)
                     var doc = LuceneUtility.InitializeIndexDocumentForNodes();
                     List<NodeSearchElement> nodeSearchElements = [.. searchElementsCache.Select(x => x.Model)];
-                    LuceneUtility.AddNodeTypeToSearchIndexBulk(nodeSearchElements, doc);
+                    LuceneUtility.AddNodeTypeToSearchIndex(nodeSearchElements, doc);
 
                     //Write the Lucene documents to memory
                     LuceneUtility.CommitWriterChanges();

Original file line number	Diff line number	Diff line change
`@@ -1621,7 +1621,7 @@ private void InitializeIncludedNodes()`
`1621`	`1621`
`1622`	`1622`	`SearchModel?.Add(symbolSearchElement);`
`1623`	`1623`	`SearchModel?.Add(outputSearchElement);`
`1624`		`- LuceneUtility.AddNodeTypeToSearchIndexBulk([cnbNode, symbolSearchElement, outputSearchElement], iDoc);`
	`1624`	`+ LuceneUtility.AddNodeTypeToSearchIndex([cnbNode, symbolSearchElement, outputSearchElement], iDoc);`
`1625`	`1625`
`1626`	`1626`	`}`
`1627`	`1627`
`@@ -1785,7 +1785,7 @@ private void LoadNodeModels(List<TypeLoadData> nodes, bool isPackageMember)`
`1785`	`1785`	`Logger.Log(e);`
`1786`	`1786`	`}`
`1787`	`1787`	`}`
`1788`		`- LuceneUtility.AddNodeTypeToSearchIndexBulk(nodeSearchElements, iDoc);`
	`1788`	`+ LuceneUtility.AddNodeTypeToSearchIndex(nodeSearchElements, iDoc);`
`1789`	`1789`	`}`
`1790`	`1790`
`1791`	`1791`	`private void InitializePreferences()`
`@@ -3500,7 +3500,7 @@ internal void AddZeroTouchNodesToSearch(IEnumerable<FunctionGroup> functionGroup`
`3500`	`3500`	`}`
`3501`	`3501`	`}`
`3502`	`3502`	`}`
`3503`		`- LuceneUtility.AddNodeTypeToSearchIndexBulk(nodes, iDoc);`
	`3503`	`+ LuceneUtility.AddNodeTypeToSearchIndex(nodes, iDoc);`
`3504`	`3504`	`}`
`3505`	`3505`
`3506`	`3506`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ internal class LuceneSearchUtility`
`50`	`50`	`internal Lucene.Net.Store.Directory indexDir;`
`51`	`51`
`52`	`52`	`/// <summary>`
`53`		`- /// Lucene Index write. Make sure to call InitializeIndexSearcher after every index change.`
	`53`	`+ /// Lucene Index write.`
`54`	`54`	`/// </summary>`
`55`	`55`	`internal IndexWriter writer;`
`56`	`56`
`@@ -190,16 +190,6 @@ internal void CreateLuceneIndexWriter(OpenMode mode = OpenMode.CREATE)`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`
`193`		`- /// <summary>`
`194`		`- /// InitializeIndexSearcher initializes the dirReader and Searcher of this class.`
`195`		`- /// This method should be called after every index change.`
`196`		`- /// </summary>`
`197`		`- private void InitializeIndexSearcher()`
`198`		`- {`
`199`		`- dirReader = writer != null ? writer.GetReader(applyAllDeletes: true) : DirectoryReader.Open(indexDir);`
`200`		`- Searcher = new(dirReader);`
`201`		`- }`
`202`		`-`
`203`	`193`	`/// <summary>`
`204`	`194`	`/// Initialize Lucene index document object for reuse`
`205`	`195`	`/// </summary>`
`@@ -263,7 +253,7 @@ internal void UpdateIndexedNodesInfo(List<NodeSearchElement> nodeList)`
`263`	`253`	`{`
`264`	`254`	`writer.DeleteAll();`
`265`	`255`	`var iDoc = InitializeIndexDocumentForNodes();`
`266`		`- AddNodeTypeToSearchIndexBulk(nodeList, iDoc);`
	`256`	`+ AddNodeTypeToSearchIndex(nodeList, iDoc);`
`267`	`257`	`}`
`268`	`258`	`}`
`269`	`259`
`@@ -594,16 +584,14 @@ internal void CommitWriterChanges()`
`594`	`584`	`{`
`595`	`585`	`//Commit the info indexed if index writer exists`
`596`	`586`	`writer?.Commit();`
`597`		`-`
`598`		`- InitializeIndexSearcher();`
`599`	`587`	`}`
`600`	`588`
`601`	`589`	`/// <summary>`
`602`	`590`	`/// Add node information to existing Lucene index`
`603`	`591`	`/// </summary>`
`604`	`592`	`/// <param name="node">node info that will be indexed</param>`
`605`	`593`	`/// <param name="doc">Lucene document in which the node info will be indexed</param>`
`606`		`- internal void AddNodeTypeToSearchIndex_uninitialized(NodeSearchElement node, Document doc)`
	`594`	`+ internal void AddNodeTypeToSearchIndex(NodeSearchElement node, Document doc)`
`607`	`595`	`{`
`608`	`596`	`if (addedFields == null) return;`
`609`	`597`	`// During DynamoModel initialization, the index writer should still be valid here`
`@@ -642,18 +630,13 @@ internal void AddNodeTypeToSearchIndex_uninitialized(NodeSearchElement node, Doc`
`642`	`630`
`643`	`631`	`writer?.AddDocument(doc);`
`644`	`632`	`}`
`645`		`- internal void AddNodeTypeToSearchIndex(NodeSearchElement node, Document doc)`
`646`		`- {`
`647`		`- AddNodeTypeToSearchIndex_uninitialized(node,doc);`
`648`		`- InitializeIndexSearcher();`
`649`		`- }`
`650`		`- internal void AddNodeTypeToSearchIndexBulk(List<NodeSearchElement> nodes, Document doc)`
	`633`	`+`
	`634`	`+ internal void AddNodeTypeToSearchIndex(List<NodeSearchElement> nodes, Document doc)`
`651`	`635`	`{`
`652`	`636`	`foreach(var node in nodes)`
`653`	`637`	`{`
`654`		`- AddNodeTypeToSearchIndex_uninitialized(node, doc);`
	`638`	`+ AddNodeTypeToSearchIndex(node, doc);`
`655`	`639`	`}`
`656`		`- InitializeIndexSearcher();`
`657`	`640`	`}`
`658`	`641`	`}`
`659`	`642`