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/08 07:26:52 UTC
svn commit: r1817466 - in /jackrabbit/oak/trunk/oak-run/src:
main/java/org/apache/jackrabbit/oak/index/indexer/document/
test/java/org/apache/jackrabbit/oak/index/
Author: chetanm
Date: Fri Dec 8 07:26:52 2017
New Revision: 1817466
URL: http://svn.apache.org/viewvc?rev=1817466&view=rev
Log:
OAK-6353 - Use Document order traversal for reindexing performed on DocumentNodeStore setups
Expose the new methods introduced with OAK-7039
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexer.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java?rev=1817466&r1=1817465&r2=1817466&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java Fri Dec 8 07:26:52 2017
@@ -20,7 +20,9 @@
package org.apache.jackrabbit.oak.index.indexer.document;
import java.io.IOException;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
@@ -56,6 +58,25 @@ public class CompositeIndexer implements
}
@Override
+ public boolean indexesRelativeNodes() {
+ for (NodeStateIndexer indexer : indexers) {
+ if (indexer.indexesRelativeNodes()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public Set<String> getRelativeIndexedNodeNames() {
+ Set<String> result = new HashSet<>();
+ for (NodeStateIndexer indexer : indexers) {
+ result.addAll(indexer.getRelativeIndexedNodeNames());
+ }
+ return result;
+ }
+
+ @Override
public void close() throws IOException {
}
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java?rev=1817466&r1=1817465&r2=1817466&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java Fri Dec 8 07:26:52 2017
@@ -20,6 +20,7 @@
package org.apache.jackrabbit.oak.index.indexer.document;
import java.io.IOException;
+import java.util.Set;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
@@ -79,6 +80,16 @@ public class LuceneIndexer implements No
}
@Override
+ public boolean indexesRelativeNodes() {
+ return definition.indexesRelativeNodes();
+ }
+
+ @Override
+ public Set<String> getRelativeIndexedNodeNames() {
+ return definition.getRelativeNodeNames();
+ }
+
+ @Override
public void close() throws IOException {
indexWriter.close(System.currentTimeMillis());
}
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexer.java?rev=1817466&r1=1817465&r2=1817466&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexer.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexer.java Fri Dec 8 07:26:52 2017
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.index.
import java.io.Closeable;
import java.io.IOException;
+import java.util.Set;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
@@ -32,5 +33,9 @@ public interface NodeStateIndexer extend
boolean shouldInclude(NodeDocument doc);
void index(NodeStateEntry entry) throws IOException, CommitFailedException;
+
+ boolean indexesRelativeNodes();
+
+ Set<String> getRelativeIndexedNodeNames();
}
Modified: jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java?rev=1817466&r1=1817465&r2=1817466&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java Fri Dec 8 07:26:52 2017
@@ -22,7 +22,9 @@ package org.apache.jackrabbit.oak.index;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
@@ -264,6 +266,16 @@ public class DocumentStoreIndexerIT exte
}
@Override
+ public boolean indexesRelativeNodes() {
+ return false;
+ }
+
+ @Override
+ public Set<String> getRelativeIndexedNodeNames() {
+ return Collections.emptySet();
+ }
+
+ @Override
public void close() throws IOException {
}