This is an automated email from the ASF dual-hosted git repository. lta pushed a commit to branch cluster in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 305906a194d077202510010916c51656c7798c7d Author: lta <[email protected]> AuthorDate: Tue May 28 14:24:18 2019 +0800 fix a bug of aggre query and groupby query --- .../org/apache/iotdb/cluster/query/executor/ClusterQueryRouter.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterQueryRouter.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterQueryRouter.java index 9f9dc41..d56540e 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterQueryRouter.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/executor/ClusterQueryRouter.java @@ -108,6 +108,9 @@ public class ClusterQueryRouter extends AbstractQueryRouter { if (expression != null) { IExpression optimizedExpression = ExpressionOptimizer.getInstance() .optimize(expression, selectedSeries); + // update query expression of origin query plan, it's necessary. + queryManager.getOriginQueryPlan().setExpression(optimizedExpression); + AggregateEngineExecutor engineExecutor = new ClusterAggregateEngineExecutor( selectedSeries, aggres, optimizedExpression, queryManager); if (optimizedExpression.getType() == ExpressionType.GLOBAL_TIME) { @@ -166,6 +169,9 @@ public class ClusterQueryRouter extends AbstractQueryRouter { IExpression optimizedExpression = ExpressionOptimizer.getInstance() .optimize(expression, selectedSeries); + // update query expression of origin query plan, it's necessary. + queryManager.getOriginQueryPlan().setExpression(optimizedExpression); + try { if (optimizedExpression.getType() == ExpressionType.GLOBAL_TIME) { queryManager.initQueryResource(QueryType.GLOBAL_TIME, getReadDataConsistencyLevel());
