fix lint

Signed-off-by: Cai Zhang <[email protected]>
milvus-io · Oct 14, 2024 · 5764214 · 5764214
1 parent e6c3314
commit 5764214
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 33 deletions.
diff --git a/internal/core/src/segcore/SegmentSealedImpl.cpp b/internal/core/src/segcore/SegmentSealedImpl.cpp
@@ -52,35 +52,38 @@
 #include "storage/ThreadPools.h"
 #include "storage/MmapManager.h"
 
-
 namespace milvus::segcore {
 
 #ifdef CHECK_SORTED
-#define ASSERT_COLUMN_ORDERED(data_type, column) \
-    {                                            \
-        switch (data_type) { \
-            case DataType::INT64: { \
-                auto col = std::dynamic_pointer_cast<SingleChunkColumn>(column); \
-                auto pks = reinterpret_cast<const int64_t*>(col->Data()); \
-                for (int i = 1; i < col->NumRows(); ++i) { \
-                    assert(pks[i - 1] <= pks[i] && "INT64 Column is not ordered!"); \
-                } \
-                break; \
-            } \
-            case DataType::VARCHAR: { \
-                auto col = std::dynamic_pointer_cast<SingleChunkVariableColumn<std::string>>(column); \
-                auto pks = col->Views(); \
-                for (int i = 1; i < col->NumRows(); ++i) { \
-                    assert(pks[i - 1] <= pks[i] && "VARCHAR Column is not ordered!"); \
-                } \
-                break; \
-            } \
-            default: { \
-                PanicInfo(DataTypeInvalid, \
+#define ASSERT_COLUMN_ORDERED(data_type, column)                           \
+    {                                                                      \
+        switch (data_type) {                                               \
+            case DataType::INT64: {                                        \
+                auto col =                                                 \
+                    std::dynamic_pointer_cast<SingleChunkColumn>(column);  \
+                auto pks = reinterpret_cast<const int64_t*>(col->Data());  \
+                for (int i = 1; i < col->NumRows(); ++i) {                 \
+                    assert(pks[i - 1] <= pks[i] &&                         \
+                           "INT64 Column is not ordered!");                \
+                }                                                          \
+                break;                                                     \
+            }                                                              \
+            case DataType::VARCHAR: {                                      \
+                auto col = std::dynamic_pointer_cast<                      \
+                    SingleChunkVariableColumn<std::string>>(column);       \
+                auto pks = col->Views();                                   \
+                for (int i = 1; i < col->NumRows(); ++i) {                 \
+                    assert(pks[i - 1] <= pks[i] &&                         \
+                           "VARCHAR Column is not ordered!");              \
+                }                                                          \
+                break;                                                     \
+            }                                                              \
+            default: {                                                     \
+                PanicInfo(DataTypeInvalid,                                 \
                           fmt::format("unsupported primary key data type", \
-                                      data_type)); \
-            } \
-        } \
+                                      data_type));                         \
+            }                                                              \
+        }                                                                  \
     }
 #else
 #define ASSERT_COLUMN_ORDERED(data_type, column) ((void)0)

diff --git a/internal/core/src/segcore/Utils.h b/internal/core/src/segcore/Utils.h
@@ -110,13 +110,15 @@ MergeDataArray(std::vector<MergeBase>& merge_bases,
 
 template <bool is_sealed>
 std::shared_ptr<DeletedRecord::TmpBitmap>
-get_deleted_bitmap(int64_t del_barrier,
-                   int64_t insert_barrier,
-                   DeletedRecord& delete_record,
-                   const InsertRecord<is_sealed>& insert_record,
-                   Timestamp query_timestamp,
-                   bool is_sorted_by_pk = false,
-                   const std::function<std::vector<SegOffset>(const PkType&, int64_t)>& search_fn = nullptr) {
+get_deleted_bitmap(
+    int64_t del_barrier,
+    int64_t insert_barrier,
+    DeletedRecord& delete_record,
+    const InsertRecord<is_sealed>& insert_record,
+    Timestamp query_timestamp,
+    bool is_sorted_by_pk = false,
+    const std::function<std::vector<SegOffset>(const PkType&, int64_t)>&
+        search_fn = nullptr) {
     // if insert_barrier and del_barrier have not changed, use cache data directly
     bool hit_cache = false;
     int64_t old_del_barrier = 0;
@@ -155,7 +157,9 @@ get_deleted_bitmap(int64_t del_barrier,
     }
 
     for (auto& [pk, timestamp] : delete_timestamps) {
-        auto segOffsets = is_sorted_by_pk ? search_fn(pk, insert_barrier) : insert_record.search_pk(pk, insert_barrier);
+        auto segOffsets = is_sorted_by_pk
+                              ? search_fn(pk, insert_barrier)
+                              : insert_record.search_pk(pk, insert_barrier);
         for (auto offset : segOffsets) {
             int64_t insert_row_offset = offset.get();