From 6c4d497d73d2cd2f4a16dcdde64ebd219dbeae37 Mon Sep 17 00:00:00 2001 From: Cai Yudong Date: Thu, 7 Apr 2022 17:29:31 +0800 Subject: [PATCH] Fix mac build error (#16415) Signed-off-by: yudong.cai --- internal/core/src/segcore/load_index_c.cpp | 4 +++- internal/core/unittest/test_c_api.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/core/src/segcore/load_index_c.cpp b/internal/core/src/segcore/load_index_c.cpp index b8f7034338..32d168d3b9 100644 --- a/internal/core/src/segcore/load_index_c.cpp +++ b/internal/core/src/segcore/load_index_c.cpp @@ -87,7 +87,9 @@ AppendIndex(CLoadIndexInfo c_load_index_info, CBinarySet c_binary_set) { AssertInfo(find_index_type == true, "Can't find index type in index_params"); knowhere::IndexMode mode; if (find_index_mode) { - mode = index_params["index_mode"] == "CPU" ? knowhere::IndexMode::MODE_CPU : knowhere::IndexMode::MODE_GPU; + std::string index_mode = index_params["index_mode"]; + mode = (index_mode == "CPU" || index_mode == "cpu") ? knowhere::IndexMode::MODE_CPU + : knowhere::IndexMode::MODE_GPU; } else { mode = knowhere::IndexMode::MODE_CPU; } diff --git a/internal/core/unittest/test_c_api.cpp b/internal/core/unittest/test_c_api.cpp index 66edf8ac4e..a35a420f50 100644 --- a/internal/core/unittest/test_c_api.cpp +++ b/internal/core/unittest/test_c_api.cpp @@ -259,8 +259,8 @@ TEST(CApiTest, DeleteTest) { auto collection = NewCollection(get_default_schema_config()); auto segment = NewSegment(collection, Growing, -1); - long delete_row_ids[] = {100000, 100001, 100002}; - unsigned long delete_timestamps[] = {0, 0, 0}; + int64_t delete_row_ids[] = {100000, 100001, 100002}; + uint64_t delete_timestamps[] = {0, 0, 0}; auto offset = PreDelete(segment, 3); @@ -635,8 +635,8 @@ TEST(CApiTest, GetDeletedCountTest) { auto collection = NewCollection(get_default_schema_config()); auto segment = NewSegment(collection, Growing, -1); - long delete_row_ids[] = {100000, 100001, 100002}; - unsigned long delete_timestamps[] = {0, 0, 0}; + int64_t delete_row_ids[] = {100000, 100001, 100002}; + uint64_t delete_timestamps[] = {0, 0, 0}; auto offset = PreDelete(segment, 3);