Author: chetanm
Date: Fri May 19 11:53:19 2017
New Revision: 1795606
URL: http://svn.apache.org/viewvc?rev=1795606&view=rev
Log:
OAK-6243 - Refactor directory construction logic via DirectoryFactory
Enable passing in a custom DirectoryFactory while constructing provider
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java?rev=1795606&r1=1795605&r2=1795606&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java Fri May 19 11:53:19 2017
@@ -25,6 +25,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
import org.apache.jackrabbit.oak.plugins.index.IndexingContext;
+import org.apache.jackrabbit.oak.plugins.index.lucene.directory.DefaultDirectoryFactory;
+import org.apache.jackrabbit.oak.plugins.index.lucene.directory.DirectoryFactory;
import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.IndexingQueue;
import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.LocalIndexWriterFactory;
import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.LuceneDocumentHolder;
@@ -62,6 +64,7 @@ public class LuceneIndexEditorProvider i
private final MountInfoProvider mountInfoProvider;
private GarbageCollectableBlobStore blobStore;
private IndexingQueue indexingQueue;
+ private DirectoryFactory directoryFactory;
/**
* Number of indexed Lucene document that can be held in memory
@@ -112,7 +115,7 @@ public class LuceneIndexEditorProvider i
checkArgument(callback instanceof ContextAwareCallback, "callback instance not of type " +
"ContextAwareCallback [%s]", callback);
IndexingContext indexingContext = ((ContextAwareCallback)callback).getIndexingContext();
- indexWriterFactory = new DefaultIndexWriterFactory(mountInfoProvider, indexCopier, blobStore);
+ indexWriterFactory = new DefaultIndexWriterFactory(mountInfoProvider, getDirectoryFactory());
LuceneIndexWriterFactory writerFactory = indexWriterFactory;
IndexDefinition indexDefinition = null;
boolean asyncIndexing = true;
@@ -184,6 +187,17 @@ public class LuceneIndexEditorProvider i
this.inMemoryDocsLimit = inMemoryDocsLimit;
}
+ public void setDirectoryFactory(DirectoryFactory directoryFactory) {
+ this.directoryFactory = directoryFactory;
+ }
+
+ private DirectoryFactory getDirectoryFactory() {
+ if (directoryFactory == null) {
+ directoryFactory = new DefaultDirectoryFactory(indexCopier, blobStore);
+ }
+ return directoryFactory;
+ }
+
private LuceneDocumentHolder getDocumentHolder(CommitContext commitContext){
LuceneDocumentHolder holder = (LuceneDocumentHolder) commitContext.get(LuceneDocumentHolder.NAME);
if (holder == null) {
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java?rev=1795606&r1=1795605&r2=1795606&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java Fri May 19 11:53:19 2017
@@ -30,14 +30,21 @@ import org.apache.jackrabbit.oak.spi.blo
import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import static com.google.common.base.Preconditions.checkNotNull;
+
public class DefaultIndexWriterFactory implements LuceneIndexWriterFactory {
private final MountInfoProvider mountInfoProvider;
private final DirectoryFactory directoryFactory;
public DefaultIndexWriterFactory(MountInfoProvider mountInfoProvider,
@Nullable IndexCopier indexCopier, @Nullable GarbageCollectableBlobStore blobStore) {
- this.mountInfoProvider = mountInfoProvider;
- this.directoryFactory = new DefaultDirectoryFactory(indexCopier, blobStore);
+ this(mountInfoProvider, new DefaultDirectoryFactory(indexCopier, blobStore));
+ }
+
+ public DefaultIndexWriterFactory(MountInfoProvider mountInfoProvider,
+ DirectoryFactory directoryFactory) {
+ this.mountInfoProvider = checkNotNull(mountInfoProvider);
+ this.directoryFactory = checkNotNull(directoryFactory);
}
@Override