Searching in background task

JabRef · Oct 5, 2024 · b2c5428 · b2c5428
1 parent c127aaf
commit b2c5428
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 38 deletions.
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -334,7 +334,6 @@ public AbstractGroup resultConverter(ButtonType button) {
                 Optional<IndexManager> indexManager = stateManager.getIndexManager(currentDatabase);
                 if (indexManager.isPresent()) {
                     SearchGroup searchGroup = (SearchGroup) resultingGroup;
-                    // TODO: search should be done in a background thread
                     searchGroup.setMatchedEntries(indexManager.get().search(searchGroup.getSearchQuery()).getMatchedEntries());
                 }
             } else if (typeAutoProperty.getValue()) {

diff --git a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
@@ -102,12 +102,9 @@ public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager state
             databaseContext.getMetaData().groupsBinding().addListener(new WeakInvalidationListener(onInvalidatedGroup));
         } else if (groupNode.getGroup() instanceof SearchGroup searchGroup) {
             stateManager.getIndexManager(databaseContext).ifPresent(indexManager -> {
-                BackgroundTask.wrap(() -> {
-                    searchGroup.setMatchedEntries(indexManager.search(searchGroup.getSearchQuery()).getMatchedEntries());
-                }).onSuccess(success -> {
-                    refreshGroup();
-                    databaseContext.getMetaData().groupsBinding().invalidate();
-                }).executeWith(taskExecutor);
+                searchGroup.setMatchedEntries(indexManager.search(searchGroup.getSearchQuery()).getMatchedEntries());
+                refreshGroup();
+                databaseContext.getMetaData().groupsBinding().invalidate();
             });
         }
 
@@ -541,12 +538,9 @@ class SearchIndexListener {
         public void listen(IndexStartedEvent event) {
             if (groupNode.getGroup() instanceof SearchGroup searchGroup) {
                 stateManager.getIndexManager(databaseContext).ifPresent(indexManager -> {
-                    BackgroundTask.wrap(() -> {
-                        searchGroup.setMatchedEntries(indexManager.search(searchGroup.getSearchQuery()).getMatchedEntries());
-                    }).onSuccess(success -> {
-                        refreshGroup();
-                        databaseContext.getMetaData().groupsBinding().invalidate();
-                    }).executeWith(taskExecutor);
+                    searchGroup.setMatchedEntries(indexManager.search(searchGroup.getSearchQuery()).getMatchedEntries());
+                    refreshGroup();
+                    databaseContext.getMetaData().groupsBinding().invalidate();
                 });
             }
         }

diff --git a/src/main/java/org/jabref/logic/search/IndexManager.java b/src/main/java/org/jabref/logic/search/IndexManager.java
@@ -1,7 +1,11 @@
 package org.jabref.logic.search;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -14,6 +18,7 @@
 import org.jabref.logic.search.retrieval.BibFieldsSearcher;
 import org.jabref.logic.search.retrieval.LinkedFilesSearcher;
 import org.jabref.logic.util.BackgroundTask;
+import org.jabref.logic.util.HeadlessExecutorService;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -221,11 +226,22 @@ public AutoCloseable blockLinkedFileIndexer() {
     }
 
     public SearchResults search(SearchQuery query) {
-        SearchResults searchResults = new SearchResults();
-        searchResults.mergeSearchResults(bibFieldsSearcher.search(query));
+        List<Callable<SearchResults>> tasks = new ArrayList<>();
+        tasks.add(() -> bibFieldsSearcher.search(query));
 
         if (query.getSearchFlags().contains(SearchFlags.FULLTEXT)) {
-            searchResults.mergeSearchResults(linkedFilesSearcher.search(query));
+            tasks.add(() -> linkedFilesSearcher.search(query));
+        }
+
+        List<Future<SearchResults>> futures = HeadlessExecutorService.INSTANCE.executeAll(tasks);
+
+        SearchResults searchResults = new SearchResults();
+        for (Future<SearchResults> future : futures) {
+            try {
+                searchResults.mergeSearchResults(future.get());
+            } catch (InterruptedException | ExecutionException e) {
+                LOGGER.error("Error while searching", e);
+            }
         }
         query.setSearchResults(searchResults);
         return searchResults;

diff --git a/src/main/java/org/jabref/logic/search/retrieval/BibFieldsSearcher.java b/src/main/java/org/jabref/logic/search/retrieval/BibFieldsSearcher.java
@@ -5,6 +5,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.jabref.logic.search.query.SearchQueryConversion;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.query.SearchQuery;
 import org.jabref.model.search.query.SearchResult;
@@ -37,11 +38,10 @@ private static SearchQuery createBooleanQueryForEntry(BibEntry entry, SearchQuer
     }
 
     public SearchResults search(SearchQuery searchQuery) {
-        String sqlQuery = searchQuery.getSqlQuery(tableName);
         if (!searchQuery.isValid()) {
-            LOGGER.error("Invalid SQL query: {}", sqlQuery);
             return new SearchResults();
         }
+        String sqlQuery = SearchQueryConversion.searchToSql(tableName, searchQuery.getSearchExpression());
         LOGGER.debug("Searching in bib fields with query: {}", sqlQuery);
         SearchResults searchResults = new SearchResults();
         try (PreparedStatement preparedStatement = connection.prepareStatement(sqlQuery)) {

diff --git a/src/main/java/org/jabref/logic/search/retrieval/LinkedFilesSearcher.java b/src/main/java/org/jabref/logic/search/retrieval/LinkedFilesSearcher.java
@@ -10,6 +10,7 @@
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.search.LuceneIndexer;
+import org.jabref.logic.search.query.SearchQueryConversion;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
@@ -46,10 +47,14 @@ public LinkedFilesSearcher(BibDatabaseContext databaseContext, LuceneIndexer lin
     }
 
     public SearchResults search(SearchQuery searchQuery) {
-        Query luceneQuery = searchQuery.getLuceneQuery();
+        if (!searchQuery.isValid()) {
+            return new SearchResults();
+        }
+
+        Query luceneQuery = SearchQueryConversion.searchToLucene(searchQuery.getSearchExpression());
         EnumSet<SearchFlags> searchFlags = searchQuery.getSearchFlags();
         boolean shouldSearchInLinkedFiles = searchFlags.contains(SearchFlags.FULLTEXT) && filePreferences.shouldFulltextIndexLinkedFiles();
-        if (!shouldSearchInLinkedFiles || !searchQuery.isValid()) {
+        if (!shouldSearchInLinkedFiles) {
             return new SearchResults();
         }
 

diff --git a/src/main/java/org/jabref/model/search/query/SearchQuery.java b/src/main/java/org/jabref/model/search/query/SearchQuery.java
@@ -7,16 +7,13 @@
 import org.jabref.model.search.SearchFlags;
 
 import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.apache.lucene.search.Query;
 
 public class SearchQuery {
 
     private final String searchExpression;
     private final EnumSet<SearchFlags> searchFlags;
 
     private boolean isValidExpression;
-    private String sqlQuery;
-    private Query luceneQuery;
     private SearchResults searchResults;
 
     public SearchQuery(String searchExpression, EnumSet<SearchFlags> searchFlags) {
@@ -30,20 +27,6 @@ public SearchQuery(String searchExpression, EnumSet<SearchFlags> searchFlags) {
         }
     }
 
-    public String getSqlQuery(String table) {
-        if (sqlQuery == null) {
-            sqlQuery = SearchQueryConversion.searchToSql(table, searchExpression);
-        }
-        return sqlQuery;
-    }
-
-    public Query getLuceneQuery() {
-        if (luceneQuery == null) {
-            luceneQuery = SearchQueryConversion.searchToLucene(searchExpression);
-        }
-        return luceneQuery;
-    }
-
     public String getSearchExpression() {
         return searchExpression;
     }

diff --git a/src/main/java/org/jabref/model/search/query/SearchResults.java b/src/main/java/org/jabref/model/search/query/SearchResults.java
@@ -6,12 +6,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.jabref.model.entry.BibEntry;
 
 public class SearchResults {
 
-    private final Map<String, List<SearchResult>> searchResults = new HashMap<>();
+    private final Map<String, List<SearchResult>> searchResults = new ConcurrentHashMap<>();
 
     public void mergeSearchResults(SearchResults additionalResults) {
         this.searchResults.putAll(additionalResults.searchResults);