This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/addQueryMetrics in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c35ccc4b9a9cd0d46174503827a39f5186195615 Author: Minghui Liu <[email protected]> AuthorDate: Fri Dec 16 11:36:12 2022 +0800 rename QueryPlanCostMetrics to QueryPlanCostMetricSet --- .../metric/{QueryPlanCostMetrics.java => QueryPlanCostMetricSet.java} | 2 +- .../java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 4 ++-- .../src/main/java/org/apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 2 +- .../java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java | 2 +- .../java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java | 2 +- .../java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java | 2 +- .../org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/metric/QueryPlanCostMetrics.java b/server/src/main/java/org/apache/iotdb/db/mpp/metric/QueryPlanCostMetricSet.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/mpp/metric/QueryPlanCostMetrics.java rename to server/src/main/java/org/apache/iotdb/db/mpp/metric/QueryPlanCostMetricSet.java index 122ba3ea23..d7abbd4428 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/metric/QueryPlanCostMetrics.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/metric/QueryPlanCostMetricSet.java @@ -29,7 +29,7 @@ import org.apache.iotdb.metrics.utils.MetricType; import java.util.Arrays; import java.util.List; -public class QueryPlanCostMetrics implements IMetricSet { +public class QueryPlanCostMetricSet implements IMetricSet { public static final String SQL_PARSER = "sql_parser"; public static final String ANALYZER = "analyzer"; 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 00d63837ef..5529692452 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 @@ -154,8 +154,8 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.LOSS; import static org.apache.iotdb.commons.conf.IoTDBConstant.ONE_LEVEL_PATH_WILDCARD; import static org.apache.iotdb.db.metadata.MetadataConstant.ALL_RESULT_NODES; import static org.apache.iotdb.db.mpp.common.header.ColumnHeaderConstant.DEVICE; -import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetrics.PARTITION_FETCHER; -import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetrics.SCHEMA_FETCHER; +import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetricSet.PARTITION_FETCHER; +import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetricSet.SCHEMA_FETCHER; import static org.apache.iotdb.db.mpp.plan.analyze.SelectIntoUtils.constructTargetDevice; import static org.apache.iotdb.db.mpp.plan.analyze.SelectIntoUtils.constructTargetMeasurement; import static org.apache.iotdb.db.mpp.plan.analyze.SelectIntoUtils.constructTargetPath; 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 54d6bc0e84..1a6782a5f3 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 @@ -25,7 +25,7 @@ import org.apache.iotdb.db.mpp.metric.QueryMetricsManager; import org.apache.iotdb.db.mpp.plan.statement.Statement; import static org.apache.iotdb.db.mpp.common.QueryId.mockQueryId; -import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetrics.ANALYZER; +import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetricSet.ANALYZER; /** Analyze the statement and generate Analysis. */ public class Analyzer { 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 23e8c75029..f621a4681d 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 @@ -82,7 +82,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Throwables.throwIfUnchecked; -import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetrics.DISTRIBUTION_PLANNER; +import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetricSet.DISTRIBUTION_PLANNER; import static org.apache.iotdb.db.mpp.plan.constant.DataNodeEndPoints.isSameNode; /** diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java index f69362f66a..d41b03e458 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java @@ -102,7 +102,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetrics.SQL_PARSER; +import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetricSet.SQL_PARSER; /** Convert SQL and RPC requests to {@link Statement}. */ public class StatementGenerator { 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 47d9b63e10..b3f65eec7c 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 @@ -27,7 +27,7 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode; import java.util.List; -import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetrics.LOGICAL_PLANNER; +import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetricSet.LOGICAL_PLANNER; /** Generate a logical plan for the statement. */ public class LogicalPlanner { diff --git a/server/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java b/server/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java index be59c2b288..920080ec39 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java +++ b/server/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.service.metrics; import org.apache.iotdb.commons.service.metric.MetricService; -import org.apache.iotdb.db.mpp.metric.QueryPlanCostMetrics; +import org.apache.iotdb.db.mpp.metric.QueryPlanCostMetricSet; import org.apache.iotdb.metrics.metricsets.jvm.JvmMetrics; import org.apache.iotdb.metrics.metricsets.logback.LogbackMetrics; @@ -34,6 +34,6 @@ public class DataNodeMetricsHelper { MetricService.getInstance().addMetricSet(new SystemMetrics(true)); // bind query related metrics - MetricService.getInstance().addMetricSet(new QueryPlanCostMetrics()); + MetricService.getInstance().addMetricSet(new QueryPlanCostMetricSet()); } }
