[incubator-druid] branch master updated: fix circular reference in moving average query (#8192)

[cwylie]

This is an automated email from the ASF dual-hosted git repository.

cwylie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git


The following commit(s) were added to refs/heads/master by this push:
     new 80a0fbf  fix circular reference in moving average query (#8192)
80a0fbf is described below

commit 80a0fbf254fbeeb28107e422ec48794776a375be
Author: Eyal Yurman <eyurma...@oath.com>
AuthorDate: Mon Jul 29 22:31:44 2019 -0700

    fix circular reference in moving average query (#8192)
---
 .../query/movingaverage/MovingAverageQueryToolChest.java      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java
 
b/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java
index b0e14af..c421c29 100644
--- 
a/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java
+++ 
b/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java
@@ -44,7 +44,7 @@ import java.util.Map;
 public class MovingAverageQueryToolChest extends QueryToolChest<Row, 
MovingAverageQuery>
 {
 
-  private final QuerySegmentWalker walker;
+  private final Provider<QuerySegmentWalker> walkerProvider;
   private final RequestLogger requestLogger;
 
   private final MovingAverageQueryMetricsFactory 
movingAverageQueryMetricsFactory;
@@ -53,14 +53,13 @@ public class MovingAverageQueryToolChest extends 
QueryToolChest<Row, MovingAvera
    * Construct a MovingAverageQueryToolChest for processing moving-average 
queries.
    * MovingAverage queries are expected to be processed on broker nodes and 
never hit historical nodes.
    *
-   * @param walker
+   * @param walkerProvider
    * @param requestLogger
    */
   @Inject
-  public MovingAverageQueryToolChest(Provider<QuerySegmentWalker> walker, 
RequestLogger requestLogger)
+  public MovingAverageQueryToolChest(Provider<QuerySegmentWalker> 
walkerProvider, RequestLogger requestLogger)
   {
-
-    this.walker = walker.get();
+    this.walkerProvider = walkerProvider;
     this.requestLogger = requestLogger;
     this.movingAverageQueryMetricsFactory = 
DefaultMovingAverageQueryMetricsFactory.instance();
   }
@@ -68,7 +67,7 @@ public class MovingAverageQueryToolChest extends 
QueryToolChest<Row, MovingAvera
   @Override
   public QueryRunner<Row> mergeResults(QueryRunner<Row> runner)
   {
-    return new MovingAverageQueryRunner(walker, requestLogger);
+    return new MovingAverageQueryRunner(walkerProvider.get(), requestLogger);
   }
 
   @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org