Author: chetanm
Date: Fri Jan 12 05:45:10 2018
New Revision: 1820948
URL: http://svn.apache.org/viewvc?rev=1820948&view=rev
Log:
OAK-7147 - Oak run LuceneIndexer indexes excluded parent nodes
Merge 1820947
Added:
jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerTest.java
- copied unchanged from r1820947,
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexerTest.java
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexer.java
jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 12 05:45:10 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820861
+/jackrabbit/oak/trunk:1820660-1820661,1820861,1820947
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java?rev=1820948&r1=1820947&r2=1820948&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java
Fri Jan 12 05:45:10 2018
@@ -51,10 +51,12 @@ public class CompositeIndexer implements
}
@Override
- public void index(NodeStateEntry entry) throws IOException,
CommitFailedException {
+ public boolean index(NodeStateEntry entry) throws IOException,
CommitFailedException {
+ boolean result = false;
for (NodeStateIndexer indexer : indexers) {
- indexer.index(entry);
+ result |= indexer.index(entry);
}
+ return result;
}
@Override
Modified:
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java?rev=1820948&r1=1820947&r2=1820948&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/LuceneIndexer.java
Fri Jan 12 05:45:10 2018
@@ -54,7 +54,7 @@ public class LuceneIndexer implements No
@Override
public boolean shouldInclude(String path) {
- return definition.getPathFilter().filter(path) !=
PathFilter.Result.EXCLUDE;
+ return getFilterResult(path) != PathFilter.Result.EXCLUDE;
}
@Override
@@ -64,11 +64,15 @@ public class LuceneIndexer implements No
}
@Override
- public void index(NodeStateEntry entry) throws IOException,
CommitFailedException {
+ public boolean index(NodeStateEntry entry) throws IOException,
CommitFailedException {
+ if (getFilterResult(entry.getPath()) != PathFilter.Result.INCLUDE) {
+ return false;
+ }
+
IndexingRule indexingRule =
definition.getApplicableIndexingRule(entry.getNodeState());
if (indexingRule == null) {
- return;
+ return false;
}
LuceneDocumentMaker maker = newDocumentMaker(indexingRule,
entry.getPath());
@@ -76,7 +80,10 @@ public class LuceneIndexer implements No
if (doc != null) {
writeToIndex(doc, entry.getPath());
progressReporter.indexUpdate(definition.getIndexPath());
+ return true;
}
+
+ return false;
}
@Override
@@ -94,6 +101,10 @@ public class LuceneIndexer implements No
indexWriter.close(System.currentTimeMillis());
}
+ private PathFilter.Result getFilterResult(String path) {
+ return definition.getPathFilter().filter(path);
+ }
+
private void writeToIndex(Document doc, String path) throws IOException {
indexWriter.updateDocument(path, doc);
}
Modified:
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexer.java?rev=1820948&r1=1820947&r2=1820948&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexer.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateIndexer.java
Fri Jan 12 05:45:10 2018
@@ -32,7 +32,7 @@ public interface NodeStateIndexer extend
boolean shouldInclude(NodeDocument doc);
- void index(NodeStateEntry entry) throws IOException, CommitFailedException;
+ boolean index(NodeStateEntry entry) throws IOException,
CommitFailedException;
boolean indexesRelativeNodes();
Modified:
jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java?rev=1820948&r1=1820947&r2=1820948&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
Fri Jan 12 05:45:10 2018
@@ -278,10 +278,12 @@ public class DocumentStoreIndexerIT exte
}
@Override
- public void index(NodeStateEntry entry) throws IOException,
CommitFailedException {
+ public boolean index(NodeStateEntry entry) throws IOException,
CommitFailedException {
if (p.test(entry.getPath())) {
paths.add(entry.getPath());
+ return true;
}
+ return false;
}
@Override
