fix: Fix some bugs

1. fix use after free bug 2. fix performance issue Signed-off-by: sunby <[email protected]>
milvus-io · Jan 16, 2025 · 703909c · 703909c
1 parent 2439278
commit 703909c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/internal/core/src/exec/expression/Expr.h b/internal/core/src/exec/expression/Expr.h
@@ -684,22 +684,25 @@ class SegmentExpr : public Expr {
                 if constexpr (std::is_same_v<T, std::string_view> ||
                               std::is_same_v<T, Json>) {
                     if (segment_->type() == SegmentType::Sealed) {
-                        valid_data = segment_
-                                         ->get_batch_views<T>(
-                                             field_id_, i, data_pos, size)
-                                         .second.data();
+                        auto batch_views = segment_->get_batch_views<T>(
+                            field_id_, i, data_pos, size);
+                        valid_data = batch_views.second.data();
+                        ApplyValidData(valid_data,
+                                       res + processed_size,
+                                       valid_res + processed_size,
+                                       size);
                     }
                 } else {
                     auto chunk = segment_->chunk_data<T>(field_id_, i);
                     valid_data = chunk.valid_data();
                     if (valid_data != nullptr) {
                         valid_data += data_pos;
                     }
+                    ApplyValidData(valid_data,
+                                   res + processed_size,
+                                   valid_res + processed_size,
+                                   size);
                 }
-                ApplyValidData(valid_data,
-                               res + processed_size,
-                               valid_res + processed_size,
-                               size);
             }
 
             processed_size += size;

diff --git a/internal/core/src/segcore/SegmentChunkReader.cpp b/internal/core/src/segcore/SegmentChunkReader.cpp
@@ -138,8 +138,8 @@ SegmentChunkReader::GetChunkDataAccessor<std::string>(
                 current_chunk_size =
                     segment_->chunk_size(field_id, current_chunk_id);
             }
-            auto chunk_data = chunk_info.first;
-            auto chunk_valid_data = chunk_info.second;
+            auto& chunk_data = chunk_info.first;
+            auto& chunk_valid_data = chunk_info.second;
             if (current_chunk_pos < chunk_valid_data.size() &&
                 !chunk_valid_data[current_chunk_pos]) {
                 current_chunk_pos++;