DYN-5975 Indexing Package Nodes. (#14120)

RobertGlobant20 · web-flow · commit 46c628c8c51d · 2023-07-04T21:46:49.000-07:00
* DYN-5975 Indexing Package Nodes.

This fix is adding the packages nodes already installed or if during Dynamo execution the user install more packages, the nodes will be also indexed so they can be shown as results in the InCanvasSearch functionality.

* DYN-5975 Indexing Package Nodes.

Code Review changes related to create methods for commit the changes and dispose the Lucene writer, so we can reuse the same code in several places.

* DYN-5975 Indexing Package Nodes Code Review

Fixing comment

* Test Fixing Regression

Testing for Fixing Regressions

* DYN-5975 Indexing Package Nodes Fixing Regressions

Some tests are failing in the parallels job due that DynamoModel.IsTestMode = false when running some tests.
Then I'm catching the exception and setting the writer to null, as a consequence for this tests no info will be indexed and the search won't be returning anything.
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -1359,6 +1359,9 @@ public void Dispose()
                 PreferenceSettings.MessageLogged -= LogMessage;
             }
 
+            //The writer have to be disposed at DynamoModel level due that we could index package-nodes as new packages are installed
+            LuceneSearchUtility.DisposeWriter();
+
             // Lucene disposals (just if LuceneNET was initialized)
             LuceneSearchUtility.indexDir?.Dispose();
             LuceneSearchUtility.dirReader?.Dispose();
@@ -1416,6 +1419,16 @@ private void InitializeCustomNodeManager()
                 customNodeSearchRegistry.Add(info.FunctionId);
                 var searchElement = new CustomNodeSearchElement(CustomNodeManager, info);
                 SearchModel.Add(searchElement);
+
+                //Indexing node packages installed using PackageManagerSearch
+                var iDoc = LuceneSearchUtility.InitializeIndexDocumentForNodes();
+                if (searchElement != null)
+                {
+                    AddNodeTypeToSearchIndex(searchElement, iDoc);
+                }
+
+                LuceneSearchUtility.CommitWriterChanges();
+
                 Action<CustomNodeInfo> infoUpdatedHandler = null;
                 infoUpdatedHandler = newInfo =>
                 {
@@ -1612,15 +1625,7 @@ private void InitializeNodeLibrary()
             // When running parallel tests several are trying to write in the AppData folder then the job
             // is failing and in a wrong state so we prevent to initialize Lucene index writer during test mode.
             // Without the index files on disk, the dirReader cant be initialized correctly. So does the searcher.
-            if (!IsTestMode)
-            {
-                LuceneSearchUtility.dirReader = LuceneSearchUtility.writer?.GetReader(applyAllDeletes: true);
-                LuceneSearchUtility.Searcher = new IndexSearcher(LuceneSearchUtility.dirReader);
-
-                LuceneSearchUtility.writer?.Commit();
-                LuceneSearchUtility.writer?.Dispose();
-                LuceneSearchUtility.writer = null;
-            }
+            LuceneSearchUtility.CommitWriterChanges();
         }
 
         /// <summary>
diff --git a/src/DynamoCore/Utilities/LuceneSearchUtility.cs b/src/DynamoCore/Utilities/LuceneSearchUtility.cs
@@ -9,6 +9,7 @@
 using Lucene.Net.Index;
 using Lucene.Net.QueryParsers.Classic;
 using Lucene.Net.Search;
+using Lucene.Net.Store;
 
 namespace Dynamo.Utilities
 {
@@ -58,7 +59,15 @@ internal void InitializeLuceneConfig(string dirName)
                 {
                     OpenMode = OpenMode.CREATE
                 };
-                writer = new IndexWriter(indexDir, indexConfig);
+                try
+                {
+                    writer = new IndexWriter(indexDir, indexConfig);
+                }
+                catch(LockObtainFailedException ex)
+                {
+                    DisposeWriter();
+                    dynamoModel.Logger.LogError($"LuceneNET LockObtainFailedException {ex}");
+                }
             }
         }
 
@@ -233,5 +242,24 @@ internal string CreateSearchQuery(string[] fields, string SearchTerm)
             }
             return booleanQuery.ToString();
         }
+
+        internal void DisposeWriter()
+        {
+            //We need to check if we are not running Dynamo tests because otherwise parallel test start to fail when trying to write in the same Lucene directory location
+            if (!DynamoModel.IsTestMode)
+            {
+                writer?.Dispose();
+                writer = null;
+            }
+        }
+
+        internal void CommitWriterChanges()
+        {
+            if (!DynamoModel.IsTestMode)
+            {
+                //Commit the info indexed
+                writer?.Commit();
+            }
+        }
     }
 }
diff --git a/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs
@@ -939,6 +939,12 @@ internal IEnumerable<NodeSearchElementViewModel> Search(string search, bool useL
         {
             if (useLucene)
             {
+                //The DirectoryReader and IndexSearcher have to be assigned after commiting indexing changes and before executing the Searcher.Search() method, otherwise new indexed info won't be reflected
+                LuceneSearchUtility.dirReader = LuceneSearchUtility.writer?.GetReader(applyAllDeletes: true);
+                if (LuceneSearchUtility.dirReader == null) return null;
+
+                LuceneSearchUtility.Searcher = new IndexSearcher(LuceneSearchUtility.dirReader);
+
                 string searchTerm = search.Trim();
                 var candidates = new List<NodeSearchElementViewModel>();
                 var parser = new MultiFieldQueryParser(LuceneConfig.LuceneNetVersion, LuceneConfig.NodeIndexFields, LuceneSearchUtility.Analyzer)

Original file line number	Diff line number	Diff line change
`@@ -939,6 +939,12 @@ internal IEnumerable<NodeSearchElementViewModel> Search(string search, bool useL`
`939`	`939`	`{`
`940`	`940`	`if (useLucene)`
`941`	`941`	`{`
	`942`	`+ //The DirectoryReader and IndexSearcher have to be assigned after commiting indexing changes and before executing the Searcher.Search() method, otherwise new indexed info won't be reflected`
	`943`	`+ LuceneSearchUtility.dirReader = LuceneSearchUtility.writer?.GetReader(applyAllDeletes: true);`
	`944`	`+ if (LuceneSearchUtility.dirReader == null) return null;`
	`945`	`+`
	`946`	`+ LuceneSearchUtility.Searcher = new IndexSearcher(LuceneSearchUtility.dirReader);`
	`947`	`+`
`942`	`948`	`string searchTerm = search.Trim();`
`943`	`949`	`var candidates = new List<NodeSearchElementViewModel>();`
`944`	`950`	`var parser = new MultiFieldQueryParser(LuceneConfig.LuceneNetVersion, LuceneConfig.NodeIndexFields, LuceneSearchUtility.Analyzer)`