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/08/23 06:37:19 UTC
svn commit: r1805857 - in /jackrabbit/oak/branches/1.6: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/
Author: chetanm
Date: Wed Aug 23 06:37:19 2017
New Revision: 1805857
URL: http://svn.apache.org/viewvc?rev=1805857&view=rev
Log:
OAK-6572 - IndexReaderClosed exception seen after some run
Merging 1805851,1805852
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java
jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 23 06:37:19 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1805851-1805852
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java?rev=1805857&r1=1805856&r2=1805857&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java Wed Aug 23 06:37:19 2017
@@ -56,7 +56,7 @@ public class IndexNodeManager {
*/
static final String ASYNC = ":async";
- private static final AtomicInteger INDEX_NODE_COUNTER = new AtomicInteger();
+ private static final AtomicInteger SEARCHER_ID_COUNTER = new AtomicInteger();
private static final PerfLogger PERF_LOGGER =
new PerfLogger(LoggerFactory.getLogger(IndexNodeManager.class.getName() + ".perf"));
@@ -102,8 +102,6 @@ public class IndexNodeManager {
private boolean closed = false;
- private final int indexNodeId = INDEX_NODE_COUNTER.incrementAndGet();
-
IndexNodeManager(String name, IndexDefinition definition, List<LuceneIndexReader> readers, @Nullable NRTIndex nrtIndex)
throws IOException {
checkArgument(!readers.isEmpty() || nrtIndex != null);
@@ -157,10 +155,6 @@ public class IndexNodeManager {
lock.readLock().unlock();
}
- private int getIndexNodeId() {
- return indexNodeId;
- }
-
void close() throws IOException {
lock.writeLock().lock();
try {
@@ -267,6 +261,7 @@ public class IndexNodeManager {
private static class SearcherHolder {
final IndexSearcher searcher;
final List<LuceneIndexReader> nrtReaders;
+ final int searcherId = SEARCHER_ID_COUNTER.incrementAndGet();
public SearcherHolder(IndexSearcher searcher, List<LuceneIndexReader> nrtReaders) {
this.searcher = searcher;
@@ -325,7 +320,7 @@ public class IndexNodeManager {
@Override
public int getIndexNodeId() {
- return IndexNodeManager.this.getIndexNodeId();
+ return holder.searcherId;
}
@Override
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1805857&r1=1805856&r2=1805857&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java Wed Aug 23 06:37:19 2017
@@ -192,7 +192,7 @@ public class LucenePropertyIndex impleme
/**
* Batch size for fetching results from Lucene queries.
*/
- static final int LUCENE_QUERY_BATCH_SIZE = 50;
+ public static final int LUCENE_QUERY_BATCH_SIZE = 50;
protected final IndexTracker tracker;
@@ -541,7 +541,6 @@ public class LucenePropertyIndex impleme
LOG.debug("Change in index version detected. Query would be performed without offset");
}
- //TODO Add testcase for this scenario
indexSearcher = indexNode.getSearcher();
indexNodeId = indexNode.getIndexNodeId();
lastDoc = null;
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java?rev=1805857&r1=1805856&r2=1805857&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java Wed Aug 23 06:37:19 2017
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.management.ManagementFactory;
import java.util.Collections;
+import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -36,9 +37,11 @@ import javax.management.AttributeNotFoun
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import ch.qos.logback.classic.Level;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterators;
import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecutor;
import org.apache.commons.exec.PumpStreamHandler;
@@ -47,10 +50,13 @@ import org.apache.jackrabbit.JcrConstant
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentRepository;
+import org.apache.jackrabbit.oak.api.Result;
+import org.apache.jackrabbit.oak.api.ResultRow;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
+import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.counter.NodeCounterEditorProvider;
@@ -61,6 +67,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.IndexingMode;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProvider;
+import org.apache.jackrabbit.oak.plugins.index.lucene.LucenePropertyIndex;
import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil;
import org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil.OptionalEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory;
@@ -95,12 +102,14 @@ import org.junit.rules.TemporaryFolder;
import static com.google.common.collect.ImmutableList.of;
import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static org.apache.jackrabbit.oak.api.QueryEngine.NO_BINDINGS;
import static org.apache.jackrabbit.oak.spi.mount.Mounts.defaultMountInfoProvider;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeNoException;
@@ -380,6 +389,45 @@ public class HybridIndexTest extends Abs
assertThat(fileCount4, lessThanOrEqualTo(fileCount3));
}
+ @Test
+ public void paging() throws Exception{
+ String idxName = "hybridtest";
+ Tree idx = createIndex(root.getTree("/"), idxName, Collections.singleton("foo"));
+ TestUtil.enableIndexingMode(idx, IndexingMode.SYNC);
+ root.commit();
+ runAsyncIndex();
+
+ createTestData("/content", LucenePropertyIndex.LUCENE_QUERY_BATCH_SIZE * 2);
+ runAsyncIndex();
+
+ String query = "select [jcr:path] from [nt:base] where [foo] = 'bar'";
+ Result result = executeQuery(query, SQL2, NO_BINDINGS);
+ Iterator<? extends ResultRow> itr = result.getRows().iterator();
+ int count = 0;
+ for (int i = 0; i < LucenePropertyIndex.LUCENE_QUERY_BATCH_SIZE - 10; i++) {
+ assertTrue(itr.hasNext());
+ itr.next();
+ count++;
+ }
+
+ createTestData("/content2", 5);
+ LogCustomizer lc = LogCustomizer.forLogger(LucenePropertyIndex.class.getName())
+ .filter(Level.WARN)
+ .create();
+ lc.starting();
+
+ int size = Iterators.size(itr);
+
+ if (!lc.getLogs().isEmpty()){
+ fail(lc.getLogs().toString());
+ }
+
+ lc.finished();
+
+ int totalSize = LucenePropertyIndex.LUCENE_QUERY_BATCH_SIZE * 2 + 5;
+ assertEquals(totalSize, count + size);
+ }
+
private long createTestDataAndRunAsync(String parentPath, int count) throws Exception {
createTestData(parentPath, count);
System.out.printf("Open file count - Post creation of %d nodes at %s is %d%n",count, parentPath, getOpenFileCount());