This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch dev-1.0.1 in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit 44a87a141c2904f6e2a442267d53fe5b6e0a8540 Author: dataroaring <[email protected]> AuthorDate: Fri Mar 18 09:34:49 2022 +0800 [refactor] CalcPageLenForRow return void rather than always Status::Ok (#8490) Thus we can remove branches depending on CalcPageLenForRow. --- be/src/runtime/buffered_tuple_stream3.cc | 10 +++------- be/src/runtime/buffered_tuple_stream3.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/be/src/runtime/buffered_tuple_stream3.cc b/be/src/runtime/buffered_tuple_stream3.cc index 9a7d8d6..277a08d 100644 --- a/be/src/runtime/buffered_tuple_stream3.cc +++ b/be/src/runtime/buffered_tuple_stream3.cc @@ -374,9 +374,8 @@ Status BufferedTupleStream3::NewWritePage(int64_t page_len) noexcept { return Status::OK(); } -Status BufferedTupleStream3::CalcPageLenForRow(int64_t row_size, int64_t* page_len) { +void BufferedTupleStream3::CalcPageLenForRow(int64_t row_size, int64_t* page_len) { *page_len = std::max(default_page_len_, BitUtil::RoundUpToPowerOfTwo(row_size)); - return Status::OK(); } Status BufferedTupleStream3::AdvanceWritePage(int64_t row_size, bool* got_reservation) noexcept { @@ -385,10 +384,7 @@ Status BufferedTupleStream3::AdvanceWritePage(int64_t row_size, bool* got_reserv int64_t page_len; - Status status = CalcPageLenForRow(row_size, &page_len); - if (!status.ok()) { - return status; - } + CalcPageLenForRow(row_size, &page_len); // Reservation may have been saved for the next write page, e.g. by PrepareForWrite() // if the stream is empty. @@ -430,7 +426,7 @@ Status BufferedTupleStream3::AdvanceWritePage(int64_t row_size, bool* got_reserv } ResetWritePage(); //RETURN_IF_ERROR(NewWritePage(page_len)); - status = NewWritePage(page_len); + Status status = NewWritePage(page_len); if (UNLIKELY(!status.ok())) { return status; } diff --git a/be/src/runtime/buffered_tuple_stream3.h b/be/src/runtime/buffered_tuple_stream3.h index 7d8f053..927382c 100644 --- a/be/src/runtime/buffered_tuple_stream3.h +++ b/be/src/runtime/buffered_tuple_stream3.h @@ -562,7 +562,7 @@ private: /// Determines what page size is needed to fit a row of 'row_size' bytes. /// Returns an error if the row cannot fit in a page. - Status CalcPageLenForRow(int64_t row_size, int64_t* page_len); + void CalcPageLenForRow(int64_t row_size, int64_t* page_len); /// Wrapper around NewWritePage() that allocates a new write page that fits a row of /// 'row_size' bytes. Increases reservation if needed to allocate the next page. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
