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=1804821&r1=1804820&r2=1804821&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
 Fri Aug 11 16:45:35 2017
@@ -51,10 +51,10 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.spi.query.Filter;
 import org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction;
 import org.apache.jackrabbit.oak.spi.query.IndexRow;
-import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings;
 import org.apache.jackrabbit.oak.spi.query.QueryConstants;
 import org.apache.jackrabbit.oak.spi.query.QueryIndex;
 import 
org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvanceFulltextQueryIndex;
+import org.apache.jackrabbit.oak.spi.query.QueryLimits;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
@@ -281,7 +281,7 @@ public class LuceneIndex implements Adva
         // no relative property in the full-text constraint
         final boolean nonFullTextConstraints = parent.isEmpty();
         final int parentDepth = getDepth(parent);
-        QueryEngineSettings settings = filter.getQueryEngineSettings();
+        QueryLimits settings = filter.getQueryLimits();
         Iterator<LuceneResultRow> itr = new 
AbstractIterator<LuceneResultRow>() {
             private final Deque<LuceneResultRow> queue = 
Queues.newArrayDeque();
             private final Set<String> seenPaths = Sets.newHashSet();
@@ -460,8 +460,8 @@ public class LuceneIndex implements Adva
                 if (currentVersion != lastSearchIndexerVersion && lastDoc != 
null){
                     reloadCount++;
                     if (reloadCount > MAX_RELOAD_COUNT) {
-                        LOG.error("More than {} index version changes detected 
for query {}", 
-                                MAX_RELOAD_COUNT, 
+                        LOG.error("More than {} index version changes detected 
for query {}",
+                                MAX_RELOAD_COUNT,
                                 plan);
                         throw new IllegalStateException("Too many version 
changes");
                     }
@@ -476,7 +476,7 @@ public class LuceneIndex implements Adva
             @Override
             public long getSize() {
                 IndexNode indexNode = tracker.acquireIndexNode((String) 
plan.getAttribute(ATTR_INDEX_PATH));
-                checkState(indexNode != null);                
+                checkState(indexNode != null);
                 try {
                     IndexSearcher searcher = indexNode.getSearcher();
                     LuceneRequestFacade luceneRequestFacade = 
getLuceneRequest(filter, searcher.getIndexReader(),
@@ -646,7 +646,7 @@ public class LuceneIndex implements Adva
         if (qs.size() == 0) {
             return new LuceneRequestFacade<Query>(new MatchAllDocsQuery());
         }
-        
+
         return LucenePropertyIndex.performAdditionalWraps(qs);
     }
 
@@ -701,7 +701,7 @@ public class LuceneIndex implements Adva
 
             if (pr.first == null && pr.last == null) {
                 // we only support equality or range queries,
-                // but not "in", "is null", "is not null" 
+                // but not "in", "is null", "is not null"
                 // queries (OAK-1208)
                 continue;
             }
@@ -720,7 +720,7 @@ public class LuceneIndex implements Adva
             }
             if (QueryConstants.RESTRICTION_LOCAL_NAME.equals(name)) {
                 continue;
-            }              
+            }
 
             if (skipTokenization(name)) {
                 qs.add(new TermQuery(new Term(name, pr.first
@@ -1127,7 +1127,7 @@ public class LuceneIndex implements Adva
         private final SizeEstimator sizeEstimator;
         private long estimatedSize;
 
-        LucenePathCursor(final Iterator<LuceneResultRow> it, 
QueryEngineSettings settings, SizeEstimator sizeEstimator) {
+        LucenePathCursor(final Iterator<LuceneResultRow> it, QueryLimits 
settings, SizeEstimator sizeEstimator) {
             this.sizeEstimator = sizeEstimator;
             Iterator<String> pathIterator = new Iterator<String>() {
 

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=1804821&r1=1804820&r2=1804821&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
 Fri Aug 11 16:45:35 2017
@@ -66,9 +66,9 @@ import org.apache.jackrabbit.oak.spi.que
 import org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction;
 import org.apache.jackrabbit.oak.spi.query.IndexRow;
 import org.apache.jackrabbit.oak.spi.query.QueryConstants;
-import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings;
 import org.apache.jackrabbit.oak.spi.query.QueryIndex;
 import 
org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvanceFulltextQueryIndex;
+import org.apache.jackrabbit.oak.spi.query.QueryLimits;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger;
 import org.apache.lucene.analysis.Analyzer;
@@ -300,7 +300,7 @@ public class LucenePropertyIndex impleme
         final Filter filter = plan.getFilter();
         final Sort sort = getSort(plan);
         final PlanResult pr = getPlanResult(plan);
-        QueryEngineSettings settings = filter.getQueryEngineSettings();
+        QueryLimits settings = filter.getQueryLimits();
         Iterator<LuceneResultRow> itr = new 
AbstractIterator<LuceneResultRow>() {
             private final Deque<LuceneResultRow> queue = 
Queues.newArrayDeque();
             private final Set<String> seenPaths = Sets.newHashSet();
@@ -714,10 +714,10 @@ public class LucenePropertyIndex impleme
             return new Sort(fieldsList.toArray(new SortField[0]));
         }
     }
-    
+
     /**
      * Remove all "jcr:score" entries.
-     * 
+     *
      * @param original the original list (is not modified)
      * @return the list with the entries removed
      */
@@ -1559,7 +1559,7 @@ public class LucenePropertyIndex impleme
         private long estimatedSize;
         private int numberOfFacets;
 
-        LucenePathCursor(final Iterator<LuceneResultRow> it, final IndexPlan 
plan, QueryEngineSettings settings, SizeEstimator sizeEstimator) {
+        LucenePathCursor(final Iterator<LuceneResultRow> it, final IndexPlan 
plan, QueryLimits settings, SizeEstimator sizeEstimator) {
             pathPrefix = plan.getPathPrefix();
             this.sizeEstimator = sizeEstimator;
             Iterator<String> pathIterator = new Iterator<String>() {

Modified: 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1804821&r1=1804820&r2=1804821&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
 Fri Aug 11 16:45:35 2017
@@ -57,7 +57,7 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.spi.query.QueryConstants;
 import org.apache.jackrabbit.oak.spi.query.QueryIndex;
 import org.apache.jackrabbit.oak.spi.query.QueryIndex.FulltextQueryIndex;
-import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings;
+import org.apache.jackrabbit.oak.spi.query.QueryLimits;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServer;
@@ -223,7 +223,7 @@ public class SolrQueryIndex implements F
             AbstractIterator<SolrResultRow> iterator = getIterator(filter, 
plan, parent, parentDepth, configuration,
                     solrServer, estimator);
 
-            cursor = new SolrRowCursor(iterator, plan, 
filter.getQueryEngineSettings(), estimator, solrServer, configuration);
+            cursor = new SolrRowCursor(iterator, plan, 
filter.getQueryLimits(), estimator, solrServer, configuration);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -671,7 +671,7 @@ public class SolrQueryIndex implements F
 
         SolrResultRow currentRow;
 
-        SolrRowCursor(final Iterator<SolrResultRow> it, IndexPlan plan, 
QueryEngineSettings settings,
+        SolrRowCursor(final Iterator<SolrResultRow> it, IndexPlan plan, 
QueryLimits settings,
                       LMSEstimator estimator, SolrServer solrServer, 
OakSolrConfiguration configuration) {
             this.estimator = estimator;
             this.solrServer = solrServer;


Reply via email to