Address comments from Andrew & Rick

yahoo · May 23, 2018 · 08670ac · 08670ac
1 parent 1af0a46
commit 08670ac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/...ain/java/com/yahoo/bard/webservice/data/filterbuilders/ConjunctionDruidFilterBuilder.java b/...ain/java/com/yahoo/bard/webservice/data/filterbuilders/ConjunctionDruidFilterBuilder.java
@@ -39,7 +39,7 @@ public abstract class ConjunctionDruidFilterBuilder implements DruidFilterBuilde
     private static final Logger LOG = LoggerFactory.getLogger(ConjunctionDruidFilterBuilder.class);
     private static final SystemConfig SYSTEM_CONFIG = SystemConfigProvider.getInstance();
 
-    private static final int DEFAULT_MAX_NUM_DRUID_FILTERS = 10;
+    private static final int DEFAULT_MAX_NUM_DRUID_FILTERS = 10000;
     private static final int MAX_NUM_DRUID_FILTERS = SYSTEM_CONFIG.getIntProperty(
             SYSTEM_CONFIG.getPackageVariableName("max_num_druid_filters"),
             DEFAULT_MAX_NUM_DRUID_FILTERS

diff --git a/fili-core/src/main/resources/moduleConfig.properties b/fili-core/src/main/resources/moduleConfig.properties
@@ -81,6 +81,9 @@ bard__lucene_index_path = [SET ME IN APPLICATION CONFIG]
 # Lucene search timeout in milliseconds
 bard__lucene_search_timeout_ms = 600000
 
+# Maximum number of druid filters in a Fili-generated Druid query
+bard__max_num_druid_filters = 10000
+
 # setting for maximum allowed results without any filters - used for /dim/values endpoint
 bard__max_results_without_filters = 10000
 

diff --git a/fili-core/src/test/resources/testApplicationConfig.properties b/fili-core/src/test/resources/testApplicationConfig.properties
@@ -74,6 +74,9 @@ bard__cache_partial_data = false
 # Lucene index files path
 bard__lucene_index_path = ./target/tmp/
 
+# Maximum number of druid filters in a Fili-generated Druid query
+bard__max_num_druid_filters = 10000
+
 # max results without filters
 # Default number of records per-page. This applies ONLY to the dimensions endpoint, NOT to the data endpoint. The
 # data endpoint does not paginate by default.