Author: chetanm
Date: Tue Aug 1 11:01:22 2017
New Revision: 1803635
URL: http://svn.apache.org/viewvc?rev=1803635&view=rev
Log:
OAK-6493 - LuceneIndexProviderService.enableHybridIndexing=false results in
NullPointerException
Merging 1802934,1802938
Added:
jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy
- copied, changed from r1802934,
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 1 11:01:22 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802973,1803026
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java?rev=1803635&r1=1803634&r2=1803635&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
Tue Aug 1 11:01:22 2017
@@ -62,6 +62,7 @@ public class LuceneIndexEditorProvider i
private final MountInfoProvider mountInfoProvider;
private GarbageCollectableBlobStore blobStore;
private IndexingQueue indexingQueue;
+ private boolean nrtIndexingEnabled;
/**
* Number of indexed Lucene document that can be held in memory
@@ -116,7 +117,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
@@ -199,12 +200,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/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java?rev=1803635&r1=1803634&r2=1803635&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProviderTest.java
Tue Aug 1 11:01:22 2017
@@ -108,7 +108,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);
Copied:
jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy
(from r1802934,
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy?p2=jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy&p1=jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy&r1=1802934&r2=1803635&rev=1803635&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy
(original)
+++
jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy
Tue Aug 1 11:01:22 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
