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 2015/04/29 07:26:58 UTC
svn commit: r1676670 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: chetanm
Date: Wed Apr 29 05:26:55 2015
New Revision: 1676670
URL: http://svn.apache.org/r1676670
Log:
OAK-2569 - LuceneIndex#loadDocs can throw IllegalArgumentException
Fixed via checking for index version change
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java?rev=1676670&r1=1676669&r2=1676670&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java Wed Apr 29 05:26:55 2015
@@ -286,6 +286,7 @@ public class LuceneIndex implements Adva
private ScoreDoc lastDoc;
private int nextBatchSize = LUCENE_QUERY_BATCH_SIZE;
private boolean noDocs = false;
+ private long lastSearchIndexerVersion;
@Override
protected LuceneResultRow computeNext() {
@@ -347,6 +348,7 @@ public class LuceneIndex implements Adva
Query query = (Query) luceneRequestFacade.getLuceneRequest();
TopDocs docs;
long time = System.currentTimeMillis();
+ checkForIndexVersionChange(searcher);
if (lastDoc != null) {
LOG.debug("loading the next {} entries for query {}", nextBatchSize, query);
docs = searcher.searchAfter(lastDoc, query, nextBatchSize);
@@ -424,6 +426,16 @@ public class LuceneIndex implements Adva
return !queue.isEmpty();
}
+
+ private void checkForIndexVersionChange(IndexSearcher searcher) {
+ long currentVersion = LucenePropertyIndex.getVersion(searcher);
+ if (currentVersion != lastSearchIndexerVersion && lastDoc != null){
+ lastDoc = null;
+ LOG.debug("Change in index version detected {} => {}. Query would be performed without " +
+ "offset", currentVersion, lastSearchIndexerVersion);
+ }
+ this.lastSearchIndexerVersion = currentVersion;
+ }
};
return new LucenePathCursor(itr, settings);
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1676670&r1=1676669&r2=1676670&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java Wed Apr 29 05:26:55 2015
@@ -67,6 +67,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.util.PerfLogger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
@@ -268,6 +269,7 @@ public class LucenePropertyIndex impleme
private ScoreDoc lastDoc;
private int nextBatchSize = LUCENE_QUERY_BATCH_SIZE;
private boolean noDocs = false;
+ private long lastSearchIndexerVersion;
@Override
protected LuceneResultRow computeNext() {
@@ -328,6 +330,8 @@ public class LucenePropertyIndex impleme
query = customScoreQuery;
}
+ checkForIndexVersionChange(searcher);
+
TopDocs docs;
long start = PERF_LOGGER.start();
if (lastDoc != null) {
@@ -415,6 +419,16 @@ public class LucenePropertyIndex impleme
return !queue.isEmpty();
}
+
+ private void checkForIndexVersionChange(IndexSearcher searcher) {
+ long currentVersion = getVersion(searcher);
+ if (currentVersion != lastSearchIndexerVersion && lastDoc != null){
+ lastDoc = null;
+ LOG.debug("Change in index version detected {} => {}. Query would be performed without " +
+ "offset", currentVersion, lastSearchIndexerVersion);
+ }
+ this.lastSearchIndexerVersion = currentVersion;
+ }
};
return new LucenePathCursor(itr, plan, settings);
}
@@ -884,6 +898,14 @@ public class LucenePropertyIndex impleme
throw new IllegalStateException("PropertyRestriction not handled " + pr + " for index " + defn );
}
+ static long getVersion(IndexSearcher indexSearcher){
+ IndexReader reader = indexSearcher.getIndexReader();
+ if (reader instanceof DirectoryReader){
+ return ((DirectoryReader) reader).getVersion();
+ }
+ return -1;
+ }
+
private static void addReferenceConstraint(String uuid, List<Query> qs,
IndexReader reader) {
if (reader == null) {
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java?rev=1676670&r1=1676669&r2=1676670&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java Wed Apr 29 05:26:55 2015
@@ -283,7 +283,6 @@ public class LuceneIndexTest {
assertFalse(cursor.hasNext());
}
- @Ignore("OAK-2569") //FIXME OAK-2569
@Test
public void testCursorStability() throws Exception {
NodeBuilder index = newLucenePropertyIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
@@ -334,7 +333,11 @@ public class LuceneIndexTest {
//Update the IndexSearcher
tracker.update(builder.getNodeState());
- Assert.assertEquals(10, Iterators.size(cursor));
+ //its hard to get correct size estimate as post deletion cursor
+ // would have already picked up 50 docs which would not be considered
+ //deleted by QE for the revision at which query was triggered
+ //So just checking for >
+ Assert.assertTrue(Iterators.size(cursor) > 0);
}
private void purgeDeletedDocs(NodeBuilder idx, IndexDefinition definition) throws IOException {