renamed getFilter to getDruidFilter

yahoo · Aug 16, 2017 · f3345d0 · f3345d0
1 parent 031252a
commit f3345d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/fili-core/src/main/java/com/yahoo/bard/webservice/data/DruidQueryBuilder.java b/fili-core/src/main/java/com/yahoo/bard/webservice/data/DruidQueryBuilder.java
@@ -126,7 +126,7 @@ public DruidAggregationQuery<?> buildQuery(
                     request.getGranularity(),
                     request.getTimeZone(),
                     request.getDimensions(),
-                    request.getFilter(),
+                    request.getDruidFilter(),
                     request.getIntervals(),
                     druidTopNMetric,
                     request.getTopN().getAsInt()
@@ -137,7 +137,7 @@ public DruidAggregationQuery<?> buildQuery(
                         table,
                         request.getGranularity(),
                         request.getTimeZone(),
-                        request.getFilter(),
+                        request.getDruidFilter(),
                         request.getIntervals()
                 ) :
                 buildGroupByQuery(
@@ -146,7 +146,7 @@ public DruidAggregationQuery<?> buildQuery(
                         request.getGranularity(),
                         request.getTimeZone(),
                         request.getDimensions(),
-                        request.getFilter(),
+                        request.getDruidFilter(),
                         request.getHaving(),
                         request.getIntervals(),
                         druidOrderBy

diff --git a/fili-core/src/main/java/com/yahoo/bard/webservice/web/DataApiRequest.java b/fili-core/src/main/java/com/yahoo/bard/webservice/web/DataApiRequest.java
@@ -1020,7 +1020,7 @@ public Map<Dimension, Set<ApiFilter>> getApiFilters() {
     *
     * @return the Druid filter
     */
-    public Filter getFilter() {
+    public Filter getDruidFilter() {
         try (TimedPhase timer = RequestLog.startTiming("BuildingDruidFilter")) {
             return filterBuilder.buildFilters(this.apiFilters);
         } catch (DimensionRowNotFoundException e) {

diff --git a/fili-core/src/main/java/com/yahoo/bard/webservice/web/endpoints/DataServlet.java b/fili-core/src/main/java/com/yahoo/bard/webservice/web/endpoints/DataServlet.java
@@ -419,7 +419,7 @@ public void getData(
 
             try (TimedPhase timer = RequestLog.startTiming("logRequestMetrics")) {
                 logRequestMetrics(apiRequest, readCache, druidQuery);
-                RequestLog.record(new DruidFilterInfo(apiRequest.getFilter()));
+                RequestLog.record(new DruidFilterInfo(apiRequest.getDruidFilter()));
             }
 
             // Process the request