Author: chetanm
Date: Thu Sep 15 07:20:03 2016
New Revision: 1760864
URL: http://svn.apache.org/viewvc?rev=1760864&view=rev
Log:
OAK-4412 - Lucene hybrid index
Remove the LuceneDocumentHolder from commit context as to not hold memory once
docs are processed as CommitInfo may remain alive for some time in observation
queues
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserverTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java?rev=1760864&r1=1760863&r2=1760864&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java
Thu Sep 15 07:20:03 2016
@@ -57,6 +57,8 @@ public class LocalIndexObserver implemen
return;
}
+ commitContext.remove(LuceneDocumentHolder.NAME);
+
int droppedCount = 0;
for (LuceneDoc doc : holder.getNRTIndexedDocs()){
if (!docQueue.add(doc)) {
@@ -73,7 +75,5 @@ public class LocalIndexObserver implemen
//TODO Ensure that log do not flood
log.warn("Dropped [{}] docs from indexing as queue is full",
droppedCount);
}
-
- //TODO Remove the holder once processing is done
}
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserverTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserverTest.java?rev=1760864&r1=1760863&r2=1760864&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserverTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserverTest.java
Thu Sep 15 07:20:03 2016
@@ -32,6 +32,7 @@ import org.junit.Test;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
public class LocalIndexObserverTest {
static final Executor NOOP_EXECUTOR = new Executor() {
@@ -79,6 +80,7 @@ public class LocalIndexObserverTest {
observer.contentChanged(EMPTY_NODE, info);
assertEquals(1, collectingQueue.getQueuedDocs().size());
+ assertNull(cc.get(LuceneDocumentHolder.NAME));
}
private CommitInfo newCommitInfo(){
