Userwhite commented on code in PR #11392:
URL: https://github.com/apache/doris/pull/11392#discussion_r949901209
##########
be/src/olap/rowset/beta_rowset_reader.cpp:
##########
@@ -59,27 +59,45 @@ Status BetaRowsetReader::init(RowsetReaderContext*
read_context) {
read_context->is_upper_keys_included->at(i));
}
}
+
+ bool can_reuse_schema = true;
// delete_hanlder is always set, but it maybe not init, so that it will
return empty conditions
// or predicates when it is not inited.
if (read_context->delete_handler != nullptr) {
read_context->delete_handler->get_delete_conditions_after_version(
_rowset->end_version(), &read_options.delete_conditions,
read_options.delete_condition_predicates.get());
+ can_reuse_schema = false;
}
- std::vector<uint32_t> read_columns;
- std::set<uint32_t> read_columns_set;
- std::set<uint32_t> delete_columns_set;
- for (int i = 0; i < _context->return_columns->size(); ++i) {
- read_columns.push_back(_context->return_columns->at(i));
- read_columns_set.insert(_context->return_columns->at(i));
- }
-
read_options.delete_condition_predicates->get_all_column_ids(delete_columns_set);
- for (auto cid : delete_columns_set) {
- if (read_columns_set.find(cid) == read_columns_set.end()) {
- read_columns.push_back(cid);
+
+ if (!can_reuse_schema || _context->reuse_input_schema == nullptr) {
+ std::vector<uint32_t> read_columns;
+ std::set<uint32_t> read_columns_set;
+ std::set<uint32_t> delete_columns_set;
+ for (int i = 0; i < _context->return_columns->size(); ++i) {
+ read_columns.push_back(_context->return_columns->at(i));
+ read_columns_set.insert(_context->return_columns->at(i));
+ }
+
read_options.delete_condition_predicates->get_all_column_ids(delete_columns_set);
+ for (auto cid : delete_columns_set) {
+ if (read_columns_set.find(cid) == read_columns_set.end()) {
+ read_columns.push_back(cid);
+ }
+ }
+ _input_schema =
std::make_shared<Schema>(_context->tablet_schema->columns(), read_columns);
+
+ if (can_reuse_schema) {
+ _context->reuse_input_schema = _input_schema;
}
}
- _input_schema =
std::make_unique<Schema>(_context->tablet_schema->columns(), read_columns);
+
+ // if can reuse schema, context must have reuse_input_schema
+ // if can't reuse schema, context mustn't have reuse_input_schema
+ DCHECK(can_reuse_schema ^ (_context->reuse_input_schema == nullptr));
+ if (_context->reuse_input_schema != nullptr) {
Review Comment:
fix
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
