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 2016/02/08 17:07:06 UTC
svn commit: r1729200 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
Author: chetanm
Date: Mon Feb 8 16:07:06 2016
New Revision: 1729200
URL: http://svn.apache.org/viewvc?rev=1729200&view=rev
Log:
OAK-3990 - Enable specifying the max clause limit in BooleanClause
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java?rev=1729200&r1=1729199&r2=1729200&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java Mon Feb 8 16:07:06 2016
@@ -62,6 +62,7 @@ import org.apache.jackrabbit.oak.spi.whi
import org.apache.lucene.analysis.util.CharFilterFactory;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.util.TokenizerFactory;
+import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.util.InfoStream;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -170,6 +171,14 @@ public class LuceneIndexProviderService
)
private static final String PROP_EXTRACTED_TEXT_CACHE_EXPIRY = "extractedTextCacheExpiryInSecs";
+ private static final int PROP_BOOLEAN_CLAUSE_LIMIT_DEFAULT = 1024;
+ @Property(
+ intValue = PROP_BOOLEAN_CLAUSE_LIMIT_DEFAULT,
+ label = "Boolean Clause Limit",
+ description = "Limit for number of boolean clauses generated for handling of OR query"
+ )
+ private static final String PROP_BOOLEAN_CLAUSE_LIMIT = "booleanClauseLimit";
+
private Whiteboard whiteboard;
private BackgroundObserver backgroundObserver;
@@ -206,6 +215,7 @@ public class LuceneIndexProviderService
return;
}
+ configureBooleanClauseLimit(config);
initializeFactoryClassLoaders(getClass().getClassLoader());
whiteboard = new OsgiWhiteboard(bundleContext);
threadPoolSize = PropertiesUtil.toInteger(config.get(PROP_THREAD_POOL_SIZE), PROP_THREAD_POOL_SIZE_DEFAULT);
@@ -453,6 +463,15 @@ public class LuceneIndexProviderService
}
}
+ private void configureBooleanClauseLimit(Map<String, ?> config) {
+ int booleanClauseLimit = PropertiesUtil.toInteger(config.get(PROP_BOOLEAN_CLAUSE_LIMIT),
+ PROP_BOOLEAN_CLAUSE_LIMIT_DEFAULT);
+ if (booleanClauseLimit != BooleanQuery.getMaxClauseCount()){
+ BooleanQuery.setMaxClauseCount(booleanClauseLimit);
+ log.info("Changed the Max boolean clause limit to {}", booleanClauseLimit);
+ }
+ }
+
protected void bindNodeAggregator(NodeAggregator aggregator) {
this.nodeAggregator = aggregator;
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java?rev=1729200&r1=1729199&r2=1729200&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java Mon Feb 8 16:07:06 2016
@@ -32,6 +32,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
+import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.util.InfoStream;
import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
@@ -81,6 +82,8 @@ public class LuceneIndexProviderServiceT
assertTrue(context.getService(Observer.class) instanceof BackgroundObserver);
assertEquals(InfoStream.NO_OUTPUT, InfoStream.getDefault());
+ assertEquals(1024, BooleanQuery.getMaxClauseCount());
+
MockOsgi.deactivate(service);
}
@@ -163,6 +166,15 @@ public class LuceneIndexProviderServiceT
assertNotNull(editorProvider.getExtractedTextCache().getExtractedTextProvider());
}
+ @Test
+ public void booleanQuerySize() throws Exception{
+ Map<String,Object> config = getDefaultConfig();
+ config.put("booleanClauseLimit", 4000);
+ MockOsgi.activate(service, context.bundleContext(), config);
+
+ assertEquals(4000, BooleanQuery.getMaxClauseCount());
+ }
+
private Map<String,Object> getDefaultConfig(){
Map<String,Object> config = new HashMap<String, Object>();
config.put("localIndexDir", folder.getRoot().getAbsolutePath());