chore: remove redundant suffix BlockInputStream of debug string (#5759

) close #5760
pingcap · Sep 1, 2022 · 94fcc24 · 94fcc24
1 parent 5763aac
commit 94fcc24
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/dbms/src/DataStreams/HashJoinBuildBlockInputStream.h b/dbms/src/DataStreams/HashJoinBuildBlockInputStream.h
@@ -22,7 +22,7 @@ namespace DB
 {
 class HashJoinBuildBlockInputStream : public IProfilingBlockInputStream
 {
-    static constexpr auto NAME = "HashJoinBuildBlockInputStream";
+    static constexpr auto NAME = "HashJoinBuild";
 
 public:
     HashJoinBuildBlockInputStream(

diff --git a/dbms/src/DataStreams/TiRemoteBlockInputStream.h b/dbms/src/DataStreams/TiRemoteBlockInputStream.h
@@ -177,7 +177,7 @@ class TiRemoteBlockInputStream : public IProfilingBlockInputStream
     TiRemoteBlockInputStream(std::shared_ptr<RemoteReader> remote_reader_, const String & req_id, const String & executor_id, size_t stream_id_)
         : remote_reader(remote_reader_)
         , source_num(remote_reader->getSourceNum())
-        , name(fmt::format("TiRemoteBlockInputStream({})", RemoteReader::name))
+        , name(fmt::format("TiRemote({})", RemoteReader::name))
         , execution_summaries_inited(source_num)
         , log(Logger::get(name, req_id, executor_id))
         , total_rows(0)

diff --git a/dbms/src/Flash/Planner/tests/gtest_physical_plan.cpp b/dbms/src/Flash/Planner/tests/gtest_physical_plan.cpp
@@ -373,7 +373,7 @@ try
    <MockExchangeReceiver, exchange_receiver_1> | is_tidb_operator: true, schema: <s, Nullable(String)>, <join_c, Nullable(String)>)",
             /*expected_streams=*/R"(
 CreatingSets
- HashJoinBuildBlockInputStream: <join build, build_side_root_executor_id = exchange_receiver_1>, join_kind = Inner
+ HashJoinBuild: <join build, build_side_root_executor_id = exchange_receiver_1>, join_kind = Inner
   Expression: <append join key and join filters for build side>
    Expression: <final projection>
     MockExchangeReceiver
@@ -400,7 +400,7 @@ CreatingSets
    <MockExchangeReceiver, exchange_receiver_1> | is_tidb_operator: true, schema: <s, Nullable(String)>, <join_c, Nullable(String)>)",
             /*expected_streams=*/R"(
 CreatingSets
- HashJoinBuildBlockInputStream: <join build, build_side_root_executor_id = exchange_receiver_1>, join_kind = Left
+ HashJoinBuild: <join build, build_side_root_executor_id = exchange_receiver_1>, join_kind = Left
   Expression: <append join key and join filters for build side>
    Expression: <final projection>
     MockExchangeReceiver
@@ -427,7 +427,7 @@ CreatingSets
    <MockExchangeReceiver, exchange_receiver_1> | is_tidb_operator: true, schema: <s, Nullable(String)>, <join_c, Nullable(String)>)",
             /*expected_streams=*/R"(
 CreatingSets
- HashJoinBuildBlockInputStream: <join build, build_side_root_executor_id = exchange_receiver_1>, join_kind = Right
+ HashJoinBuild: <join build, build_side_root_executor_id = exchange_receiver_1>, join_kind = Right
   Expression: <append join key and join filters for build side>
    Expression: <final projection>
     MockExchangeReceiver
@@ -474,20 +474,20 @@ CreatingSets
      <MockTableScan, table_scan_3> | is_tidb_operator: true, schema: <a, Int32>, <b, Int32>)",
             /*expected_streams=*/R"(
 CreatingSets
- HashJoinBuildBlockInputStream x 2: <join build, build_side_root_executor_id = table_scan_3>, join_kind = Right
+ HashJoinBuild x 2: <join build, build_side_root_executor_id = table_scan_3>, join_kind = Right
   Expression: <append join key and join filters for build side>
    Expression: <final projection>
     MockTableScan
  Union: <for join>
-  HashJoinBuildBlockInputStream: <join build, build_side_root_executor_id = Join_5>, join_kind = Inner
+  HashJoinBuild: <join build, build_side_root_executor_id = Join_5>, join_kind = Inner
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      Expression: <remove useless column after join>
       HashJoinProbe: <join probe, join_executor_id = Join_5>
        Expression: <append join key and join filters for probe side>
         Expression: <final projection>
          MockTableScan
-  HashJoinBuildBlockInputStream: <join build, build_side_root_executor_id = Join_5>, join_kind = Inner
+  HashJoinBuild: <join build, build_side_root_executor_id = Join_5>, join_kind = Inner
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      Expression: <remove useless column after join>
@@ -544,20 +544,20 @@ CreatingSets
      <MockTableScan, table_scan_3> | is_tidb_operator: true, schema: <a, Int32>, <b, Int32>)",
             /*expected_streams=*/R"(
 CreatingSets
- HashJoinBuildBlockInputStream x 2: <join build, build_side_root_executor_id = table_scan_3>, join_kind = Right
+ HashJoinBuild x 2: <join build, build_side_root_executor_id = table_scan_3>, join_kind = Right
   Expression: <append join key and join filters for build side>
    Expression: <final projection>
     MockTableScan
  Union: <for join>
-  HashJoinBuildBlockInputStream: <join build, build_side_root_executor_id = Join_5>, join_kind = Left
+  HashJoinBuild: <join build, build_side_root_executor_id = Join_5>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      Expression: <remove useless column after join>
       HashJoinProbe: <join probe, join_executor_id = Join_5>
        Expression: <append join key and join filters for probe side>
         Expression: <final projection>
          MockTableScan
-  HashJoinBuildBlockInputStream: <join build, build_side_root_executor_id = Join_5>, join_kind = Left
+  HashJoinBuild: <join build, build_side_root_executor_id = Join_5>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      Expression: <remove useless column after join>

diff --git a/dbms/src/Flash/tests/gtest_interpreter.cpp b/dbms/src/Flash/tests/gtest_interpreter.cpp
@@ -416,12 +416,12 @@ try
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = table_scan_3>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = table_scan_3>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockTableScan
  Union x 2: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      Expression: <remove useless column after join>
@@ -458,12 +458,12 @@ CreatingSets
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = exchange_receiver_3>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = exchange_receiver_3>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockExchangeReceiver
  Union x 2: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      Expression: <remove useless column after join>
@@ -501,12 +501,12 @@ CreatingSets
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = exchange_receiver_3>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = exchange_receiver_3>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockExchangeReceiver
  Union x 2: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      Expression: <remove useless column after join>
@@ -542,7 +542,7 @@ try
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = table_scan_1>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = table_scan_1>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockTableScan
@@ -571,7 +571,7 @@ CreatingSets
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = table_scan_1>, join_kind = Right
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = table_scan_1>, join_kind = Right
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockTableScan
@@ -605,7 +605,7 @@ CreatingSets
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 20: <join build, build_side_root_executor_id = exchange_receiver_1>, join_kind = Right
+  HashJoinBuild x 20: <join build, build_side_root_executor_id = exchange_receiver_1>, join_kind = Right
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockExchangeReceiver

diff --git a/dbms/src/Flash/tests/gtest_planner_interpreter.cpp b/dbms/src/Flash/tests/gtest_planner_interpreter.cpp
@@ -446,7 +446,7 @@ MockExchangeSender
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = limit_2>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = limit_2>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      SharedQuery: <restore concurrency>
@@ -762,12 +762,12 @@ try
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = table_scan_3>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = table_scan_3>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockTableScan
  Union x 2: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      Expression: <remove useless column after join>
@@ -804,12 +804,12 @@ CreatingSets
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = exchange_receiver_3>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = exchange_receiver_3>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockExchangeReceiver
  Union x 2: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      Expression: <remove useless column after join>
@@ -847,12 +847,12 @@ CreatingSets
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = exchange_receiver_3>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = exchange_receiver_3>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockExchangeReceiver
  Union x 2: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = Join_4>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      Expression: <remove useless column after join>
@@ -888,7 +888,7 @@ try
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = table_scan_1>, join_kind = Left
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = table_scan_1>, join_kind = Left
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockTableScan
@@ -919,7 +919,7 @@ CreatingSets
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 10: <join build, build_side_root_executor_id = table_scan_1>, join_kind = Right
+  HashJoinBuild x 10: <join build, build_side_root_executor_id = table_scan_1>, join_kind = Right
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockTableScan
@@ -956,7 +956,7 @@ CreatingSets
         String expected = R"(
 CreatingSets
  Union: <for join>
-  HashJoinBuildBlockInputStream x 20: <join build, build_side_root_executor_id = exchange_receiver_1>, join_kind = Right
+  HashJoinBuild x 20: <join build, build_side_root_executor_id = exchange_receiver_1>, join_kind = Right
    Expression: <append join key and join filters for build side>
     Expression: <final projection>
      MockExchangeReceiver

diff --git a/dbms/src/Flash/tests/gtest_split_tasks.cpp b/dbms/src/Flash/tests/gtest_split_tasks.cpp
@@ -117,7 +117,7 @@ try
         " Expression: <final projection>\n"
         "  MockTableScan",
         "CreatingSets\n"
-        " HashJoinBuildBlockInputStream: <join build, build_side_root_executor_id = exchange_receiver_8>, join_kind = Left\n"
+        " HashJoinBuild: <join build, build_side_root_executor_id = exchange_receiver_8>, join_kind = Left\n"
         "  Expression: <append join key and join filters for build side>\n"
         "   Expression: <final projection>\n"
         "    MockExchangeReceiver\n"