From 07cdd75f4acde916101442dabd6252f5dfdfb05e Mon Sep 17 00:00:00 2001
From: airborne12 <airborne08@gmail.com>
Date: Thu, 16 May 2024 10:12:02 +0800
Subject: [PATCH 1/2] [Fix](inverted index) fix race condition for column
 reader load inverted index reader (#34922)

---
 be/src/olap/rowset/segment_v2/column_reader.cpp | 10 ++++++----
 be/src/olap/rowset/segment_v2/column_reader.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/be/src/olap/rowset/segment_v2/column_reader.cpp b/be/src/olap/rowset/segment_v2/column_reader.cpp
index b4e46447280ecd..e61aadd265465e 100644
--- a/be/src/olap/rowset/segment_v2/column_reader.cpp
+++ b/be/src/olap/rowset/segment_v2/column_reader.cpp
@@ -250,9 +250,11 @@ Status ColumnReader::new_inverted_index_iterator(const TabletIndex* index_meta,
                                                  const StorageReadOptions& read_options,
                                                  std::unique_ptr<InvertedIndexIterator>* 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<std::shared_mutex> 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();
 }
@@ -523,7 +525,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<std::mutex> wlock(_load_index_lock);
+    std::unique_lock<std::shared_mutex> 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<ZoneMapPB> _segment_zone_map;
 
-    mutable std::mutex _load_index_lock;
+    mutable std::shared_mutex _load_index_lock;
     std::unique_ptr<ZoneMapIndexReader> _zone_map_index;
     std::unique_ptr<OrdinalIndexReader> _ordinal_index;
     std::unique_ptr<BitmapIndexReader> _bitmap_index;

From 2c201e2c97ae319de66321047955b01947710bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E5=87=AF?= <airborne08@gmail.com>
Date: Thu, 16 May 2024 18:08:49 +0800
Subject: [PATCH 2/2] [Fix](inverted index) fix wrong fs in
 inverted_index_file_writer

---
 be/src/olap/rowset/segment_v2/column_reader.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/be/src/olap/rowset/segment_v2/column_reader.cpp b/be/src/olap/rowset/segment_v2/column_reader.cpp
index e61aadd265465e..45ae123ae36d11 100644
--- a/be/src/olap/rowset/segment_v2/column_reader.cpp
+++ b/be/src/olap/rowset/segment_v2/column_reader.cpp
@@ -255,8 +255,9 @@ Status ColumnReader::new_inverted_index_iterator(const TabletIndex* index_meta,
         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,