use ninja

Signed-off-by: Lloyd-Pottiger <[email protected]>

Author: Lloyd-Pottiger

dbms/src/Storages/DeltaMerge/File/DMFileWithVectorIndexBlockInputStream.cpp

@@ -170,9 +170,7 @@ std::tuple<Block, size_t> DMFileWithVectorIndexBlockInputStream::readByIndexRead
 
     auto begin = std::lower_bound(sorted_results.cbegin(), sorted_results.cend(), block_start_row_id);
     auto end = std::lower_bound(begin, sorted_results.cend(), index_reader_next_row_id);
-    const std::span<const VectorIndexViewer::Key> block_selected_rows{
-        &*begin,
-        static_cast<size_t>(std::distance(begin, end))};
+    const std::span block_selected_rows{begin, end};
     vec_index_reader->read(vec_column, block_selected_rows, block_start_row_id, read_rows);
 
     block.insert(ColumnWithTypeAndName{std::move(vec_column), vec_cd.type, vec_cd.name, vec_cd.id});
@@ -200,9 +198,7 @@ std::tuple<Block, size_t> DMFileWithVectorIndexBlockInputStream::readByFollowing
     // Then read from vector index for the same pack.
     auto begin = std::lower_bound(sorted_results.cbegin(), sorted_results.cend(), block_others.startOffset());
     auto end = std::lower_bound(begin, sorted_results.cend(), block_others.startOffset() + read_rows);
-    const std::span<const VectorIndexViewer::Key> block_selected_rows{
-        &*begin,
-        static_cast<size_t>(std::distance(begin, end))};
+    const std::span block_selected_rows{begin, end};
     vec_index_reader->read(vec_column, block_selected_rows, block_others.startOffset(), read_rows);
 
     // Re-assemble block using the same layout as header.

dbms/src/Storages/DeltaMerge/Index/VectorIndexHNSW/Index.cpp

@@ -343,7 +343,7 @@ std::vector<VectorIndexViewer::SearchResult> VectorIndexHNSWViewer::searchWithDi
     {
         const auto rowid = result[i].member.key;
         if (valid_rows[rowid])
-            search_results.push_back({rowid, result[i].distance});
+            search_results.emplace_back(rowid, result[i].distance);
     }
     return search_results;
 }

release-darwin/build/build-release.sh

@@ -38,6 +38,7 @@ export CC="$(brew --prefix)/opt/llvm@17/bin/clang"
 export CXX="$(brew --prefix)/opt/llvm@17/bin/clang++"
 
 cmake "$SRCPATH" \
+      -GNinja \
       -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
       -DUSE_INTERNAL_SSL_LIBRARY=ON \
       -Wno-dev \

release-darwin/prepare-environments/prepare-llvm.sh

@@ -15,4 +15,5 @@
 
 set -ueox pipefail
 
+brew install ninja
 brew install llvm@17