svn commit: r1835780 - in /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene: util/SuggestHelper.java writer/DefaultIndexWriter.java

[ca...@apache.org]

Author: catholicon
Date: Fri Jul 13 00:00:32 2018
New Revision: 1835780

URL: http://svn.apache.org/viewvc?rev=1835780&view=rev
Log:
OAK-7630: Suggest directory update doesn't close AnalyzingInfixSuggester after building

Modified:
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java?rev=1835780&r1=1835779&r2=1835780&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java Fri Jul 13 00:00:32 2018
@@ -26,6 +26,7 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
+import com.google.common.io.Closer;
 import com.google.common.io.Files;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.oak.plugins.index.lucene.FieldNames;
@@ -56,8 +57,10 @@ public class SuggestHelper {
         }
     };
 
-    public static void updateSuggester(Directory directory, Analyzer analyzer, IndexReader reader) throws IOException {
+    public static void updateSuggester(Directory directory, Analyzer analyzer, IndexReader reader, final Closer closer)
+            throws IOException {
         File tempDir = null;
+        boolean shouldCloseDirectory = true;
         try {
             //Analyzing infix suggester takes a file parameter. It uses its path to getDirectory()
             //for actual storage of suggester data. BUT, while building it also does getDirectory() to
@@ -70,11 +73,16 @@ public class SuggestHelper {
 
             if (reader.getDocCount(FieldNames.SUGGEST) > 0) {
                 Dictionary dictionary = new LuceneDictionary(reader, FieldNames.SUGGEST);
-                getLookup(directory, analyzer, tempSubChild).build(dictionary);
+                AnalyzingInfixSuggester suggester = closer.register(getLookup(directory, analyzer, tempSubChild));
+                shouldCloseDirectory = false;
+                suggester.build(dictionary);
             }
         } catch (RuntimeException e) {
             log.debug("could not update the suggester", e);
         } finally {
+            if (shouldCloseDirectory) {
+                closer.register(directory);
+            }
             //cleanup temp dir
             if (tempDir != null && !FileUtils.deleteQuietly(tempDir)) {
                 log.error("Cleanup failed for temp dir {}", tempDir.getAbsolutePath());

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java?rev=1835780&r1=1835779&r2=1835780&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java Fri Jul 13 00:00:32 2018
@@ -25,6 +25,7 @@ import java.util.List;
 
 import javax.annotation.Nonnull;
 
+import com.google.common.io.Closer;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.commons.PerfLogger;
@@ -164,20 +165,23 @@ class DefaultIndexWriter implements Luce
      * @param analyzer the analyzer used to update the suggester
      */
     private boolean updateSuggester(Analyzer analyzer, Calendar currentTime) throws IOException {
+        final Closer closer = Closer.create();
+
         NodeBuilder suggesterStatus = definitionBuilder.child(suggestDirName);
-        DirectoryReader reader = DirectoryReader.open(writer, false);
+        DirectoryReader reader = closer.register(DirectoryReader.open(writer, false));
         final Directory suggestDirectory =
             directoryFactory.newInstance(definition, definitionBuilder, suggestDirName, false);
+        // updateSuggester would close the directory (directly or via lookup)
+        // closer.register(suggestDirectory);
         boolean updated = false;
         try {
-            SuggestHelper.updateSuggester(suggestDirectory, analyzer, reader);
+            SuggestHelper.updateSuggester(suggestDirectory, analyzer, reader, closer);
             suggesterStatus.setProperty("lastUpdated", ISO8601.format(currentTime), Type.DATE);
             updated = true;
         } catch (Throwable e) {
             log.warn("could not update suggester", e);
         } finally {
-            suggestDirectory.close();
-            reader.close();
+            closer.close();
         }
         return updated;
     }