svn commit: r1818758 - /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexer.java

[chetanm]

Author: chetanm
Date: Wed Dec 20 09:28:47 2017
New Revision: 1818758

URL: http://svn.apache.org/viewvc?rev=1818758&view=rev
Log:
OAK-7098 - Refcator common logic between IndexUpdate and DocumentStoreIndexer

Modified:
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexer.java

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexer.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexer.java?rev=1818758&r1=1818757&r2=1818758&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexer.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexer.java
 Wed Dec 20 09:28:47 2017
@@ -38,6 +38,7 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
 import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
+import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
 import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
 import org.apache.jackrabbit.oak.plugins.index.NodeTraversalCallback;
 import 
org.apache.jackrabbit.oak.plugins.index.progress.IndexingProgressReporter;
@@ -180,6 +181,11 @@ public class DocumentStoreIndexer implem
                 log.warn("No 'type' property found on indexPath [{}]. Skipping 
it", indexPath);
                 continue;
             }
+
+            removeIndexState(idxBuilder);
+
+            idxBuilder.setProperty(IndexConstants.REINDEX_PROPERTY_NAME, 
false);
+
             for (NodeStateIndexerProvider indexerProvider : indexerProviders) {
                 NodeStateIndexer indexer = indexerProvider.getIndexer(type, 
indexPath, idxBuilder, root, progressReporter);
                 if (indexer != null) {
@@ -206,4 +212,18 @@ public class DocumentStoreIndexer implem
     private NodeStateIndexerProvider createLuceneIndexProvider() throws 
IOException {
         return new LuceneIndexerProvider(indexHelper, indexerSupport);
     }
+
+    //TODO OAK-7098 - Taken from IndexUpdate. Refactor to abstract out common 
logic like this
+    private void removeIndexState(NodeBuilder definition) {
+        // as we don't know the index content node name
+        // beforehand, we'll remove all child nodes
+        for (String rm : definition.getChildNodeNames()) {
+            if (NodeStateUtils.isHidden(rm)) {
+                NodeBuilder childNode = definition.getChildNode(rm);
+                if (!childNode.getBoolean(IndexConstants.REINDEX_RETAIN)) {
+                    definition.getChildNode(rm).remove();
+                }
+            }
+        }
+    }
 }