This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 673a0137ce8 [fix] (schema change) fix missing data bug in schema
change (#28938) (#29064)
673a0137ce8 is described below
commit 673a0137ce803b2c09f3e3c5ba4c4933c1fabd66
Author: Luwei <[email protected]>
AuthorDate: Sat Dec 30 20:45:58 2023 +0800
[fix] (schema change) fix missing data bug in schema change (#28938)
(#29064)
---
be/src/olap/schema_change.cpp | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/be/src/olap/schema_change.cpp b/be/src/olap/schema_change.cpp
index 7f18826b406..d19d399b1ef 100644
--- a/be/src/olap/schema_change.cpp
+++ b/be/src/olap/schema_change.cpp
@@ -470,6 +470,7 @@ Status
VSchemaChangeDirectly::_inner_process(RowsetReaderSharedPtr rowset_reader
TabletSharedPtr new_tablet,
TabletSchemaSPtr
base_tablet_schema,
TabletSchemaSPtr
new_tablet_schema) {
+ bool eof = false;
do {
auto new_block =
vectorized::Block::create_unique(new_tablet_schema->create_block());
auto ref_block =
vectorized::Block::create_unique(base_tablet_schema->create_block());
@@ -477,14 +478,15 @@ Status
VSchemaChangeDirectly::_inner_process(RowsetReaderSharedPtr rowset_reader
auto st = rowset_reader->next_block(ref_block.get());
if (!st) {
if (st.is<ErrorCode::END_OF_FILE>()) {
- break;
+ eof = true;
+ } else {
+ return st;
}
- return st;
}
RETURN_IF_ERROR(_changer.change_block(ref_block.get(),
new_block.get()));
RETURN_IF_ERROR(rowset_writer->add_block(new_block.get()));
- } while (true);
+ } while (!eof);
RETURN_IF_ERROR(rowset_writer->flush());
return Status::OK();
@@ -547,14 +549,16 @@ Status
VSchemaChangeWithSorting::_inner_process(RowsetReaderSharedPtr rowset_rea
auto new_block =
vectorized::Block::create_unique(new_tablet_schema->create_block());
+ bool eof = false;
do {
auto ref_block =
vectorized::Block::create_unique(base_tablet_schema->create_block());
auto st = rowset_reader->next_block(ref_block.get());
if (!st) {
if (st.is<ErrorCode::END_OF_FILE>()) {
- break;
+ eof = true;
+ } else {
+ return st;
}
- return st;
}
RETURN_IF_ERROR(_changer.change_block(ref_block.get(),
new_block.get()));
@@ -578,7 +582,7 @@ Status
VSchemaChangeWithSorting::_inner_process(RowsetReaderSharedPtr rowset_rea
// move unique ptr
blocks.push_back(vectorized::Block::create_unique(new_tablet_schema->create_block()));
swap(blocks.back(), new_block);
- } while (true);
+ } while (!eof);
RETURN_IF_ERROR(create_rowset());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
