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 ch...@apache.org on 2017/12/15 17:04:08 UTC

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

Author: chetanm
Date: Fri Dec 15 17:04:08 2017
New Revision: 1818304

URL: http://svn.apache.org/viewvc?rev=1818304&view=rev
Log:
OAK-6353 - Use Document order traversal for reindexing performed on DocumentNodeStore setups

Filter NodeDocument via path predicated backed by indexers

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

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java?rev=1818304&r1=1818303&r2=1818304&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java Fri Dec 15 17:04:08 2017
@@ -90,10 +90,16 @@ public class NodeStateEntryTraverser imp
     @SuppressWarnings("Guava")
     private Iterable<NodeStateEntry> getIncludedDocs() {
         return FluentIterable.from(getDocsFilteredByPath())
-                .filter(doc -> !doc.isSplitDocument() && !NodeStateUtils.isHiddenPath(doc.getPath()))
+                .filter(doc -> includeDoc(doc))
                 .transformAndConcat(doc -> getEntries(doc));
     }
 
+    private boolean includeDoc(NodeDocument doc) {
+        return !doc.isSplitDocument()
+                && !NodeStateUtils.isHiddenPath(doc.getPath())
+                && pathPredicate.test(doc.getPath());
+    }
+
     @SuppressWarnings("StaticPseudoFunctionalStyleMethod")
     private Iterable<NodeStateEntry> getEntries(NodeDocument doc) {
         String path = doc.getPath();