You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/07/21 10:55:53 UTC
[iotdb] branch xingtanzjr/agg_query_level updated: spotless
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/agg_query_level
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/xingtanzjr/agg_query_level by this push:
new 04d50c047d spotless
04d50c047d is described below
commit 04d50c047d077db0d10299c4eee331e27ea763c9
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Thu Jul 21 18:55:42 2022 +0800
spotless
---
.../apache/iotdb/db/mpp/plan/execution/QueryExecution.java | 12 ++++++------
.../mpp/plan/planner/distribution/DistributionPlanner.java | 1 -
.../db/mpp/plan/planner/distribution/SourceRewriter.java | 1 -
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
index eb6974865f..57d0bd6542 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
@@ -26,7 +26,6 @@ import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.utils.StatusUtils;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.exception.query.QueryTimeoutRuntimeException;
import org.apache.iotdb.db.mpp.common.MPPQueryContext;
import org.apache.iotdb.db.mpp.common.header.DatasetHeader;
import org.apache.iotdb.db.mpp.execution.QueryState;
@@ -171,11 +170,12 @@ public class QueryExecution implements IQueryExecution {
stateMachine.transitionToRunning();
return;
}
-// long remainTime = context.getTimeOut() - (System.currentTimeMillis() - context.getStartTime());
-// if (remainTime <= 0) {
-// throw new QueryTimeoutRuntimeException();
-// }
-// context.setTimeOut(remainTime);
+ // long remainTime = context.getTimeOut() - (System.currentTimeMillis() -
+ // context.getStartTime());
+ // if (remainTime <= 0) {
+ // throw new QueryTimeoutRuntimeException();
+ // }
+ // context.setTimeOut(remainTime);
doLogicalPlan();
doDistributedPlan();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/DistributionPlanner.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/DistributionPlanner.java
index 5365fe2bf8..2aad1c8a85 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/DistributionPlanner.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/DistributionPlanner.java
@@ -29,7 +29,6 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.LogicalQueryPlan;
import org.apache.iotdb.db.mpp.plan.planner.plan.PlanFragment;
import org.apache.iotdb.db.mpp.plan.planner.plan.SubPlan;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeUtil;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.WritePlanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.ExchangeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.sink.FragmentSinkNode;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java
index c0918156f8..ce20f83396 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java
@@ -53,7 +53,6 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.AggregationDescriptor
import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.AggregationStep;
import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.GroupByLevelDescriptor;
import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.OrderByParameter;
-import org.apache.ratis.thirdparty.io.opencensus.stats.Aggregation;
import java.util.ArrayList;
import java.util.Collections;