This is an automated email from the ASF dual-hosted git repository.
panxiaolei pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new ea6298d74e5 [Improvements](status) catch some error status (#25732)
ea6298d74e5 is described below
commit ea6298d74e55c9ea85217919fdc21821dd160b0a
Author: Pxl <[email protected]>
AuthorDate: Mon Oct 23 10:29:46 2023 +0800
[Improvements](status) catch some error status (#25732)
catch some error status
---
be/src/olap/schema_change.cpp | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/be/src/olap/schema_change.cpp b/be/src/olap/schema_change.cpp
index 33a9f6fee87..e85628aa1e0 100644
--- a/be/src/olap/schema_change.cpp
+++ b/be/src/olap/schema_change.cpp
@@ -482,9 +482,12 @@ Status
VSchemaChangeDirectly::_inner_process(RowsetReaderSharedPtr rowset_reader
vectorized::Block::create_unique(new_tablet->tablet_schema()->create_block());
auto ref_block =
vectorized::Block::create_unique(base_tablet_schema->create_block());
- rowset_reader->next_block(ref_block.get());
- if (ref_block->rows() == 0) {
- break;
+ auto st = rowset_reader->next_block(ref_block.get());
+ if (!st) {
+ if (st.is<ErrorCode::END_OF_FILE>()) {
+ break;
+ }
+ return st;
}
RETURN_IF_ERROR(_changer.change_block(ref_block.get(),
new_block.get()));
@@ -552,9 +555,12 @@ Status
VSchemaChangeWithSorting::_inner_process(RowsetReaderSharedPtr rowset_rea
do {
auto ref_block =
vectorized::Block::create_unique(base_tablet_schema->create_block());
- rowset_reader->next_block(ref_block.get());
- if (ref_block->rows() == 0) {
- break;
+ auto st = rowset_reader->next_block(ref_block.get());
+ if (!st) {
+ if (st.is<ErrorCode::END_OF_FILE>()) {
+ break;
+ }
+ return st;
}
RETURN_IF_ERROR(_changer.change_block(ref_block.get(),
new_block.get()));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
