Remove active waiting for suggester tasks after timeout

Author: ahornace

src/org/opensolaris/opengrok/web/api/v1/controller/SuggesterController.java

@@ -160,7 +160,7 @@ private boolean satisfiesConfiguration(final SuggesterData data, final Suggester
     @Path("/config")
     @Produces(MediaType.APPLICATION_JSON)
     public SuggesterConfig getConfig() {
-        return RuntimeEnvironment.getInstance().getConfiguration().getSuggesterConfig();
+        return env.getConfiguration().getSuggesterConfig();
     }
 
     /**

suggester/src/main/java/org/opengrok/suggest/Suggester.java

@@ -368,8 +368,18 @@ private Suggestions complexLookup(
             if (!searchTask.started) {
                 continue;
             }
-            // "spin lock" – should be fast since all the tasks either finished or were interrupted
-            while (!searchTask.finished) {
+
+            if (!searchTask.finished) {
+                synchronized (searchTask) {
+                    while (!searchTask.finished) {
+                        try {
+                            searchTask.wait();
+                        } catch (InterruptedException e) {
+                            logger.log(Level.WARNING, "Interrupted while waiting for task: {0}", searchTask);
+                            Thread.currentThread().interrupt();
+                        }
+                    }
+                }
             }
         }
         return new Suggestions(results, partialResult);
@@ -541,7 +551,10 @@ public Void call() {
                     data.unlock();
                 }
             } finally {
-                finished = true;
+                synchronized (this) {
+                    finished = true;
+                    this.notifyAll();
+                }
             }
             return null;
         }

suggester/src/main/java/org/opengrok/suggest/SuggesterSearcher.java

@@ -127,7 +127,7 @@ public List<LookupResultItem> suggest(
     private List<LookupResultItem> suggest(
             final Query query,
             final LeafReaderContext leafReaderContext,
-            final String suggester,
+            final String project,
             final SuggesterQuery suggesterQuery,
             final PopularityCounter searchCounts
     ) throws IOException {
@@ -189,7 +189,7 @@ private List<LookupResultItem> suggest(
                     score += searchCounts.get(term) * TERM_ALREADY_SEARCHED_MULTIPLIER;
 
                     if (queue.canInsert(score)) {
-                        queue.insertWithOverflow(new LookupResultItem(term.utf8ToString(), suggester, score));
+                        queue.insertWithOverflow(new LookupResultItem(term.utf8ToString(), project, score));
                     }
                 }
             }

suggester/src/main/java/org/opengrok/suggest/popular/impl/chronicle/ChronicleMapAdapter.java

@@ -68,7 +68,7 @@ public void increment(final BytesRef key, final int value) {
         if (value < 0) {
             throw new IllegalArgumentException("Cannot increment by negative value " + value);
         }
-        map.merge(key, value, (a, b) -> a + b);
+        map.merge(key, value, Integer::sum);
     }
 
     /** {@inheritDoc} */

suggester/src/main/java/org/opengrok/suggest/query/customized/CustomSloppyPhraseScorer.java

@@ -61,7 +61,7 @@ final class CustomSloppyPhraseScorer extends Scorer implements PhraseScorer {
 
     private int offset;
 
-    public Map<Integer, IntsHolder> map = new HashMap<>();
+    private Map<Integer, IntsHolder> map = new HashMap<>();
 
     CustomSloppyPhraseScorer(Weight weight, CustomPhraseQuery.PostingsAndFreq[] postings, int slop, int offset) {
         super(weight);