Skip to content

Commit bc3fe70

Browse files
Gabriel39dataroaring
authored andcommitted
[fix](compile) Resolve compile failure (#38593)
## Proposed changes Resolve conflicts by merging #38436 and #38403 <!--Describe your changes.-->
1 parent 07af360 commit bc3fe70

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

be/src/exec/schema_scanner/schema_workload_group_privileges.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ Status SchemaWorkloadGroupPrivilegesScanner::_get_workload_group_privs_block_fro
104104
return Status::OK();
105105
}
106106

107-
Status SchemaWorkloadGroupPrivilegesScanner::get_next_block(vectorized::Block* block, bool* eos) {
107+
Status SchemaWorkloadGroupPrivilegesScanner::get_next_block_internal(vectorized::Block* block,
108+
bool* eos) {
108109
if (!_is_init) {
109110
return Status::InternalError("Used before initialized.");
110111
}

be/src/exec/schema_scanner/schema_workload_group_privileges.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class SchemaWorkloadGroupPrivilegesScanner : public SchemaScanner {
3636
~SchemaWorkloadGroupPrivilegesScanner() override;
3737

3838
Status start(RuntimeState* state) override;
39-
Status get_next_block(vectorized::Block* block, bool* eos) override;
39+
Status get_next_block_internal(vectorized::Block* block, bool* eos) override;
4040

4141
static std::vector<SchemaScanner::ColumnDesc> _s_tbls_columns;
4242

0 commit comments

Comments
 (0)