Author: chetanm
Date: Tue Jul 25 13:30:20 2017
New Revision: 1802938
URL: http://svn.apache.org/viewvc?rev=1802938&view=rev
Log:
OAK-6493 - LuceneIndexProviderService.enableHybridIndexing=false results in
NullPointerException
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy
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=1802938&r1=1802937&r2=1802938&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
Tue Jul 25 13:30:20 2017
@@ -68,6 +68,7 @@ public class LuceneIndexEditorProvider i
private final ActiveDeletedBlobCollector activeDeletedBlobCollector;
private GarbageCollectableBlobStore blobStore;
private IndexingQueue indexingQueue;
+ private boolean nrtIndexingEnabled;
/**
* Number of indexed Lucene document that can be held in memory
@@ -134,7 +135,7 @@ public class LuceneIndexEditorProvider i
LuceneIndexWriterFactory writerFactory = indexWriterFactory;
IndexDefinition indexDefinition = null;
boolean asyncIndexing = true;
- if (!indexingContext.isAsync() &&
IndexDefinition.supportsSyncOrNRTIndexing(definition)) {
+ if (nrtIndexingEnabled() && !indexingContext.isAsync() &&
IndexDefinition.supportsSyncOrNRTIndexing(definition)) {
//Would not participate in reindexing. Only interested in
//incremental indexing
@@ -221,12 +222,17 @@ public class LuceneIndexEditorProvider i
public void setIndexingQueue(IndexingQueue indexingQueue) {
this.indexingQueue = indexingQueue;
+ this.nrtIndexingEnabled = indexingQueue != null;
}
GarbageCollectableBlobStore getBlobStore() {
return blobStore;
}
+ private boolean nrtIndexingEnabled() {
+ return nrtIndexingEnabled;
+ }
+
private static CommitContext getCommitContext(IndexingContext
indexingContext) {
return (CommitContext)
indexingContext.getCommitInfo().getInfo().get(CommitContext.NAME);
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java?rev=1802938&r1=1802937&r2=1802938&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
Tue Jul 25 13:30:20 2017
@@ -109,7 +109,7 @@ public class LuceneIndexEditorProviderTe
null,
null,
Mounts.defaultMountInfoProvider());
-
+ editorProvider.setIndexingQueue(mock(DocumentQueue.class));
IndexUpdateCallback callback = new TestCallback("/oak:index/fooIndex",
newCommitInfo(), true, false);
NodeBuilder defnBuilder = createIndexDefinition("fooIndex").builder();
Editor editor = editorProvider.getIndexEditor(TYPE_LUCENE,
defnBuilder, root, callback);
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy?rev=1802938&r1=1802937&r2=1802938&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy
Tue Jul 25 13:30:20 2017
@@ -26,7 +26,6 @@ import org.apache.jackrabbit.oak.spi.lif
import org.apache.jackrabbit.oak.spi.state.NodeBuilder
import org.junit.After
import org.junit.Before
-import org.junit.Ignore
import org.junit.Test
import javax.jcr.Node
@@ -37,7 +36,6 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.run.osgi.OakOSGiRepositoryFactory.REPOSITORY_CONFIG_FILE
-@Ignore("OAK-6493")
class HybridIndexDisabledTest extends AbstractRepositoryFactoryTest {
Session session
