This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch QueryMetrics
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/QueryMetrics by this push:
new fd658370d0 unified code style
fd658370d0 is described below
commit fd658370d06e23fb2e0c88ca23cc0bedc625b564
Author: Minghui Liu <[email protected]>
AuthorDate: Mon Nov 7 11:13:21 2022 +0800
unified code style
---
.../java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 5 +++--
.../main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 3 ++-
.../org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java | 3 ++-
.../java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java | 3 ++-
.../db/mpp/plan/planner/distribution/DistributionPlanner.java | 3 ++-
.../java/org/apache/iotdb/db/mpp/statistics/QueryStatistics.java | 8 ++++++++
.../apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java | 3 ++-
7 files changed, 21 insertions(+), 7 deletions(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
index 392e0ae6d9..bb37b2fd6d 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
@@ -204,7 +204,7 @@ public class AnalyzeVisitor extends
StatementVisitor<Analysis, MPPQueryContext>
} else {
schemaTree = schemaFetcher.fetchSchema(patternTree);
}
- QueryStatistics.getInstance().addCost("SchemaFetcher", System.nanoTime()
- t1);
+ QueryStatistics.getInstance().addCost(QueryStatistics.SCHEMA_FETCHER,
System.nanoTime() - t1);
logger.debug("[EndFetchSchema]");
// If there is no leaf node in the schema tree, the query should be
completed immediately
@@ -285,7 +285,8 @@ public class AnalyzeVisitor extends
StatementVisitor<Analysis, MPPQueryContext>
// fetch partition information
long t2 = System.nanoTime();
analyzeDataPartition(analysis, queryStatement, schemaTree);
- QueryStatistics.getInstance().addCost("PartitionFetcher",
System.nanoTime() - t2);
+ QueryStatistics.getInstance()
+ .addCost(QueryStatistics.PARTITION_FETCHER, System.nanoTime() - t2);
} catch (StatementAnalyzeException e) {
logger.error("Meet error when analyzing the query statement: ", e);
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java
index 6fed101bc3..a699b71e23 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java
@@ -45,7 +45,8 @@ public class Analyzer {
Analysis analysis =
new AnalyzeVisitor(partitionFetcher, schemaFetcher).process(statement,
context);
if (statement.isQuery()) {
- QueryStatistics.getInstance().addCost("Analyzer", System.nanoTime() -
startTime);
+ QueryStatistics.getInstance()
+ .addCost(QueryStatistics.ANALYZER, System.nanoTime() - startTime);
}
return analysis;
}
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 6ba4449df0..adc7c17f7f 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
@@ -288,7 +288,8 @@ public class QueryExecution implements IQueryExecution {
internalServiceClientManager);
this.scheduler.start();
if (rawStatement.isQuery()) {
- QueryStatistics.getInstance().addCost("Dispatcher", System.nanoTime() -
startTime);
+ QueryStatistics.getInstance()
+ .addCost(QueryStatistics.DISPATCHER, System.nanoTime() - startTime);
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java
index a894c8ddf0..1632e1546b 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java
@@ -44,7 +44,8 @@ public class LogicalPlanner {
// optimize the query logical plan
if (analysis.getStatement().isQuery()) {
- QueryStatistics.getInstance().addCost("LogicalPlanner",
System.nanoTime() - startTime);
+ QueryStatistics.getInstance()
+ .addCost(QueryStatistics.LOGICAL_PLANNER, System.nanoTime() -
startTime);
for (PlanOptimizer optimizer : optimizers) {
rootNode = optimizer.optimize(rootNode, context);
}
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 2b2a69188c..3d6af25add 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
@@ -87,7 +87,8 @@ public class DistributionPlanner {
logicalPlan.getContext(), subPlan, subPlan.getPlanFragmentList(),
fragmentInstances);
if (analysis.getStatement().isQuery()) {
- QueryStatistics.getInstance().addCost("DistributionPlanner",
System.nanoTime() - startTime);
+ QueryStatistics.getInstance()
+ .addCost(QueryStatistics.DISTRIBUTION_PLANNER, System.nanoTime() -
startTime);
}
return distributedQueryPlan;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/statistics/QueryStatistics.java
b/server/src/main/java/org/apache/iotdb/db/mpp/statistics/QueryStatistics.java
index df2340e335..1c69acedcc 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/statistics/QueryStatistics.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/statistics/QueryStatistics.java
@@ -46,6 +46,14 @@ public class QueryStatistics {
private final Map<String, OperationStatistic> operationStatistics = new
ConcurrentHashMap<>();
+ public static final String PARSER = "Parser";
+ public static final String ANALYZER = "Analyzer";
+ public static final String SCHEMA_FETCHER = "SchemaFetcher";
+ public static final String PARTITION_FETCHER = "PartitionFetcher";
+ public static final String LOGICAL_PLANNER = "LogicalPlanner";
+ public static final String DISTRIBUTION_PLANNER = "DistributionPlanner";
+ public static final String DISPATCHER = "Dispatcher";
+
private QueryStatistics() {
ScheduledExecutorService scheduledExecutor =
IoTDBThreadPoolFactory.newScheduledThreadPool(1,
"Query-Statistics-Print");
diff --git
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
index 4ab5592612..5110d4ff46 100644
---
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
+++
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
@@ -203,7 +203,8 @@ public class ClientRPCServiceImpl implements
IClientRPCServiceWithHandler {
}
if (s.isQuery()) {
- QueryStatistics.getInstance().addCost("Parser", System.nanoTime() -
startTimeInNano);
+ QueryStatistics.getInstance()
+ .addCost(QueryStatistics.PARSER, System.nanoTime() -
startTimeInNano);
}
// permission check
