cicd: Add usearch submodule (#162)

* cmake: Fail fast when usearch is not found Signed-off-by: Wish <[email protected]> * Add submodule Signed-off-by: Wish <[email protected]> --------- Signed-off-by: Wish <[email protected]>
pingcap · Aug 6, 2024 · f45d41a · f45d41a
1 parent 1afddb3
commit f45d41a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/contrib/usearch b/contrib/usearch
diff --git a/contrib/usearch-cmake/CMakeLists.txt b/contrib/usearch-cmake/CMakeLists.txt
@@ -3,6 +3,10 @@ set(USEARCH_SOURCE_DIR "${USEARCH_PROJECT_DIR}/include")
 
 add_library(_usearch INTERFACE)
 
+if (NOT EXISTS "${USEARCH_SOURCE_DIR}/usearch/index.hpp")
+    message (FATAL_ERROR "submodule contrib/usearch not found")
+endif()
+
 target_include_directories(_usearch SYSTEM INTERFACE
     ${USEARCH_PROJECT_DIR}/simsimd/include
     ${USEARCH_PROJECT_DIR}/fp16/include

diff --git a/dbms/src/Storages/DeltaMerge/File/DMFileBlockInputStream.cpp b/dbms/src/Storages/DeltaMerge/File/DMFileBlockInputStream.cpp
@@ -205,7 +205,8 @@ SkippableBlockInputStreamPtr DMFileBlockInputStreamBuilder::build2(
         read_one_pack_every_time,
         tracing_id,
         enable_read_thread,
-        scan_context);
+        scan_context,
+        read_tag);
 
     DMFileWithVectorIndexBlockInputStreamPtr reader = DMFileWithVectorIndexBlockInputStream::create(
         ann_query_info,

diff --git a/dbms/src/Storages/DeltaMerge/Index/VectorIndexHNSW/Index.cpp b/dbms/src/Storages/DeltaMerge/Index/VectorIndexHNSW/Index.cpp
@@ -78,9 +78,9 @@ constexpr tipb::VectorDistanceMetric toTiDBQueryDistanceMetric(unum::usearch::me
     case unum::usearch::metric_kind_t::l2sq_k:
         return tipb::VectorDistanceMetric::L2;
     case unum::usearch::metric_kind_t::cos_k:
-        return tipb::VectorDistanceMetric::Cosine;
+        return tipb::VectorDistanceMetric::COSINE;
     default:
-        return tipb::VectorDistanceMetric::InvalidMetric;
+        return tipb::VectorDistanceMetric::INVALID_DISTANCE_METRIC;
     }
 }
 
@@ -189,12 +189,13 @@ std::vector<VectorIndex::Key> VectorIndexHNSW<Metric>::search(
 
     RUNTIME_CHECK(index != nullptr);
 
-    auto predicate = [&valid_rows, &statistics](USearchIndexWithSerialization<Metric>::member_cref_t const & member) {
-        statistics.visited_nodes++;
-        if (!valid_rows[member.key])
-            statistics.discarded_nodes++;
-        return valid_rows[member.key];
-    };
+    auto predicate
+        = [&valid_rows, &statistics](typename USearchIndexWithSerialization<Metric>::member_cref_t const & member) {
+              statistics.visited_nodes++;
+              if (!valid_rows[member.key])
+                  statistics.discarded_nodes++;
+              return valid_rows[member.key];
+          };
 
     // TODO: Support efSearch.
     auto result = index->search( //