diff --git a/be/src/olap/rowset/segment_v2/column_reader.cpp b/be/src/olap/rowset/segment_v2/column_reader.cpp index b4e46447280ecd..45ae123ae36d11 100644 --- a/be/src/olap/rowset/segment_v2/column_reader.cpp +++ b/be/src/olap/rowset/segment_v2/column_reader.cpp @@ -250,11 +250,14 @@ Status ColumnReader::new_inverted_index_iterator(const TabletIndex* index_meta, const StorageReadOptions& read_options, std::unique_ptr* iterator) { RETURN_IF_ERROR(_ensure_inverted_index_loaded(index_meta)); - if (_inverted_index) { - RETURN_IF_ERROR(_inverted_index->new_iterator(read_options.stats, - read_options.runtime_state, iterator)); + { + std::shared_lock rlock(_load_index_lock); + if (_inverted_index) { + RETURN_IF_ERROR(_inverted_index->new_iterator(read_options.stats, + read_options.runtime_state, iterator)); + } + return Status::OK(); } - return Status::OK(); } Status ColumnReader::read_page(const ColumnIteratorOptions& iter_opts, const PagePointer& pp, @@ -523,7 +526,7 @@ Status ColumnReader::_load_bitmap_index(bool use_page_cache, bool kept_in_memory } Status ColumnReader::_load_inverted_index_index(const TabletIndex* index_meta) { - std::lock_guard wlock(_load_index_lock); + std::unique_lock wlock(_load_index_lock); if (_inverted_index && index_meta && _inverted_index->get_index_id() == index_meta->index_id()) { diff --git a/be/src/olap/rowset/segment_v2/column_reader.h b/be/src/olap/rowset/segment_v2/column_reader.h index 492463a8ff02b8..deed1fec1fcafa 100644 --- a/be/src/olap/rowset/segment_v2/column_reader.h +++ b/be/src/olap/rowset/segment_v2/column_reader.h @@ -242,7 +242,7 @@ class ColumnReader { // meta for various column indexes (null if the index is absent) std::unique_ptr _segment_zone_map; - mutable std::mutex _load_index_lock; + mutable std::shared_mutex _load_index_lock; std::unique_ptr _zone_map_index; std::unique_ptr _ordinal_index; std::unique_ptr _bitmap_index;