Skip to content

Commit

Permalink
[fix](compile) Resolve compile failure (apache#38593)
Browse files Browse the repository at this point in the history
## Proposed changes

Resolve conflicts by merging apache#38436 and apache#38403

<!--Describe your changes.-->
  • Loading branch information
Gabriel39 authored and feiniaofeiafei committed Aug 9, 2024
1 parent cf28baa commit 7f40d07
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 7f40d07

Please sign in to comment.