Unify some calls in older changes

Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com>
pingcap · Feb 14, 2022 · 5dafba0 · 5dafba0
1 parent 1d78543
commit 5dafba0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/dbms/src/DataStreams/AggregatingBlockInputStream.h b/dbms/src/DataStreams/AggregatingBlockInputStream.h
@@ -17,6 +17,8 @@ namespace DB
   */
 class AggregatingBlockInputStream : public IProfilingBlockInputStream
 {
+    static constexpr auto NAME = "Aggregating";
+
 public:
     /** keys are taken from the GROUP BY part of the query
       * Aggregate functions are searched everywhere in the expression.
@@ -28,7 +30,7 @@ class AggregatingBlockInputStream : public IProfilingBlockInputStream
         const FileProviderPtr & file_provider_,
         bool final_,
         const LogWithPrefixPtr & log_)
-        : log(getMPPTaskLog(log_, name))
+        : log(getMPPTaskLog(log_, NAME))
         , params(params_)
         , aggregator(params, log)
         , file_provider{file_provider_}
@@ -37,9 +39,7 @@ class AggregatingBlockInputStream : public IProfilingBlockInputStream
         children.push_back(input);
     }
 
-    static constexpr auto name = "Aggregating";
-
-    String getName() const override { return name; }
+    String getName() const override { return NAME; }
 
     Block getHeader() const override;
 

diff --git a/dbms/src/DataStreams/ConcatBlockInputStream.h b/dbms/src/DataStreams/ConcatBlockInputStream.h
@@ -12,25 +12,25 @@ namespace DB
   */
 class ConcatBlockInputStream : public IProfilingBlockInputStream
 {
+    static constexpr auto NAME = "Concat";
+
 public:
     ConcatBlockInputStream(BlockInputStreams inputs_, const LogWithPrefixPtr & log_)
-        : log(getMPPTaskLog(log_, name))
+        : log(getMPPTaskLog(log_, NAME))
     {
         children.insert(children.end(), inputs_.begin(), inputs_.end());
         current_stream = children.begin();
     }
 
-    static constexpr auto name = "Concat";
-
-    String getName() const override { return name; }
+    String getName() const override { return NAME; }
 
     Block getHeader() const override { return children.at(0)->getHeader(); }
 
 protected:
     Block readImpl() override
     {
-        FilterPtr filter_;
-        return readImpl(filter_, false);
+        FilterPtr filter_ignored;
+        return readImpl(filter_ignored, false);
     }
 
     Block readImpl(FilterPtr & res_filter, bool return_filter) override

diff --git a/dbms/src/DataStreams/HashJoinBuildBlockInputStream.h b/dbms/src/DataStreams/HashJoinBuildBlockInputStream.h
@@ -9,20 +9,21 @@ namespace DB
 {
 class HashJoinBuildBlockInputStream : public IProfilingBlockInputStream
 {
+    static constexpr auto NAME = "HashJoinBuildBlockInputStream";
+
 public:
     HashJoinBuildBlockInputStream(
         const BlockInputStreamPtr & input,
         JoinPtr join_,
         size_t stream_index_,
         const LogWithPrefixPtr & log_)
         : stream_index(stream_index_)
-        , log(getMPPTaskLog(log_, name))
+        , log(getMPPTaskLog(log_, NAME))
     {
         children.push_back(input);
         join = join_;
     }
-    static constexpr auto name = "HashJoinBuildBlockInputStream";
-    String getName() const override { return name; }
+    String getName() const override { return NAME; }
     Block getHeader() const override { return children.back()->getHeader(); }
 
 protected:

diff --git a/dbms/src/DataStreams/PartialSortingBlockInputStream.h b/dbms/src/DataStreams/PartialSortingBlockInputStream.h
@@ -12,6 +12,8 @@ namespace DB
   */
 class PartialSortingBlockInputStream : public IProfilingBlockInputStream
 {
+    static constexpr auto NAME = "PartialSorting";
+
 public:
     /// limit - if not 0, then you can sort each block not completely, but only `limit` first rows by order.
     PartialSortingBlockInputStream(
@@ -21,14 +23,12 @@ class PartialSortingBlockInputStream : public IProfilingBlockInputStream
         size_t limit_ = 0)
         : description(description_)
         , limit(limit_)
-        , log(getMPPTaskLog(log_, name))
+        , log(getMPPTaskLog(log_, NAME))
     {
         children.push_back(input_);
     }
 
-    static constexpr auto name = "PartialSorting";
-
-    String getName() const override { return name; }
+    String getName() const override { return NAME; }
 
     bool isGroupedOutput() const override { return true; }
     bool isSortedOutput() const override { return true; }