Revert "[Enhancement] Import starcache submodule to support DLA block…

… cache. (StarRocks#20164)" (StarRocks#20422) This reverts commit ed55db7.
duan4718 · Mar 28, 2023 · a05e8bd · a05e8bd
1 parent 9f95481
commit a05e8bd
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 705 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
@@ -73,7 +73,7 @@ option(WITH_GCOV "Build binary with gcov to get code coverage" OFF)
 
 option(WITH_COMPRESS "Build binary with compresss debug section" ON)
 
-option(WITH_CACHELIB "Build binary with cachelib library" OFF)
+option(WITH_BLOCK_CACHE "Build binary with block cache feature" OFF)
 
 option(WITH_BENCH "Build binary with bench" OFF)
 
@@ -336,10 +336,6 @@ set_target_properties(serdes PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/
 add_library(opentelemetry_exporter_jaeger_trace STATIC IMPORTED GLOBAL)
 set_target_properties(opentelemetry_exporter_jaeger_trace PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib64/libopentelemetry_exporter_jaeger_trace.a)
 
-add_library(starcache STATIC IMPORTED)
-set_target_properties(starcache PROPERTIES IMPORTED_LOCATION ${starcache_DIR}/lib64/libstarcache.a)
-include_directories(${starcache_DIR}/include)
-
 # cachelib
 set(CACHELIB_DEPENDENCIES
     cachelib_common
@@ -365,7 +361,7 @@ set(CACHELIB_DEPENDENCIES
     wangle
 )
 
-if (${WITH_CACHELIB} STREQUAL "ON")
+if (${WITH_BLOCK_CACHE} STREQUAL "ON")
     LINK_LIBRARIES(${THIRDPARTY_DIR}/cachelib/deps/lib64/libunwind.so)
     LINK_LIBRARIES(${THIRDPARTY_DIR}/cachelib/deps/lib64/liblzma.so)
     foreach(dep ${CACHELIB_DEPENDENCIES})
@@ -467,8 +463,8 @@ set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Werror=return-type -Werror=switch")
 if (${USE_STAROS} STREQUAL "ON")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -DUSE_STAROS")
 endif()
-if (${WITH_CACHELIB} STREQUAL "ON")
-    set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -DWITH_CACHELIB")
+if (${WITH_BLOCK_CACHE} STREQUAL "ON")
+    set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -DWITH_BLOCK_CACHE")
 endif()
 
 # When LLVM is used, should give GCC_HOME to get c++11 header to use new string and list
@@ -623,10 +619,13 @@ set(STARROCKS_LINK_LIBS
     TestUtil
     Tools
     Geo
-    BlockCache
     ${WL_END_GROUP}
 )
 
+if (${WITH_BLOCK_CACHE} STREQUAL "ON")
+    set(STARROCKS_LINK_LIBS ${STARROCKS_LINK_LIBS} BlockCache)
+endif()
+
 set(STARROCKS_DEPENDENCIES ${STARROCKS_DEPENDENCIES}
     mysql
 )
@@ -704,11 +703,10 @@ set(STARROCKS_DEPENDENCIES
     jansson
     avro
     serdes
-    starcache
     ${WL_END_GROUP}
 )
 
-if (${WITH_CACHELIB} STREQUAL "ON")
+if (${WITH_BLOCK_CACHE} STREQUAL "ON")
     set(STARROCKS_DEPENDENCIES
         ${STARROCKS_DEPENDENCIES}
         ${WL_START_GROUP}
@@ -860,7 +858,6 @@ add_subdirectory(${SRC_DIR}/service)
 add_subdirectory(${SRC_DIR}/testutil)
 add_subdirectory(${SRC_DIR}/types)
 add_subdirectory(${SRC_DIR}/udf)
-add_subdirectory(${SRC_DIR}/block_cache)
 
 add_subdirectory(${SRC_DIR}/tools)
 add_subdirectory(${SRC_DIR}/util)
@@ -870,6 +867,10 @@ if (WITH_BENCH STREQUAL "ON")
     add_subdirectory(${SRC_DIR}/bench)
 endif()
 
+if (${WITH_BLOCK_CACHE} STREQUAL "ON")
+    add_subdirectory(${SRC_DIR}/block_cache)
+endif()
+
 if (${MAKE_TEST} STREQUAL "ON")
     add_subdirectory(test)
 endif ()

diff --git a/be/src/bench/CMakeLists.txt b/be/src/bench/CMakeLists.txt
@@ -16,4 +16,3 @@ ADD_BE_BENCH(${SRC_DIR}/bench/chunks_sorter_bench)
 ADD_BE_BENCH(${SRC_DIR}/bench/runtime_filter_bench)
 ADD_BE_BENCH(${SRC_DIR}/bench/csv_reader_bench)
 ADD_BE_BENCH(${SRC_DIR}/bench/shuffle_chunk_bench)
-ADD_BE_BENCH(${SRC_DIR}/bench/block_cache_bench)