From 5d338f36b101e097845a3c49eaa7298ff975e650 Mon Sep 17 00:00:00 2001 From: chasingegg Date: Tue, 18 Aug 2026 10:38:48 +0000 Subject: [PATCH 1/2] [2.6] fix diskann ut Signed-off-by: chasingegg --- tests/ut/test_diskann.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/ut/test_diskann.cc b/tests/ut/test_diskann.cc index 39383c96f..42555147b 100644 --- a/tests/ut/test_diskann.cc +++ b/tests/ut/test_diskann.cc @@ -402,6 +402,14 @@ TEST_CASE("Test DiskANN CalcDistByIDs with all vectors cached", "[diskann]") { fs::remove_all(kDir); REQUIRE_NOTHROW(fs::create_directories(kCOSINEIndexDir)); +#ifdef KNOWHERE_WITH_CARDINAL + // This case verifies native DiskANN's cached-node file contract. + // Cardinal-backed DISKANN keeps its cache inside Cardinal storage instead. + constexpr const char* diskann_type = "DISKANN_DEPRECATED"; +#else + constexpr const char* diskann_type = "DISKANN"; +#endif + auto version = GenTestVersionList(); auto base_ds = knowhere::ConvertToDataTypeIfNeeded(GenDataSet(kNumRows, kDim, 30)); auto base_ptr = static_cast(base_ds->GetTensor()); @@ -421,7 +429,7 @@ TEST_CASE("Test DiskANN CalcDistByIDs with all vectors cached", "[diskann]") { std::shared_ptr file_manager = std::make_shared(); auto diskann_index_pack = knowhere::Pack(file_manager); auto diskann = - knowhere::IndexFactory::Instance().Create("DISKANN", version, diskann_index_pack).value(); + knowhere::IndexFactory::Instance().Create(diskann_type, version, diskann_index_pack).value(); REQUIRE(diskann.Build(nullptr, build_json) == knowhere::Status::success); knowhere::BinarySet binset; @@ -434,7 +442,7 @@ TEST_CASE("Test DiskANN CalcDistByIDs with all vectors cached", "[diskann]") { deserialize_json["search_cache_budget_gb"] = build_json["search_cache_budget_gb"]; auto loaded_diskann = - knowhere::IndexFactory::Instance().Create("DISKANN", version, diskann_index_pack).value(); + knowhere::IndexFactory::Instance().Create(diskann_type, version, diskann_index_pack).value(); REQUIRE(loaded_diskann.Deserialize(binset, deserialize_json) == knowhere::Status::success); std::unique_ptr cached_ids; From 9839f2c4876d4fa678beae53cc3bf516b7b52ad3 Mon Sep 17 00:00:00 2001 From: chasingegg Date: Wed, 19 Aug 2026 02:10:45 +0000 Subject: [PATCH 2/2] trigger ci Signed-off-by: chasingegg