[fix](compile) Resolve compile failure (apache#38593)

## Proposed changes Resolve conflicts by merging apache#38436 and apache#38403
hf200012 · Jul 31, 2024 · 4b4985d · 4b4985d
1 parent cd8348d
commit 4b4985d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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
@@ -36,7 +36,7 @@ class SchemaWorkloadGroupPrivilegesScanner : public SchemaScanner {
     ~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;