[doris] 03/03: [fix](compile) fix vscan node compile error (#15805)

[morningman]

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

morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 6b69980c7531eee641cdf0cc737cbb706fbd9fbf
Author: AlexYue <yj976240...@gmail.com>
AuthorDate: Wed Jan 11 15:08:46 2023 +0800

    [fix](compile) fix vscan node compile error (#15805)
    
    conflict merge of #15604 and #15618
---
 be/src/vec/exec/scan/vmeta_scan_node.cpp | 4 ++--
 be/src/vec/exec/scan/vmeta_scanner.cpp   | 5 +++--
 be/src/vec/exec/scan/vmeta_scanner.h     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/be/src/vec/exec/scan/vmeta_scan_node.cpp 
b/be/src/vec/exec/scan/vmeta_scan_node.cpp
index ae7585ecf4..a404d9929b 100644
--- a/be/src/vec/exec/scan/vmeta_scan_node.cpp
+++ b/be/src/vec/exec/scan/vmeta_scan_node.cpp
@@ -52,8 +52,8 @@ Status VMetaScanNode::_init_scanners(std::list<VScanner*>* 
scanners) {
         return Status::OK();
     }
     for (auto& scan_range : _scan_ranges) {
-        VMetaScanner* scanner =
-                new VMetaScanner(_state, this, _tuple_id, scan_range, 
_limit_per_scanner);
+        VMetaScanner* scanner = new VMetaScanner(_state, this, _tuple_id, 
scan_range,
+                                                 _limit_per_scanner, 
runtime_profile());
         RETURN_IF_ERROR(scanner->prepare(_state, _vconjunct_ctx_ptr.get()));
         _scanner_pool.add(scanner);
         scanners->push_back(static_cast<VScanner*>(scanner));
diff --git a/be/src/vec/exec/scan/vmeta_scanner.cpp 
b/be/src/vec/exec/scan/vmeta_scanner.cpp
index c36d7877c0..89bd558ae6 100644
--- a/be/src/vec/exec/scan/vmeta_scanner.cpp
+++ b/be/src/vec/exec/scan/vmeta_scanner.cpp
@@ -28,8 +28,9 @@
 namespace doris::vectorized {
 
 VMetaScanner::VMetaScanner(RuntimeState* state, VMetaScanNode* parent, int64_t 
tuple_id,
-                           const TScanRangeParams& scan_range, int64_t limit)
-        : VScanner(state, static_cast<VScanNode*>(parent), limit),
+                           const TScanRangeParams& scan_range, int64_t limit,
+                           RuntimeProfile* profile)
+        : VScanner(state, static_cast<VScanNode*>(parent), limit, profile),
           _parent(parent),
           _meta_eos(false),
           _tuple_id(tuple_id),
diff --git a/be/src/vec/exec/scan/vmeta_scanner.h 
b/be/src/vec/exec/scan/vmeta_scanner.h
index 7663ffe1c8..63cd50fe10 100644
--- a/be/src/vec/exec/scan/vmeta_scanner.h
+++ b/be/src/vec/exec/scan/vmeta_scanner.h
@@ -26,7 +26,7 @@ namespace doris::vectorized {
 class VMetaScanner : public VScanner {
 public:
     VMetaScanner(RuntimeState* state, VMetaScanNode* parent, int64_t tuple_id,
-                 const TScanRangeParams& scan_range, int64_t limit);
+                 const TScanRangeParams& scan_range, int64_t limit, 
RuntimeProfile* profile);
 
     Status open(RuntimeState* state) override;
     Status close(RuntimeState* state) override;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org