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 ca...@apache.org on 2019/02/20 22:57:26 UTC
svn commit: r1854003 - in /jackrabbit/oak/branches/1.8: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: catholicon
Date: Wed Feb 20 22:57:26 2019
New Revision: 1854003
URL: http://svn.apache.org/viewvc?rev=1854003&view=rev
Log:
OAK-8046: Result items are not always correctly counted against the configured read limit if a query uses a lucene index (backported r1853969, r1853997 from trunk)
1. Initial implementation
2. Fix test cases. I had earlier assumed that index tag chooses even
aggregate index (compatVersion=1) but it doesn't. So, now we have
different type of indexes and query according to which one we want to
get picked.
Added:
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java
- copied, changed from r1853969, jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 20 22:57:26 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911
,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846617,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850837,1851533-1851535,1851619,1852120,1852451,1852492,1852528,1852
582,1852584,1853393,1853429,1853433,1853866,1853893
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911
,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846617,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850837,1851533-1851535,1851619,1852120,1852451,1852492,1852528,1852
582,1852584,1853393,1853429,1853433,1853866,1853893,1853969,1853997
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java?rev=1854003&r1=1854002&r2=1854003&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java Wed Feb 20 22:57:26 2019
@@ -281,7 +281,7 @@ public class LuceneIndex implements Adva
final boolean nonFullTextConstraints = parent.isEmpty();
final int parentDepth = getDepth(parent);
QueryLimits settings = filter.getQueryLimits();
- Iterator<LuceneResultRow> itr = new AbstractIterator<LuceneResultRow>() {
+ LuceneResultRowIterator itr = new LuceneResultRowIterator() {
private final Deque<LuceneResultRow> queue = Queues.newArrayDeque();
private final Set<String> seenPaths = Sets.newHashSet();
private ScoreDoc lastDoc;
@@ -298,6 +298,11 @@ public class LuceneIndex implements Adva
return endOfData();
}
+ @Override
+ public int rewoundCount() {
+ return reloadCount;
+ }
+
private LuceneResultRow convertToRow(ScoreDoc doc, IndexSearcher searcher, String excerpt) throws IOException {
IndexReader reader = searcher.getIndexReader();
PathStoredFieldVisitor visitor = new PathStoredFieldVisitor();
@@ -465,7 +470,7 @@ public class LuceneIndex implements Adva
throw new IllegalStateException("Too many version changes");
}
lastDoc = null;
- LOG.debug("Change in index version detected {} => {}. Query would be performed without " +
+ LOG.info("Change in index version detected {} => {}. Query would be performed without " +
"offset; reload {}", currentVersion, lastSearchIndexerVersion, reloadCount);
}
this.lastSearchIndexerVersion = currentVersion;
@@ -1121,19 +1126,20 @@ public class LuceneIndex implements Adva
*/
static class LucenePathCursor implements Cursor {
- private static final int TRAVERSING_WARNING = Integer.getInteger("oak.traversing.warning", 10000);
+ private final int TRAVERSING_WARNING = Integer.getInteger("oak.traversing.warning", 10000);
private final Cursor pathCursor;
LuceneResultRow currentRow;
private final SizeEstimator sizeEstimator;
private long estimatedSize;
- LucenePathCursor(final Iterator<LuceneResultRow> it, QueryLimits settings, SizeEstimator sizeEstimator, Filter filter) {
+ LucenePathCursor(final LuceneResultRowIterator it, QueryLimits settings, SizeEstimator sizeEstimator, Filter filter) {
this.sizeEstimator = sizeEstimator;
Iterator<String> pathIterator = new Iterator<String>() {
private int readCount;
+ private int rewoundCount;
@Override
public boolean hasNext() {
@@ -1142,6 +1148,10 @@ public class LuceneIndex implements Adva
@Override
public String next() {
+ if (it.rewoundCount() > rewoundCount) {
+ readCount = 0;
+ rewoundCount = it.rewoundCount();
+ }
currentRow = it.next();
readCount++;
if (readCount % TRAVERSING_WARNING == 0) {
@@ -1212,4 +1222,8 @@ public class LuceneIndex implements Adva
return estimatedSize = sizeEstimator.getSize();
}
}
+
+ static abstract class LuceneResultRowIterator extends AbstractIterator<LuceneResultRow> {
+ abstract int rewoundCount();
+ }
}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1854003&r1=1854002&r2=1854003&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java Wed Feb 20 22:57:26 2019
@@ -336,7 +336,7 @@ public class LucenePropertyIndex impleme
final Sort sort = getSort(plan);
final PlanResult pr = getPlanResult(plan);
QueryLimits settings = filter.getQueryLimits();
- Iterator<LuceneResultRow> itr = new AbstractIterator<LuceneResultRow>() {
+ LuceneResultRowIterator rItr = new LuceneResultRowIterator() {
private final Deque<LuceneResultRow> queue = Queues.newArrayDeque();
private final Set<String> seenPaths = Sets.newHashSet();
private ScoreDoc lastDoc;
@@ -346,6 +346,7 @@ public class LucenePropertyIndex impleme
private int indexNodeId = -1;
private Facets facets = null;
private boolean facetsInitialized = false;
+ private int rewoundCount = 0;
@Override
protected LuceneResultRow computeNext() {
@@ -356,6 +357,11 @@ public class LucenePropertyIndex impleme
return endOfData();
}
+ @Override
+ public int rewoundCount() {
+ return rewoundCount;
+ }
+
private LuceneResultRow convertToRow(ScoreDoc doc, IndexSearcher searcher, String excerpt, Facets facets,
String explanation) throws IOException {
IndexReader reader = searcher.getIndexReader();
@@ -579,6 +585,7 @@ public class LucenePropertyIndex impleme
//if already initialized then log about change
if (indexNodeId > 0){
LOG.debug("Change in index version detected. Query would be performed without offset");
+ rewoundCount++;
}
indexSearcher = indexNode.getSearcher();
@@ -593,6 +600,7 @@ public class LucenePropertyIndex impleme
indexSearcher = null;
}
};
+ Iterator<LuceneResultRow> itr = rItr;
SizeEstimator sizeEstimator = new SizeEstimator() {
@Override
public long getSize() {
@@ -623,7 +631,7 @@ public class LucenePropertyIndex impleme
itr = mergePropertyIndexResult(plan, rootState, itr);
}
- return new LucenePathCursor(itr, plan, settings, sizeEstimator);
+ return new LucenePathCursor(itr, rItr, plan, settings, sizeEstimator);
}
private static Query addDescendantClauseIfRequired(Query query, IndexPlan plan) {
@@ -1670,7 +1678,7 @@ public class LucenePropertyIndex impleme
*/
static class LucenePathCursor implements Cursor {
- private static final int TRAVERSING_WARNING = Integer.getInteger("oak.traversing.warning", 10000);
+ private final int TRAVERSING_WARNING = Integer.getInteger("oak.traversing.warning", 10000);
private final Cursor pathCursor;
private final String pathPrefix;
@@ -1679,12 +1687,13 @@ public class LucenePropertyIndex impleme
private long estimatedSize;
private int numberOfFacets;
- LucenePathCursor(final Iterator<LuceneResultRow> it, final IndexPlan plan, QueryLimits settings, SizeEstimator sizeEstimator) {
+ LucenePathCursor(final Iterator<LuceneResultRow> it, final IteratorRewoundStateProvider iterStateProvider, final IndexPlan plan, QueryLimits settings, SizeEstimator sizeEstimator) {
pathPrefix = plan.getPathPrefix();
this.sizeEstimator = sizeEstimator;
Iterator<String> pathIterator = new Iterator<String>() {
private int readCount;
+ private int rewoundCount;
@Override
public boolean hasNext() {
@@ -1693,6 +1702,10 @@ public class LucenePropertyIndex impleme
@Override
public String next() {
+ if (iterStateProvider.rewoundCount() > rewoundCount) {
+ readCount = 0;
+ rewoundCount = iterStateProvider.rewoundCount();
+ }
currentRow = it.next();
readCount++;
if (readCount % TRAVERSING_WARNING == 0) {
@@ -1802,4 +1815,10 @@ public class LucenePropertyIndex impleme
}
}
+ static abstract class LuceneResultRowIterator extends AbstractIterator<LuceneResultRow> implements IteratorRewoundStateProvider {
+ }
+
+ public interface IteratorRewoundStateProvider {
+ int rewoundCount();
+ }
}
Copied: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java (from r1853969, jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java?p2=jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java&p1=jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java&r1=1853969&r2=1854003&rev=1854003&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java Wed Feb 20 22:57:26 2019
@@ -30,10 +30,7 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
import org.apache.jackrabbit.oak.commons.junit.TemporarySystemProperty;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.IndexDefinitionBuilder;
-import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
-import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
-import org.apache.jackrabbit.oak.plugins.memory.MultiStringPropertyState;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
@@ -57,8 +54,7 @@ import java.util.Iterator;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import static com.google.common.collect.ImmutableList.of;
-import static org.apache.jackrabbit.oak.InitialContentHelper.INITIAL_CONTENT;
+import static org.apache.jackrabbit.oak.InitialContent.INITIAL_CONTENT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -159,23 +155,26 @@ public class ReopenedLuceneIndexTest {
}
private void createIndex() throws CommitFailedException {
- IndexDefinitionBuilder idxBuilder = new IndexDefinitionBuilder();
- idxBuilder.noAsync().evaluatePathRestrictions()
+ IndexDefinitionBuilder idxBuilderV1 = new IndexDefinitionBuilder();
+ idxBuilderV1.noAsync().evaluatePathRestrictions()
.indexRule("nt:base")
.property("cons").nodeScopeIndex()
// to make a change in index but we won't query for this
.enclosingRule().property("foo").propertyIndex();
- Tree indexNode;
+ IndexDefinitionBuilder idxBuilderV2 = new IndexDefinitionBuilder();
+ idxBuilderV2.noAsync().evaluatePathRestrictions()
+ .indexRule("nt:base")
+ .property("cons").propertyIndex()
+ // to make a change in index but we won't query for this
+ .enclosingRule().property("foo").propertyIndex();
- idxBuilder.getBuilderTree().setProperty(new MultiStringPropertyState("tags", of("v2")));
- indexNode = root.getTree("/").addChild("oak:index").addChild("index-v2");
- idxBuilder.build(indexNode);
-
- idxBuilder.getBuilderTree().setProperty(new MultiStringPropertyState("tags", of("v1")));
- idxBuilder.getBuilderTree().setProperty(FulltextIndexConstants.COMPAT_MODE, 1); // to force aggregate index
- indexNode = root.getTree("/oak:index").addChild("index-v2");
- idxBuilder.build(indexNode);
+ Tree oi = root.getTree("/oak:index");
+
+ idxBuilderV1.getBuilderTree().setProperty(LuceneIndexConstants.COMPAT_MODE, 1); // to force aggregate index
+ idxBuilderV1.build(oi.addChild("index-v1"));
+
+ idxBuilderV2.build(oi.addChild("index-v2"));
root.commit();
}
@@ -195,7 +194,10 @@ public class ReopenedLuceneIndexTest {
}
private int iterateResultWhileReopening(String indexTag) throws ParseException, CommitFailedException {
- String query = "SELECT * FROM [nt:base] WHERE CONTAINS(*, 'val') option(index tag " + indexTag + ")";
+ String queryV1 = "SELECT * FROM [nt:base] WHERE CONTAINS(*, 'val')";
+ String queryV2 = "SELECT * FROM [nt:base] WHERE [cons] = 'val'";
+
+ String query = "v1".equals(indexTag) ? queryV1 : queryV2;
int resultSize = 0;