Merge branch 'infiniflow:main' into main

Ami11111 · Jul 24, 2024 · ece963f · ece963f
2 parents b17919e + 1b28b21
commit ece963f
Show file tree

Hide file tree

Showing 114 changed files with 5,987 additions and 578 deletions.
diff --git a/benchmark/local_infinity/CMakeLists.txt b/benchmark/local_infinity/CMakeLists.txt
@@ -26,11 +26,13 @@ target_link_libraries(
     event.a
     c++.a
     c++abi.a
+    snappy.a
     ${JEMALLOC_STATIC_LIB}
 )
 
 target_link_directories(infinity_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
 target_link_directories(infinity_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/arrow/")
+target_link_directories(infinity_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/snappy/")
 
 # ########################################
 # knn
@@ -62,11 +64,13 @@ target_link_libraries(
     arrow.a
     thrift.a
     thriftnb.a
+    snappy.a
     ${JEMALLOC_STATIC_LIB}
 )
 
-target_link_directories(knn_import_benchmark BEFORE PUBLIC "${CMAKE_BINARY_DIR}/lib")
+target_link_directories(knn_import_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
 target_link_directories(knn_import_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/arrow/")
+target_link_directories(knn_import_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/snappy/")
 
 # query benchmark
 add_executable(knn_query_benchmark
@@ -94,11 +98,13 @@ target_link_libraries(
     arrow.a
     thrift.a
     thriftnb.a
+    snappy.a
     ${JEMALLOC_STATIC_LIB}
 )
 
-target_link_directories(knn_query_benchmark BEFORE PUBLIC "${CMAKE_BINARY_DIR}/lib")
+target_link_directories(knn_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
 target_link_directories(knn_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/arrow/")
+target_link_directories(knn_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/snappy/")
 
 # ########################################
 # fulltext
@@ -128,11 +134,13 @@ target_link_libraries(
     arrow.a
     thrift.a
     thriftnb.a
+    snappy.a
     ${JEMALLOC_STATIC_LIB}
 )
 
-target_link_directories(fulltext_benchmark BEFORE PUBLIC "${CMAKE_BINARY_DIR}/lib")
+target_link_directories(fulltext_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
 target_link_directories(fulltext_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/arrow/")
+target_link_directories(fulltext_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/snappy/")
 
 # ########################################
 add_executable(sparse_benchmark
@@ -160,11 +168,13 @@ target_link_libraries(
     arrow.a
     thrift.a
     thriftnb.a
+    snappy.a
     ${JEMALLOC_STATIC_LIB}
 )
 
-target_link_directories(sparse_benchmark BEFORE PUBLIC "${CMAKE_BINARY_DIR}/lib")
+target_link_directories(sparse_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
 target_link_directories(sparse_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/arrow/")
+target_link_directories(sparse_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/snappy/")
 
 add_executable(bmp_benchmark
     ./sparse/bmp_benchmark.cpp
@@ -191,11 +201,13 @@ target_link_libraries(
     arrow.a
     thrift.a
     thriftnb.a
+    snappy.a
     ${JEMALLOC_STATIC_LIB}
 )
 
-target_link_directories(bmp_benchmark BEFORE PUBLIC "${CMAKE_BINARY_DIR}/lib")
+target_link_directories(bmp_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
 target_link_directories(bmp_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/arrow/")
+target_link_directories(bmp_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/snappy/")
 
 add_executable(hnsw_benchmark
     ./knn/hnsw_benchmark.cpp
@@ -216,18 +228,19 @@ target_link_libraries(
     dl
     lz4.a
     atomic.a
-
     c++.a
     c++abi.a
     parquet.a
     arrow.a
     thrift.a
     thriftnb.a
+    snappy.a
     ${JEMALLOC_STATIC_LIB}
 )
 
-target_link_directories(hnsw_benchmark BEFORE PUBLIC "${CMAKE_BINARY_DIR}/lib")
+target_link_directories(hnsw_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
 target_link_directories(hnsw_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/arrow/")
+target_link_directories(hnsw_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/snappy/")
 
 # add_definitions(-march=native)
 # add_definitions(-msse4.2 -mfma)

diff --git a/benchmark/remote_infinity/CMakeLists.txt b/benchmark/remote_infinity/CMakeLists.txt
@@ -12,6 +12,7 @@ target_include_directories(remote_query_benchmark PUBLIC "${CMAKE_SOURCE_DIR}/th
 target_include_directories(remote_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/thrift/")
 target_link_directories(remote_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/lib")
 target_link_directories(remote_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/arrow/")
+target_link_directories(remote_query_benchmark PUBLIC "${CMAKE_BINARY_DIR}/third_party/snappy/")
 
 target_link_libraries(
         remote_query_benchmark
@@ -32,6 +33,7 @@ target_link_libraries(
         c++abi.a
         parquet.a
         arrow.a
+        snappy.a
         ${JEMALLOC_STATIC_LIB}
 )