You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ca...@apache.org on 2018/07/19 12:26:44 UTC
svn commit: r1836267 - in /jackrabbit/oak/branches/1.8: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/
Author: catholicon
Date: Thu Jul 19 12:26:43 2018
New Revision: 1836267
URL: http://svn.apache.org/viewvc?rev=1836267&view=rev
Log:
OAK-7630: Suggest directory update doesn't close AnalyzingInfixSuggester after building (backport r1835780 from trunk)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 19 12:26:43 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828439,1828529,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1834610,1834648-1834649,1834681,1834823,1834857-1834858
,1835060
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828439,1828529,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1834610,1834648-1834649,1834681,1834823,1834857-1834858
,1835060,1835780
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java?rev=1836267&r1=1836266&r2=1836267&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java Thu Jul 19 12:26:43 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/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java?rev=1836267&r1=1836266&r2=1836267&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java Thu Jul 19 12:26:43 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;
}