This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 a6e2364f566 [cherrypick](branch21) pick some exception handleing pr in
page io (#40883)
a6e2364f566 is described below
commit a6e2364f56687be96d2ff9225febc07f89c33b1c
Author: yiguolei <676222...@qq.com>
AuthorDate: Mon Sep 16 08:56:43 2024 +0800
[cherrypick](branch21) pick some exception handleing pr in page io (#40883)
## Proposed changes
pick
https://github.com/apache/doris/pull/39536
https://github.com/apache/doris/pull/39913
https://github.com/apache/doris/pull/39964
https://github.com/apache/doris/pull/40020
---------
Co-authored-by: yiguolei <yiguo...@gmail.com>
---
be/src/olap/memtable.cpp | 7 +++++-
be/src/olap/memtable.h | 3 +++
be/src/olap/rowset/segment_creator.cpp | 2 +-
be/src/olap/rowset/segment_creator.h | 6 +++++-
be/src/olap/rowset/segment_v2/binary_dict_page.cpp | 14 ++++++------
be/src/olap/rowset/segment_v2/binary_dict_page.h | 2 +-
be/src/olap/rowset/segment_v2/binary_plain_page.h | 25 ++++++++++++----------
.../olap/rowset/segment_v2/binary_prefix_page.cpp | 23 +++++++++++---------
be/src/olap/rowset/segment_v2/binary_prefix_page.h | 2 +-
be/src/olap/rowset/segment_v2/bitshuffle_page.h | 5 +++--
be/src/olap/rowset/segment_v2/column_writer.cpp | 10 +++++----
.../rowset/segment_v2/frame_of_reference_page.h | 5 +++--
.../rowset/segment_v2/indexed_column_writer.cpp | 3 ++-
be/src/olap/rowset/segment_v2/page_builder.h | 3 ++-
be/src/olap/rowset/segment_v2/page_io.cpp | 4 ++--
be/src/olap/rowset/segment_v2/page_io.h | 11 +++++++++-
be/src/olap/rowset/segment_v2/plain_page.h | 18 ++++++++++------
be/src/olap/rowset/segment_v2/rle_page.h | 5 +++--
be/src/runtime/runtime_state.cpp | 9 --------
be/src/runtime/runtime_state.h | 4 ----
be/src/vec/common/schema_util.cpp | 12 +++--------
be/src/vec/sink/writer/vtablet_writer.cpp | 2 --
be/src/vec/sink/writer/vtablet_writer.h | 3 ---
.../apache/doris/load/loadv2/LoadLoadingTask.java | 8 -------
24 files changed, 97 insertions(+), 89 deletions(-)
diff --git a/be/src/olap/memtable.cpp b/be/src/olap/memtable.cpp
index 923849162db..a4df4b8f674 100644
--- a/be/src/olap/memtable.cpp
+++ b/be/src/olap/memtable.cpp
@@ -505,7 +505,7 @@ bool MemTable::need_agg() const {
return false;
}
-Status MemTable::to_block(std::unique_ptr<vectorized::Block>* res) {
+Status MemTable::_to_block(std::unique_ptr<vectorized::Block>* res) {
size_t same_keys_num = _sort();
if (_keys_type == KeysType::DUP_KEYS || same_keys_num == 0) {
if (_keys_type == KeysType::DUP_KEYS &&
_tablet_schema->num_key_columns() == 0) {
@@ -529,4 +529,9 @@ Status
MemTable::to_block(std::unique_ptr<vectorized::Block>* res) {
return Status::OK();
}
+Status MemTable::to_block(std::unique_ptr<vectorized::Block>* res) {
+ RETURN_IF_ERROR_OR_CATCH_EXCEPTION(_to_block(res));
+ return Status::OK();
+}
+
} // namespace doris
diff --git a/be/src/olap/memtable.h b/be/src/olap/memtable.h
index 916067ba119..70f7a9f22a0 100644
--- a/be/src/olap/memtable.h
+++ b/be/src/olap/memtable.h
@@ -205,6 +205,9 @@ private:
void _aggregate_two_row_in_block(vectorized::MutableBlock& mutable_block,
RowInBlock* new_row,
RowInBlock* row_in_skiplist);
+ // Used to wrapped by to_block to do exception handle logic
+ Status _to_block(std::unique_ptr<vectorized::Block>* res);
+
private:
int64_t _tablet_id;
bool _enable_unique_key_mow = false;
diff --git a/be/src/olap/rowset/segment_creator.cpp
b/be/src/olap/rowset/segment_creator.cpp
index 641b3253556..bf10ff3f1ed 100644
--- a/be/src/olap/rowset/segment_creator.cpp
+++ b/be/src/olap/rowset/segment_creator.cpp
@@ -85,7 +85,7 @@ Status SegmentFlusher::flush_single_block(const
vectorized::Block* block, int32_
return Status::OK();
}
-Status SegmentFlusher::_parse_variant_columns(vectorized::Block& block) {
+Status SegmentFlusher::_internal_parse_variant_columns(vectorized::Block&
block) {
size_t num_rows = block.rows();
if (num_rows == 0) {
return Status::OK();
diff --git a/be/src/olap/rowset/segment_creator.h
b/be/src/olap/rowset/segment_creator.h
index 93508e9629d..7fa69b2c57c 100644
--- a/be/src/olap/rowset/segment_creator.h
+++ b/be/src/olap/rowset/segment_creator.h
@@ -138,7 +138,11 @@ public:
bool need_buffering();
private:
- Status _parse_variant_columns(vectorized::Block& block);
+ // This method will catch exception when allocate memory failed
+ Status _parse_variant_columns(vectorized::Block& block) {
+ RETURN_IF_CATCH_EXCEPTION({ return
_internal_parse_variant_columns(block); });
+ }
+ Status _internal_parse_variant_columns(vectorized::Block& block);
Status _add_rows(std::unique_ptr<segment_v2::SegmentWriter>&
segment_writer,
const vectorized::Block* block, size_t row_offset, size_t
row_num);
Status _add_rows(std::unique_ptr<segment_v2::VerticalSegmentWriter>&
segment_writer,
diff --git a/be/src/olap/rowset/segment_v2/binary_dict_page.cpp
b/be/src/olap/rowset/segment_v2/binary_dict_page.cpp
index 52795f0338a..8270adfbde8 100644
--- a/be/src/olap/rowset/segment_v2/binary_dict_page.cpp
+++ b/be/src/olap/rowset/segment_v2/binary_dict_page.cpp
@@ -142,7 +142,7 @@ Status BinaryDictPageBuilder::add(const uint8_t* vals,
size_t* count) {
}
}
-OwnedSlice BinaryDictPageBuilder::finish() {
+Status BinaryDictPageBuilder::finish(OwnedSlice* slice) {
if (VLOG_DEBUG_IS_ON && _encoding_type == DICT_ENCODING) {
VLOG_DEBUG << "dict page size:" << _dict_builder->size();
}
@@ -150,11 +150,14 @@ OwnedSlice BinaryDictPageBuilder::finish() {
DCHECK(!_finished);
_finished = true;
- OwnedSlice data_slice = _data_page_builder->finish();
+ OwnedSlice data_slice;
+ RETURN_IF_ERROR(_data_page_builder->finish(&data_slice));
// TODO(gaodayue) separate page header and content to avoid this copy
- _buffer.append(data_slice.slice().data, data_slice.slice().size);
+ RETURN_IF_CATCH_EXCEPTION(
+ { _buffer.append(data_slice.slice().data,
data_slice.slice().size); });
encode_fixed32_le(&_buffer[0], _encoding_type);
- return _buffer.build();
+ *slice = _buffer.build();
+ return Status::OK();
}
Status BinaryDictPageBuilder::reset() {
@@ -183,8 +186,7 @@ uint64_t BinaryDictPageBuilder::size() const {
}
Status BinaryDictPageBuilder::get_dictionary_page(OwnedSlice* dictionary_page)
{
- *dictionary_page = _dict_builder->finish();
- return Status::OK();
+ return _dict_builder->finish(dictionary_page);
}
Status BinaryDictPageBuilder::get_first_value(void* value) const {
diff --git a/be/src/olap/rowset/segment_v2/binary_dict_page.h
b/be/src/olap/rowset/segment_v2/binary_dict_page.h
index 2a8467e7def..d069eb9f7ed 100644
--- a/be/src/olap/rowset/segment_v2/binary_dict_page.h
+++ b/be/src/olap/rowset/segment_v2/binary_dict_page.h
@@ -68,7 +68,7 @@ public:
Status add(const uint8_t* vals, size_t* count) override;
- OwnedSlice finish() override;
+ Status finish(OwnedSlice* slice) override;
Status reset() override;
diff --git a/be/src/olap/rowset/segment_v2/binary_plain_page.h
b/be/src/olap/rowset/segment_v2/binary_plain_page.h
index 3fe76c5d3ae..69d79fbcc5b 100644
--- a/be/src/olap/rowset/segment_v2/binary_plain_page.h
+++ b/be/src/olap/rowset/segment_v2/binary_plain_page.h
@@ -93,19 +93,22 @@ public:
return Status::OK();
}
- OwnedSlice finish() override {
+ Status finish(OwnedSlice* slice) override {
DCHECK(!_finished);
_finished = true;
- // Set up trailer
- for (uint32_t _offset : _offsets) {
- put_fixed32_le(&_buffer, _offset);
- }
- put_fixed32_le(&_buffer, _offsets.size());
- if (_offsets.size() > 0) {
- _copy_value_at(0, &_first_value);
- _copy_value_at(_offsets.size() - 1, &_last_value);
- }
- return _buffer.build();
+ RETURN_IF_CATCH_EXCEPTION({
+ // Set up trailer
+ for (uint32_t _offset : _offsets) {
+ put_fixed32_le(&_buffer, _offset);
+ }
+ put_fixed32_le(&_buffer, _offsets.size());
+ if (_offsets.size() > 0) {
+ _copy_value_at(0, &_first_value);
+ _copy_value_at(_offsets.size() - 1, &_last_value);
+ }
+ *slice = _buffer.build();
+ });
+ return Status::OK();
}
Status reset() override {
diff --git a/be/src/olap/rowset/segment_v2/binary_prefix_page.cpp
b/be/src/olap/rowset/segment_v2/binary_prefix_page.cpp
index 9d1ecdb9470..34eb14951ae 100644
--- a/be/src/olap/rowset/segment_v2/binary_prefix_page.cpp
+++ b/be/src/olap/rowset/segment_v2/binary_prefix_page.cpp
@@ -88,18 +88,21 @@ Status BinaryPrefixPageBuilder::add(const uint8_t* vals,
size_t* add_count) {
return Status::OK();
}
-OwnedSlice BinaryPrefixPageBuilder::finish() {
+Status BinaryPrefixPageBuilder::finish(OwnedSlice* slice) {
DCHECK(!_finished);
_finished = true;
- put_fixed32_le(&_buffer, (uint32_t)_count);
- uint8_t restart_point_internal = RESTART_POINT_INTERVAL;
- _buffer.append(&restart_point_internal, 1);
- auto restart_point_size = _restart_points_offset.size();
- for (uint32_t i = 0; i < restart_point_size; ++i) {
- put_fixed32_le(&_buffer, _restart_points_offset[i]);
- }
- put_fixed32_le(&_buffer, restart_point_size);
- return _buffer.build();
+ RETURN_IF_CATCH_EXCEPTION({
+ put_fixed32_le(&_buffer, (uint32_t)_count);
+ uint8_t restart_point_internal = RESTART_POINT_INTERVAL;
+ _buffer.append(&restart_point_internal, 1);
+ auto restart_point_size = _restart_points_offset.size();
+ for (uint32_t i = 0; i < restart_point_size; ++i) {
+ put_fixed32_le(&_buffer, _restart_points_offset[i]);
+ }
+ put_fixed32_le(&_buffer, restart_point_size);
+ *slice = _buffer.build();
+ });
+ return Status::OK();
}
const uint8_t* BinaryPrefixPageDecoder::_decode_value_lengths(const uint8_t*
ptr, uint32_t* shared,
diff --git a/be/src/olap/rowset/segment_v2/binary_prefix_page.h
b/be/src/olap/rowset/segment_v2/binary_prefix_page.h
index de4ec60070b..41deb4e6c1f 100644
--- a/be/src/olap/rowset/segment_v2/binary_prefix_page.h
+++ b/be/src/olap/rowset/segment_v2/binary_prefix_page.h
@@ -52,7 +52,7 @@ public:
Status add(const uint8_t* vals, size_t* add_count) override;
- OwnedSlice finish() override;
+ Status finish(OwnedSlice* slice) override;
Status reset() override {
_restart_points_offset.clear();
diff --git a/be/src/olap/rowset/segment_v2/bitshuffle_page.h
b/be/src/olap/rowset/segment_v2/bitshuffle_page.h
index 004e53f3e5c..168573c0d51 100644
--- a/be/src/olap/rowset/segment_v2/bitshuffle_page.h
+++ b/be/src/olap/rowset/segment_v2/bitshuffle_page.h
@@ -141,12 +141,13 @@ public:
return Status::OK();
}
- OwnedSlice finish() override {
+ Status finish(OwnedSlice* slice) override {
if (_count > 0) {
_first_value = cell(0);
_last_value = cell(_count - 1);
}
- return _finish(SIZE_OF_TYPE);
+ RETURN_IF_CATCH_EXCEPTION({ *slice = _finish(SIZE_OF_TYPE); });
+ return Status::OK();
}
Status reset() override {
diff --git a/be/src/olap/rowset/segment_v2/column_writer.cpp
b/be/src/olap/rowset/segment_v2/column_writer.cpp
index e463b883fd2..bdbfcdc2d41 100644
--- a/be/src/olap/rowset/segment_v2/column_writer.cpp
+++ b/be/src/olap/rowset/segment_v2/column_writer.cpp
@@ -70,9 +70,10 @@ public:
// Returns whether the building nullmap contains nullptr
bool has_null() const { return _has_null; }
- OwnedSlice finish() {
+ Status finish(OwnedSlice* slice) {
_rle_encoder.Flush();
- return _bitmap_buf.build();
+ RETURN_IF_CATCH_EXCEPTION({ *slice = _bitmap_buf.build(); });
+ return Status::OK();
}
void reset() {
@@ -723,14 +724,15 @@ Status ScalarColumnWriter::finish_current_page() {
// build data page body : encoded values + [nullmap]
std::vector<Slice> body;
- OwnedSlice encoded_values = _page_builder->finish();
+ OwnedSlice encoded_values;
+ RETURN_IF_ERROR(_page_builder->finish(&encoded_values));
RETURN_IF_ERROR(_page_builder->reset());
body.push_back(encoded_values.slice());
OwnedSlice nullmap;
if (_null_bitmap_builder != nullptr) {
if (is_nullable() && _null_bitmap_builder->has_null()) {
- nullmap = _null_bitmap_builder->finish();
+ RETURN_IF_ERROR(_null_bitmap_builder->finish(&nullmap));
body.push_back(nullmap.slice());
}
_null_bitmap_builder->reset();
diff --git a/be/src/olap/rowset/segment_v2/frame_of_reference_page.h
b/be/src/olap/rowset/segment_v2/frame_of_reference_page.h
index 4477912803b..5aedf126b55 100644
--- a/be/src/olap/rowset/segment_v2/frame_of_reference_page.h
+++ b/be/src/olap/rowset/segment_v2/frame_of_reference_page.h
@@ -54,11 +54,12 @@ public:
return Status::OK();
}
- OwnedSlice finish() override {
+ Status finish(OwnedSlice* slice) override {
DCHECK(!_finished);
_finished = true;
_encoder->flush();
- return _buf.build();
+ RETURN_IF_CATCH_EXCEPTION({ *slice = _buf.build(); });
+ return Status::OK();
}
Status reset() override {
diff --git a/be/src/olap/rowset/segment_v2/indexed_column_writer.cpp
b/be/src/olap/rowset/segment_v2/indexed_column_writer.cpp
index e1b238084a9..51606d81889 100644
--- a/be/src/olap/rowset/segment_v2/indexed_column_writer.cpp
+++ b/be/src/olap/rowset/segment_v2/indexed_column_writer.cpp
@@ -117,7 +117,8 @@ Status
IndexedColumnWriter::_finish_current_data_page(size_t& num_val) {
ordinal_t first_ordinal = _num_values - num_values_in_page;
// IndexedColumn doesn't have NULLs, thus data page body only contains
encoded values
- OwnedSlice page_body = _data_page_builder->finish();
+ OwnedSlice page_body;
+ RETURN_IF_ERROR(_data_page_builder->finish(&page_body));
RETURN_IF_ERROR(_data_page_builder->reset());
PageFooterPB footer;
diff --git a/be/src/olap/rowset/segment_v2/page_builder.h
b/be/src/olap/rowset/segment_v2/page_builder.h
index 61fa2eaf8e1..7e24c56796c 100644
--- a/be/src/olap/rowset/segment_v2/page_builder.h
+++ b/be/src/olap/rowset/segment_v2/page_builder.h
@@ -63,7 +63,8 @@ public:
// Finish building the current page, return the encoded data.
// This api should be followed by reset() before reusing the builder
- virtual OwnedSlice finish() = 0;
+ // It will return error status when memory allocated failed during finish
+ virtual Status finish(OwnedSlice* owned_slice) = 0;
// Get the dictionary page for dictionary encoding mode column.
virtual Status get_dictionary_page(OwnedSlice* dictionary_page) {
diff --git a/be/src/olap/rowset/segment_v2/page_io.cpp
b/be/src/olap/rowset/segment_v2/page_io.cpp
index cea4a23f742..07d5656ee8a 100644
--- a/be/src/olap/rowset/segment_v2/page_io.cpp
+++ b/be/src/olap/rowset/segment_v2/page_io.cpp
@@ -111,8 +111,8 @@ Status PageIO::write_page(io::FileWriter* writer, const
std::vector<Slice>& body
return Status::OK();
}
-Status PageIO::read_and_decompress_page(const PageReadOptions& opts,
PageHandle* handle,
- Slice* body, PageFooterPB* footer) {
+Status PageIO::read_and_decompress_page_(const PageReadOptions& opts,
PageHandle* handle,
+ Slice* body, PageFooterPB* footer) {
opts.sanity_check();
opts.stats->total_pages_num++;
diff --git a/be/src/olap/rowset/segment_v2/page_io.h
b/be/src/olap/rowset/segment_v2/page_io.h
index 31c81880dac..889dae6d34e 100644
--- a/be/src/olap/rowset/segment_v2/page_io.h
+++ b/be/src/olap/rowset/segment_v2/page_io.h
@@ -123,8 +123,17 @@ public:
// `handle' holds the memory of page data,
// `body' points to page body,
// `footer' stores the page footer.
+ // This method is exception safe, it will failed when allocate memory
failed.
static Status read_and_decompress_page(const PageReadOptions& opts,
PageHandle* handle,
- Slice* body, PageFooterPB* footer);
+ Slice* body, PageFooterPB* footer) {
+ RETURN_IF_CATCH_EXCEPTION(
+ { return read_and_decompress_page_(opts, handle, body,
footer); });
+ }
+
+private:
+ // An internal method that not deal with exception.
+ static Status read_and_decompress_page_(const PageReadOptions& opts,
PageHandle* handle,
+ Slice* body, PageFooterPB* footer);
};
} // namespace segment_v2
diff --git a/be/src/olap/rowset/segment_v2/plain_page.h
b/be/src/olap/rowset/segment_v2/plain_page.h
index af31275002a..28b1e96d206 100644
--- a/be/src/olap/rowset/segment_v2/plain_page.h
+++ b/be/src/olap/rowset/segment_v2/plain_page.h
@@ -59,14 +59,18 @@ public:
return Status::OK();
}
- OwnedSlice finish() override {
+ Status finish(OwnedSlice* slice) override {
encode_fixed32_le((uint8_t*)&_buffer[0], _count);
- if (_count > 0) {
- _first_value.assign_copy(&_buffer[PLAIN_PAGE_HEADER_SIZE],
SIZE_OF_TYPE);
- _last_value.assign_copy(&_buffer[PLAIN_PAGE_HEADER_SIZE + (_count
- 1) * SIZE_OF_TYPE],
- SIZE_OF_TYPE);
- }
- return _buffer.build();
+ RETURN_IF_CATCH_EXCEPTION({
+ if (_count > 0) {
+ _first_value.assign_copy(&_buffer[PLAIN_PAGE_HEADER_SIZE],
SIZE_OF_TYPE);
+ _last_value.assign_copy(
+ &_buffer[PLAIN_PAGE_HEADER_SIZE + (_count - 1) *
SIZE_OF_TYPE],
+ SIZE_OF_TYPE);
+ }
+ *slice = _buffer.build();
+ });
+ return Status::OK();
}
Status reset() override {
diff --git a/be/src/olap/rowset/segment_v2/rle_page.h
b/be/src/olap/rowset/segment_v2/rle_page.h
index 40ec587743c..d1974f18d39 100644
--- a/be/src/olap/rowset/segment_v2/rle_page.h
+++ b/be/src/olap/rowset/segment_v2/rle_page.h
@@ -94,14 +94,15 @@ public:
return Status::OK();
}
- OwnedSlice finish() override {
+ Status finish(OwnedSlice* slice) override {
DCHECK(!_finished);
_finished = true;
// here should Flush first and then encode the count header
// or it will lead to a bug if the header is less than 8 byte and the
data is small
_rle_encoder->Flush();
encode_fixed32_le(&_buf[0], _count);
- return _buf.build();
+ *slice = _buf.build();
+ return Status::OK();
}
Status reset() override {
diff --git a/be/src/runtime/runtime_state.cpp b/be/src/runtime/runtime_state.cpp
index 2713ee441dd..cdb5a65a977 100644
--- a/be/src/runtime/runtime_state.cpp
+++ b/be/src/runtime/runtime_state.cpp
@@ -463,15 +463,6 @@ Status
RuntimeState::append_error_msg_to_file(std::function<std::string()> line,
return Status::OK();
}
-int64_t RuntimeState::get_load_mem_limit() {
- // TODO: the code is abandoned, it can be deleted after v1.3
- if (_query_options.__isset.load_mem_limit && _query_options.load_mem_limit
> 0) {
- return _query_options.load_mem_limit;
- } else {
- return _query_mem_tracker->limit();
- }
-}
-
void RuntimeState::resize_op_id_to_local_state(int operator_size) {
_op_id_to_local_state.resize(-operator_size);
}
diff --git a/be/src/runtime/runtime_state.h b/be/src/runtime/runtime_state.h
index 8b8cbd85f0f..8243faa37ae 100644
--- a/be/src/runtime/runtime_state.h
+++ b/be/src/runtime/runtime_state.h
@@ -466,10 +466,6 @@ public:
std::vector<TErrorTabletInfo>& error_tablet_infos() { return
_error_tablet_infos; }
- // get mem limit for load channel
- // if load mem limit is not set, or is zero, using query mem limit instead.
- int64_t get_load_mem_limit();
-
// local runtime filter mgr, the runtime filter do not have remote target
or
// not need local merge should regist here. the instance exec finish, the
local
// runtime filter mgr can release the memory of local runtime filter
diff --git a/be/src/vec/common/schema_util.cpp
b/be/src/vec/common/schema_util.cpp
index bb7b64992de..61b98bafd48 100644
--- a/be/src/vec/common/schema_util.cpp
+++ b/be/src/vec/common/schema_util.cpp
@@ -545,15 +545,9 @@ Status _parse_variant_columns(Block& block, const
std::vector<int>& variant_pos,
Status parse_variant_columns(Block& block, const std::vector<int>& variant_pos,
const ParseContext& ctx) {
- try {
- // Parse each variant column from raw string column
- RETURN_IF_ERROR(vectorized::schema_util::_parse_variant_columns(block,
variant_pos, ctx));
- } catch (const doris::Exception& e) {
- // TODO more graceful, max_filter_ratio
- LOG(WARNING) << "encounter execption " << e.to_string();
- return Status::InternalError(e.to_string());
- }
- return Status::OK();
+ // Parse each variant column from raw string column
+ RETURN_IF_CATCH_EXCEPTION(
+ { return vectorized::schema_util::_parse_variant_columns(block,
variant_pos, ctx); });
}
void finalize_variant_columns(Block& block, const std::vector<int>&
variant_pos,
diff --git a/be/src/vec/sink/writer/vtablet_writer.cpp
b/be/src/vec/sink/writer/vtablet_writer.cpp
index e946a73bfed..576a2de9db5 100644
--- a/be/src/vec/sink/writer/vtablet_writer.cpp
+++ b/be/src/vec/sink/writer/vtablet_writer.cpp
@@ -413,7 +413,6 @@ void VNodeChannel::_open_internal(bool is_incremental) {
request->set_num_senders(_parent->_num_senders);
request->set_need_gen_rollup(false); // Useless but it is a required field
in pb
- request->set_load_mem_limit(_parent->_load_mem_limit);
request->set_load_channel_timeout_s(_parent->_load_channel_timeout_s);
request->set_is_high_priority(_parent->_is_high_priority);
request->set_sender_ip(BackendOptions::get_localhost());
@@ -1245,7 +1244,6 @@ Status VTabletWriter::_init(RuntimeState* state,
RuntimeProfile* profile) {
_max_wait_exec_timer = ADD_TIMER(profile, "MaxWaitExecTime");
_add_batch_number = ADD_COUNTER(profile, "NumberBatchAdded", TUnit::UNIT);
_num_node_channels = ADD_COUNTER(profile, "NumberNodeChannels",
TUnit::UNIT);
- _load_mem_limit = state->get_load_mem_limit();
#ifdef DEBUG
// check: tablet ids should be unique
diff --git a/be/src/vec/sink/writer/vtablet_writer.h
b/be/src/vec/sink/writer/vtablet_writer.h
index 603034cea6d..ba986fbc6d4 100644
--- a/be/src/vec/sink/writer/vtablet_writer.h
+++ b/be/src/vec/sink/writer/vtablet_writer.h
@@ -660,9 +660,6 @@ private:
RuntimeProfile::Counter* _add_batch_number = nullptr;
RuntimeProfile::Counter* _num_node_channels = nullptr;
- // load mem limit is for remote load channel
- int64_t _load_mem_limit = -1;
-
// the timeout of load channels opened by this tablet sink. in second
int64_t _load_channel_timeout_s = 0;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingTask.java
b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingTask.java
index d60c17233d7..14cd742be45 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingTask.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadLoadingTask.java
@@ -152,14 +152,6 @@ public class LoadLoadingTask extends LoadTask {
curCoordinator.setExecMemoryLimit(execMemLimit);
curCoordinator.setExecPipEngine(Config.enable_pipeline_load);
- /*
- * For broker load job, user only need to set mem limit by
'exec_mem_limit' property.
- * And the variable 'load_mem_limit' does not make any effect.
- * However, in order to ensure the consistency of semantics when
executing on the BE side,
- * and to prevent subsequent modification from incorrectly setting the
load_mem_limit,
- * here we use exec_mem_limit to directly override the load_mem_limit
property.
- */
- curCoordinator.setLoadMemLimit(execMemLimit);
curCoordinator.setMemTableOnSinkNode(enableMemTableOnSinkNode);
long leftTimeMs = getLeftTimeMs();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
