This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 17cf34b244a [Fix](multi-catalog) Fix core in orc and parquet reader
sometimes after low mem exception. (#36575)
17cf34b244a is described below
commit 17cf34b244a92b5c2e9da2d1fe3ddc052855facd
Author: Qi Chen <kaka11.c...@gmail.com>
AuthorDate: Sat Jun 22 11:28:21 2024 +0800
[Fix](multi-catalog) Fix core in orc and parquet reader sometimes after low
mem exception. (#36575)
## Proposed changes
Backport #36574.
---
be/src/vec/exec/format/orc/vorc_reader.cpp | 2 --
be/src/vec/exec/format/parquet/vparquet_reader.cpp | 1 -
2 files changed, 3 deletions(-)
diff --git a/be/src/vec/exec/format/orc/vorc_reader.cpp
b/be/src/vec/exec/format/orc/vorc_reader.cpp
index 16909f0023a..6e4f5674e29 100644
--- a/be/src/vec/exec/format/orc/vorc_reader.cpp
+++ b/be/src/vec/exec/format/orc/vorc_reader.cpp
@@ -1594,7 +1594,6 @@ Status OrcReader::get_next_block_impl(Block* block,
size_t* read_rows, bool* eof
} catch (std::exception& e) {
std::string _err_msg = e.what();
if (_io_ctx && _io_ctx->should_stop && _err_msg == "stop") {
- block->clear_column_data();
*eof = true;
*read_rows = 0;
return Status::OK();
@@ -1664,7 +1663,6 @@ Status OrcReader::get_next_block_impl(Block* block,
size_t* read_rows, bool* eof
} catch (std::exception& e) {
std::string _err_msg = e.what();
if (_io_ctx && _io_ctx->should_stop && _err_msg == "stop") {
- block->clear_column_data();
*eof = true;
*read_rows = 0;
return Status::OK();
diff --git a/be/src/vec/exec/format/parquet/vparquet_reader.cpp
b/be/src/vec/exec/format/parquet/vparquet_reader.cpp
index f99786dc6e2..db3399eb0dd 100644
--- a/be/src/vec/exec/format/parquet/vparquet_reader.cpp
+++ b/be/src/vec/exec/format/parquet/vparquet_reader.cpp
@@ -525,7 +525,6 @@ Status ParquetReader::get_next_block(Block* block, size_t*
read_rows, bool* eof)
Status batch_st =
_current_group_reader->next_batch(block, _batch_size, read_rows,
&_row_group_eof);
if (batch_st.is<ErrorCode::END_OF_FILE>()) {
- block->clear_column_data();
_current_group_reader.reset(nullptr);
*read_rows = 0;
*eof = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
