This is an automated email from the ASF dual-hosted git repository.
zhangchen 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 ed85c441b7e [Fix](partial update) Fix wrong comment in .proto file
(#25742)
ed85c441b7e is described below
commit ed85c441b7e95a474d5241b30c76b3702b8393c2
Author: bobhan1 <bh2444151...@outlook.com>
AuthorDate: Mon Oct 23 14:39:54 2023 +0800
[Fix](partial update) Fix wrong comment in .proto file (#25742)
1. remove deprecated comment on fields that is wrongly added in #25147.
These fields will be used when coordinator BE send infos to executor BEs. They
will only be used during RPC and will not be persisted.
2. eliminate some unnecessary copys.
---
be/src/olap/rowset/segment_v2/segment_writer.cpp | 11 +++++------
gensrc/proto/descriptors.proto | 6 +++---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/segment_writer.cpp
b/be/src/olap/rowset/segment_v2/segment_writer.cpp
index cd6da019f21..3c76c206e6b 100644
--- a/be/src/olap/rowset/segment_v2/segment_writer.cpp
+++ b/be/src/olap/rowset/segment_v2/segment_writer.cpp
@@ -341,8 +341,8 @@ Status
SegmentWriter::append_block_with_partial_content(const vectorized::Block*
DCHECK(_opts.rowset_ctx->partial_update_info);
// find missing column cids
- std::vector<uint32_t> missing_cids =
_opts.rowset_ctx->partial_update_info->missing_cids;
- std::vector<uint32_t> including_cids =
_opts.rowset_ctx->partial_update_info->update_cids;
+ const auto& missing_cids =
_opts.rowset_ctx->partial_update_info->missing_cids;
+ const auto& including_cids =
_opts.rowset_ctx->partial_update_info->update_cids;
// create full block and fill with input columns
auto full_block = _tablet_schema->create_block();
@@ -499,10 +499,9 @@ Status
SegmentWriter::append_block_with_partial_content(const vectorized::Block*
}
// convert missing columns and send to column writer
- auto cids_missing = _opts.rowset_ctx->partial_update_info->missing_cids;
_olap_data_convertor->set_source_content_with_specifid_columns(&full_block,
row_pos, num_rows,
-
cids_missing);
- for (auto cid : cids_missing) {
+
missing_cids);
+ for (auto cid : missing_cids) {
auto converted_result = _olap_data_convertor->convert_column_data(cid);
if (!converted_result.first.ok()) {
return converted_result.first;
@@ -556,7 +555,7 @@ Status
SegmentWriter::fill_missing_columns(vectorized::MutableColumns& mutable_f
}
auto tablet = static_cast<Tablet*>(_tablet.get());
// create old value columns
- std::vector<uint32_t> cids_missing =
_opts.rowset_ctx->partial_update_info->missing_cids;
+ const auto& cids_missing =
_opts.rowset_ctx->partial_update_info->missing_cids;
auto old_value_block = _tablet_schema->create_block_by_cids(cids_missing);
CHECK(cids_missing.size() == old_value_block.columns());
auto mutable_old_columns = old_value_block.mutate_columns();
diff --git a/gensrc/proto/descriptors.proto b/gensrc/proto/descriptors.proto
index aeab7ace7c2..270199cc020 100644
--- a/gensrc/proto/descriptors.proto
+++ b/gensrc/proto/descriptors.proto
@@ -65,8 +65,8 @@ message POlapTableSchemaParam {
repeated PSlotDescriptor slot_descs = 4;
required PTupleDescriptor tuple_desc = 5;
repeated POlapTableIndexSchema indexes = 6;
- optional bool partial_update = 7; // deprecated
- repeated string partial_update_input_columns = 8; // deprecated
- optional bool is_strict_mode = 9 [default = false]; // deprecated
+ optional bool partial_update = 7 [default = false];
+ repeated string partial_update_input_columns = 8;
+ optional bool is_strict_mode = 9 [default = false];
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
