[iotdb] 02/03: resolve conflicts

[ja...@apache.org]

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

jackietien pushed a commit to branch QueryMetrics
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 1df99c2ec294942721c2ded87facba2bfb7f6105
Merge: d15fbff6c7 37e60f727d
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Mon Nov 7 14:46:43 2022 +0800

    resolve conflicts

 .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4   |  7 ++-
 .../assembly/resources/conf/logback-datanode.xml   |  2 +-
 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  |  8 +++
 .../apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 10 +++-
 .../db/mpp/plan/execution/QueryExecution.java      |  6 +++
 .../plan/execution/config/ConfigTaskVisitor.java   |  7 +++
 .../config/executor/ClusterConfigTaskExecutor.java | 16 ++++++
 .../config/executor/IConfigTaskExecutor.java       |  2 +
 .../executor/StandaloneConfigTaskExecutor.java     | 13 +++++
 .../mpp/plan/execution/config/sys/TracingTask.java | 41 +++++++++++++++
 .../iotdb/db/mpp/plan/parser/ASTVisitor.java       |  7 +++
 .../iotdb/db/mpp/plan/planner/LogicalPlanner.java  |  7 ++-
 .../planner/distribution/DistributionPlanner.java  | 17 ++++--
 .../db/mpp/plan/statement/StatementVisitor.java    |  5 ++
 .../mpp/plan/statement/sys/TracingStatement.java   | 60 ++++++++++++++++++++++
 .../iotdb/db/mpp/statistics/QueryStatistics.java   | 11 +++-
 .../service/thrift/impl/ClientRPCServiceImpl.java  |  9 +++-
 17 files changed, 216 insertions(+), 12 deletions(-)

diff --cc server/src/main/java/org/apache/iotdb/db/mpp/statistics/QueryStatistics.java
index abe9b512bc,1c69acedcc..55db559d19
--- 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,21 -46,13 +46,28 @@@ public class QueryStatistics 
  
    private final Map<String, OperationStatistic> operationStatistics = new ConcurrentHashMap<>();
  
 +  public static final String LOCAL_EXECUTION_PLANNER = "LocalExecutionPlanner";
 +
 +  public static final String QUERY_EXECUTION = "QueryExecution";
 +
 +  public static final String SERIES_SCAN_OPERATOR = "SeriesScanOperator";
 +
 +  public static final String ALIGNED_SERIES_SCAN_OPERATOR = "AlignedSeriesScanOperator";
 +
 +  public static final String AGG_SCAN_OPERATOR = "AbstractSeriesAggregationScanOperator";
 +
 +  public static final String FILTER_AND_PROJECT_OPERATOR = "FilterAndProjectOperator";
 +
 +  public static final String SINGLE_INPUT_AGG_OPERATOR = "SingleInputAggregationOperator";
 +
 +  public static final String PAGE_READER = "IPageReader";
+   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 =