This is an automated email from the ASF dual-hosted git repository. dataroaring pushed a commit to branch branch-3.0 in repository https://gitbox.apache.org/repos/asf/doris.git
commit bc3fe701c2e5d7eb950756b7fbe01432f70569e7 Author: Gabriel <[email protected]> AuthorDate: Wed Jul 31 17:27:57 2024 +0800 [fix](compile) Resolve compile failure (#38593) ## Proposed changes Resolve conflicts by merging #38436 and #38403 <!--Describe your changes.--> --- be/src/exec/schema_scanner/schema_workload_group_privileges.cpp | 3 ++- be/src/exec/schema_scanner/schema_workload_group_privileges.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/be/src/exec/schema_scanner/schema_workload_group_privileges.cpp b/be/src/exec/schema_scanner/schema_workload_group_privileges.cpp index 88baddb550e..a1d4568d905 100644 --- a/be/src/exec/schema_scanner/schema_workload_group_privileges.cpp +++ b/be/src/exec/schema_scanner/schema_workload_group_privileges.cpp @@ -104,7 +104,8 @@ Status SchemaWorkloadGroupPrivilegesScanner::_get_workload_group_privs_block_fro return Status::OK(); } -Status SchemaWorkloadGroupPrivilegesScanner::get_next_block(vectorized::Block* block, bool* eos) { +Status SchemaWorkloadGroupPrivilegesScanner::get_next_block_internal(vectorized::Block* block, + bool* eos) { if (!_is_init) { return Status::InternalError("Used before initialized."); } diff --git a/be/src/exec/schema_scanner/schema_workload_group_privileges.h b/be/src/exec/schema_scanner/schema_workload_group_privileges.h index cdf3c9697b1..0a7bf1258ee 100644 --- a/be/src/exec/schema_scanner/schema_workload_group_privileges.h +++ b/be/src/exec/schema_scanner/schema_workload_group_privileges.h @@ -36,7 +36,7 @@ public: ~SchemaWorkloadGroupPrivilegesScanner() override; Status start(RuntimeState* state) override; - Status get_next_block(vectorized::Block* block, bool* eos) override; + Status get_next_block_internal(vectorized::Block* block, bool* eos) override; static std::vector<SchemaScanner::ColumnDesc> _s_tbls_columns; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
