Skip to content

Commit cd9f95f

Browse files
committed
v7
1 parent 59b6542 commit cd9f95f

8 files changed

+1296
-989
lines changed

be/CMakeLists.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ if (DISPLAY_BUILD_TIME)
8686
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "time -f 'TimeUsage: real=%es, user=%Us, sys=%Ss'")
8787
endif()
8888

89-
if (BUILD_S3_WRITER_TOOL)
90-
# set(USE_MEM_TRACKER OFF)
89+
if (BUILD_FILE_CACHE_MIRCOBENCH_TOOL)
9190
add_definitions(-DBE_TEST)
9291
add_definitions(-DBE_BENCHMARK)
9392
endif()
@@ -812,8 +811,8 @@ if (BUILD_META_TOOL)
812811
add_subdirectory(${SRC_DIR}/tools)
813812
endif()
814813

815-
option(BUILD_S3_WRITER_TOOL "Build s3 writer tool" OFF)
816-
if (BUILD_S3_WRITER_TOOL)
814+
option(BUILD_FILE_CACHE_MIRCOBENCH_TOOL "Build file cache mirobench Tool" OFF)
815+
if (BUILD_FILE_CACHE_MIRCOBENCH_TOOL)
817816
add_subdirectory(${SRC_DIR}/io/tools)
818817
endif()
819818

be/src/io/tools/CMakeLists.txt

+11-6
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ set(LIBRARY_OUTPUT_PATH "${BUILD_DIR}/src/tools")
2222
set(EXECUTABLE_OUTPUT_PATH "${BUILD_DIR}/src/tools")
2323

2424
# 编译proto文件
25+
execute_process(
26+
COMMAND make clean -C ${CMAKE_CURRENT_SOURCE_DIR}/proto
27+
RESULT_VARIABLE CLEAN_RESULT
28+
)
29+
2530
execute_process(
2631
COMMAND make -C ${CMAKE_CURRENT_SOURCE_DIR}/proto
2732
RESULT_VARIABLE MAKE_RESULT
@@ -42,22 +47,22 @@ file(GLOB PROTO_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/build/proto/*.pb.h")
4247
message(STATUS "PROTO_SRCS: ${PROTO_SRCS}")
4348
message(STATUS "PROTO_HDRS: ${PROTO_HDRS}")
4449

45-
# 添加 s3_writer_tool_http 可执行文件
46-
add_executable(s3_writer_tool_http
47-
s3_writer_tool.cpp
50+
# 添加 file_cache_microbench 可执行文件
51+
add_executable(file_cache_microbench
52+
file_cache_microbench.cpp
4853
${PROTO_SRCS}
4954
)
5055

5156
# 添加proto生成文件的包含路径
52-
target_include_directories(s3_writer_tool_http PRIVATE
57+
target_include_directories(file_cache_microbench PRIVATE
5358
${CMAKE_CURRENT_SOURCE_DIR}/build/proto
5459
)
5560

5661
# 链接所需的库
57-
target_link_libraries(s3_writer_tool_http
62+
target_link_libraries(file_cache_microbench
5863
${DORIS_LINK_LIBS}
5964
protobuf
6065
)
6166

6267
# 安装规则
63-
install(TARGETS s3_writer_tool_http DESTINATION ${OUTPUT_DIR}/lib/)
68+
install(TARGETS file_cache_microbench DESTINATION ${OUTPUT_DIR}/lib/)

0 commit comments

Comments
 (0)