Skip to content

Commit 5820477

Browse files
authored
[Enhancement] update staros related components version (StarRocks#25787)
* update starlet/starmgr version to 3.1-rc5 * refactor starlet cmake import * set starlet related parameters inside CMakeLists.txt * remove customized parameters from build.sh and run-be-ut.sh Signed-off-by: Kevin Xiaohua Cai <[email protected]>
1 parent 162fd75 commit 5820477

File tree

6 files changed

+105
-107
lines changed

6 files changed

+105
-107
lines changed

be/CMakeLists.txt

+69-25
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ else()
3232
message(FATAL_ERROR "STARROCKS_GCC_HOME environment variable is not set")
3333
endif()
3434

35+
# disable pkgconfig searching libraries, all libraries are static imported
36+
set(CMAKE_DISABLE_FIND_PACKAGE_PkgConfig ON)
37+
# Workaround error of `Unknown CMake command "pkg_check_modules".'`
38+
# refer to: https://gitlab.kitware.com/cmake/cmake/-/issues/17043
39+
macro( pkg_check_modules )
40+
endmacro()
41+
3542
project(starrocks CXX C)
3643

3744
# set CMAKE_BUILD_TYPE
@@ -163,10 +170,10 @@ set(GPERFTOOLS_HOME "${THIRDPARTY_DIR}/gperftools")
163170

164171
# Set all libraries
165172

166-
add_library(gflags STATIC IMPORTED)
173+
add_library(gflags STATIC IMPORTED GLOBAL)
167174
set_target_properties(gflags PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libgflags.a)
168175

169-
add_library(glog STATIC IMPORTED)
176+
add_library(glog STATIC IMPORTED GLOBAL)
170177
set_target_properties(glog PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libglog.a)
171178

172179
add_library(re2 STATIC IMPORTED GLOBAL)
@@ -195,8 +202,10 @@ set_target_properties(gmock PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/l
195202
add_library(snappy STATIC IMPORTED)
196203
set_target_properties(snappy PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libsnappy.a)
197204

198-
add_library(curl STATIC IMPORTED)
199-
set_target_properties(curl PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libcurl.a)
205+
set(CURL_INCLUDE_DIR "${THIRDPARTY_DIR}/include" CACHE PATH "curl include path")
206+
set(CURL_LIBRARY "${THIRDPARTY_DIR}/lib/libcurl.a" CACHE FILEPATH "curl static library")
207+
add_library(curl STATIC IMPORTED GLOBAL)
208+
set_target_properties(curl PROPERTIES IMPORTED_LOCATION ${CURL_LIBRARY})
200209

201210
add_library(lz4 STATIC IMPORTED)
202211
set_target_properties(lz4 PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/liblz4.a)
@@ -210,7 +219,7 @@ set_target_properties(thriftnb PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/li
210219
add_library(mysql STATIC IMPORTED)
211220
set_target_properties(mysql PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/mariadb/libmariadbclient.a)
212221

213-
add_library(hdfs STATIC IMPORTED)
222+
add_library(hdfs STATIC IMPORTED GLOBAL)
214223
set_target_properties(hdfs PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libhdfs.a)
215224

216225
# Allow FindOpenSSL() to find correct static libraries
@@ -235,7 +244,7 @@ set_target_properties(libevent PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/li
235244
add_library(openssl STATIC IMPORTED)
236245
set_target_properties(openssl PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libssl.a)
237246

238-
add_library(leveldb STATIC IMPORTED)
247+
add_library(leveldb STATIC IMPORTED GLOBAL)
239248
set_target_properties(leveldb PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib/libleveldb.a)
240249

241250
add_library(jemalloc STATIC IMPORTED)
@@ -262,7 +271,7 @@ set_target_properties(arrow PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib64
262271
add_library(parquet STATIC IMPORTED)
263272
set_target_properties(parquet PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib64/libparquet.a)
264273

265-
add_library(brpc STATIC IMPORTED)
274+
add_library(brpc STATIC IMPORTED GLOBAL)
266275
set_target_properties(brpc PROPERTIES IMPORTED_LOCATION ${THIRDPARTY_DIR}/lib64/libbrpc.a)
267276

268277
add_library(rocksdb STATIC IMPORTED)
@@ -385,53 +394,88 @@ if (${WITH_CACHELIB} STREQUAL "ON")
385394
endif()
386395

387396
if ("${USE_STAROS}" STREQUAL "ON")
397+
if (DEFINED ENV{STARLET_INSTALL_DIR})
398+
set(STARLET_INSTALL_DIR "$ENV{STARLET_INSTALL_DIR}")
399+
else()
400+
set(STARLET_INSTALL_DIR "${THIRDPARTY_DIR}/starlet")
401+
endif()
402+
if (NOT EXISTS ${STARLET_INSTALL_DIR})
403+
message(FATAL_ERROR "Starlet thirdparty directory ${STARLET_INSTALL_DIR} not exist!")
404+
else()
405+
message(STATUS "Searching starlet related libraries from ${STARLET_INSTALL_DIR} ...")
406+
endif()
407+
388408
# explicitly import ZLIB::ZLIB which is required by starlet thirdparty
389409
add_library(ZLIB::ZLIB STATIC IMPORTED)
390410
set_target_properties(ZLIB::ZLIB PROPERTIES IMPORTED_LOCATION ${LIBZ})
411+
412+
# Tell cmake that PROTOBUF library is already found
413+
set(PROTOBUF_FOUND TRUE)
391414
# starrocks project has its imported libprotobuf.a and libre2.a
392415
# add following ALIAS so grpc can find the correct dependent libraries
393416
add_library(protobuf::libprotobuf ALIAS protobuf)
394417
add_library(re2::re2 ALIAS re2)
395-
418+
add_library(glog::glog ALIAS glog)
419+
add_library(gflags::gflags_static ALIAS gflags)
420+
add_library(hdfs::hdfs ALIAS hdfs)
421+
add_library(brpc::brpc ALIAS brpc)
422+
add_library(leveldb::leveldb ALIAS leveldb)
423+
add_library(CURL::libcurl ALIAS curl)
424+
425+
set(absl_DIR "${STARLET_INSTALL_DIR}/third_party/lib/cmake/absl" CACHE PATH "absl search path" FORCE)
426+
find_package(absl CONFIG REQUIRED)
427+
428+
# required by azure-*
429+
set(LIBXML2_INCLUDE_DIR "${STARLET_INSTALL_DIR}/third_party/include/libxml2" CACHE PATH "libxml2 include path")
430+
set(LIBXML2_LIBRARY "${STARLET_INSTALL_DIR}/third_party/lib/libxml2.a" CACHE FILEPATH "libxml2 static library")
431+
add_library(libxml2 STATIC IMPORTED GLOBAL)
432+
set_target_properties(libxml2 PROPERTIES IMPORTED_LOCATION ${LIBXML2_LIBRARY})
433+
434+
set(gRPC_DIR "${STARLET_INSTALL_DIR}/third_party/lib/cmake/grpc" CACHE PATH "grpc search path")
396435
find_package(gRPC CONFIG REQUIRED)
397436
message(STATUS "Using gRPC ${gRPC_VERSION}")
398437
get_target_property(gRPC_INCLUDE_DIR gRPC::grpc INTERFACE_INCLUDE_DIRECTORIES)
399438
include_directories(SYSTEM ${gRPC_INCLUDE_DIR})
400439

401-
find_package(starlet CONFIG REQUIRED)
402-
message(STATUS "Using starlet ${starlet_VERSION}")
403-
message(STATUS "starlet inc dir: ${STARLET_INCLUDE_DIRS}")
404-
message(STATUS "starlet lib dir: ${STARLET_LIBS}")
405-
include_directories(SYSTEM ${STARLET_INCLUDE_DIRS})
406-
add_library(starlet STATIC IMPORTED)
407-
set_target_properties(starlet PROPERTIES IMPORTED_LOCATION ${STARLET_LIBS}/libstarlet.a)
408-
440+
set(prometheus-cpp_DIR "${STARLET_INSTALL_DIR}/third_party/lib/cmake/prometheus-cpp" CACHE PATH "prometheus cpp client search path")
409441
find_package (prometheus-cpp CONFIG REQUIRED)
410442
get_target_property(prometheus-cpp_INCLUDE_DIR prometheus-cpp::core INTERFACE_INCLUDE_DIRECTORIES)
411443
message(STATUS "Using prometheus-cpp")
412444
message(STATUS " include: ${prometheus-cpp_INCLUDE_DIR}")
413445
include_directories(SYSTEM ${prometheus-cpp_INCLUDE_DIR})
414446

415-
find_package(azure-identity-cpp CONFIG REQUIRED)
416-
find_package(azure-storage-blobs-cpp CONFIG REQUIRED)
447+
set(azure-core-cpp_DIR "${STARLET_INSTALL_DIR}/third_party/share/azure-core-cpp" CACHE PATH "azure core cpp search path")
417448
find_package(azure-core-cpp CONFIG REQUIRED)
449+
set(azure-identity-cpp_DIR "${STARLET_INSTALL_DIR}/third_party/share/azure-identity-cpp" CACHE PATH "azure identity cpp search path")
450+
find_package(azure-identity-cpp CONFIG REQUIRED)
451+
set(azure-storage-common-cpp_DIR "${STARLET_INSTALL_DIR}/third_party/share/azure-storage-common-cpp" CACHE PATH "azure storage common search path")
418452
find_package(azure-storage-common-cpp CONFIG REQUIRED)
453+
set(azure-storage-blobs-cpp_DIR "${STARLET_INSTALL_DIR}/third_party/share/azure-storage-blobs-cpp" CACHE PATH "azure storage blobs search path")
454+
find_package(azure-storage-blobs-cpp CONFIG REQUIRED)
419455
set(AZURE_SDK_LIB Azure::azure-identity Azure::azure-storage-blobs Azure::azure-core Azure::azure-storage-common)
420456

421-
add_library(starcachelib STATIC IMPORTED GLOBAL)
422-
set_target_properties(starcachelib PROPERTIES IMPORTED_LOCATION ${STARLET_LIBS}/libstarcache.a)
457+
set(starcache_DIR "${STARLET_INSTALL_DIR}/starlet_install/lib/cmake/starcache" CACHE PATH "starcachelib search path")
458+
find_package(starcache CONFIG REQUIRED)
459+
set_target_properties(starcache::starcache PROPERTIES IMPORTED_GLOBAL TRUE)
460+
add_library(starcachelib ALIAS starcache::starcache)
461+
462+
set(starlet_DIR "${STARLET_INSTALL_DIR}/starlet_install/lib/cmake" CACHE PATH "starlet search path")
463+
find_package(starlet CONFIG REQUIRED)
464+
message(STATUS "Using starlet ${starlet_VERSION}")
465+
message(STATUS "starlet inc dir: ${STARLET_INCLUDE_DIRS}")
466+
message(STATUS "starlet lib dir: ${STARLET_LIBS}")
467+
include_directories(SYSTEM ${STARLET_INCLUDE_DIRS})
423468

424-
add_library(starlet_fslib_all STATIC IMPORTED GLOBAL)
425-
set_target_properties(starlet_fslib_all PROPERTIES IMPORTED_LOCATION ${STARLET_LIBS}/libstarlet_fslib_all.a)
469+
set_target_properties(starlet::starlet_fslib_all PROPERTIES IMPORTED_GLOBAL TRUE)
470+
add_library(starlet_fslib_all ALIAS starlet::starlet_fslib_all)
471+
set_target_properties(starlet::starlet PROPERTIES IMPORTED_GLOBAL TRUE)
472+
add_library(starlet ALIAS starlet::starlet)
426473

427474
set(STARROCKS_DEPENDENCIES
428475
${STARROCKS_DEPENDENCIES}
429476
starlet
430-
gRPC::grpc++_reflection
431-
gRPC::grpc++
432477
starlet_fslib_all
433478
starcachelib
434-
prometheus-cpp::core
435479
${AZURE_SDK_LIB}
436480
)
437481
endif()

build.sh

+18-41
Original file line numberDiff line numberDiff line change
@@ -315,48 +315,25 @@ if [ ${BUILD_BE} -eq 1 ] ; then
315315
# assume starlet_thirdparty is installed to ${STARROCKS_THIRDPARTY}/installed/starlet/
316316
STARLET_INSTALL_DIR=${STARROCKS_THIRDPARTY}/installed/starlet
317317
fi
318-
${CMAKE_CMD} -G "${CMAKE_GENERATOR}" \
319-
-DSTARROCKS_THIRDPARTY=${STARROCKS_THIRDPARTY} \
320-
-DSTARROCKS_HOME=${STARROCKS_HOME} \
321-
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
322-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
323-
-DMAKE_TEST=OFF -DWITH_GCOV=${WITH_GCOV}\
324-
-DUSE_AVX2=$USE_AVX2 -DUSE_AVX512=$USE_AVX512 -DUSE_SSE4_2=$USE_SSE4_2 \
325-
-DENABLE_QUERY_DEBUG_TRACE=$ENABLE_QUERY_DEBUG_TRACE \
326-
-DUSE_JEMALLOC=$USE_JEMALLOC \
327-
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
328-
-DUSE_STAROS=${USE_STAROS} \
329-
-DWITH_BENCH=${WITH_BENCH} \
330-
-DWITH_CACHELIB=${WITH_CACHELIB} \
331-
-DWITH_STARCACHE=${USE_STAROS} \
332-
-Dabsl_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/absl \
333-
-DgRPC_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/grpc \
334-
-Dprometheus-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/prometheus-cpp \
335-
-DCURL_LIBRARY=${STARROCKS_THIRDPARTY}/installed/lib/libcurl.a \
336-
-DCURL_INCLUDE_DIR=${STARROCKS_THIRDPARTY}/installed/include \
337-
-DLIBXML2_INCLUDE_DIR=${STARLET_INSTALL_DIR}/third_party/include/libxml2 \
338-
-DLIBXML2_LIBRARY=${STARLET_INSTALL_DIR}/third_party/lib/libxml2.a \
339-
-Dazure-core-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-core-cpp \
340-
-Dazure-identity-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-identity-cpp \
341-
-Dazure-storage-common-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-storage-common-cpp \
342-
-Dazure-storage-blobs-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-storage-blobs-cpp \
343-
-Dstarlet_DIR=${STARLET_INSTALL_DIR}/starlet_install/lib/cmake ..
344-
else
345-
${CMAKE_CMD} -G "${CMAKE_GENERATOR}" \
346-
-DSTARROCKS_THIRDPARTY=${STARROCKS_THIRDPARTY} \
347-
-DSTARROCKS_HOME=${STARROCKS_HOME} \
348-
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
349-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
350-
-DMAKE_TEST=OFF -DWITH_GCOV=${WITH_GCOV}\
351-
-DUSE_AVX2=$USE_AVX2 -DUSE_AVX512=$USE_AVX512 -DUSE_SSE4_2=$USE_SSE4_2 \
352-
-DENABLE_QUERY_DEBUG_TRACE=$ENABLE_QUERY_DEBUG_TRACE \
353-
-DUSE_JEMALLOC=$USE_JEMALLOC \
354-
-DWITH_BENCH=${WITH_BENCH} \
355-
-DWITH_COMPRESS=${WITH_COMPRESS} \
356-
-DWITH_CACHELIB=${WITH_CACHELIB} \
357-
-DWITH_STARCACHE=${USE_STAROS} \
358-
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
318+
export STARLET_INSTALL_DIR
359319
fi
320+
${CMAKE_CMD} -G "${CMAKE_GENERATOR}" \
321+
-DSTARROCKS_THIRDPARTY=${STARROCKS_THIRDPARTY} \
322+
-DSTARROCKS_HOME=${STARROCKS_HOME} \
323+
-DSTARLET_INSTALL_DIR=${STARLET_INSTALL_DIR} \
324+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
325+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
326+
-DMAKE_TEST=OFF -DWITH_GCOV=${WITH_GCOV} \
327+
-DUSE_AVX2=$USE_AVX2 -DUSE_AVX512=$USE_AVX512 -DUSE_SSE4_2=$USE_SSE4_2 \
328+
-DENABLE_QUERY_DEBUG_TRACE=$ENABLE_QUERY_DEBUG_TRACE \
329+
-DUSE_JEMALLOC=$USE_JEMALLOC \
330+
-DWITH_BENCH=${WITH_BENCH} \
331+
-DWITH_COMPRESS=${WITH_COMPRESS} \
332+
-DWITH_CACHELIB=${WITH_CACHELIB} \
333+
-DUSE_STAROS=${USE_STAROS} \
334+
-DWITH_STARCACHE=${USE_STAROS} \
335+
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
336+
360337
time ${BUILD_SYSTEM} -j${PARALLEL}
361338
${BUILD_SYSTEM} install
362339

docker/dockerfiles/dev-env/dev-env.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ARG predownload_thirdparty=false
2222
ARG thirdparty_url=https://cdn-thirdparty.starrocks.com/starrocks-thirdparty-main-20230317.tar
2323
ARG commit_id
2424
# check thirdparty/starlet-artifacts-version.sh, to get the right tag
25-
ARG starlet_tag=v3.1-rc3
25+
ARG starlet_tag=v3.1-rc5
2626
# build for which linux distro: centos7|ubuntu
2727
ARG distro=ubuntu
2828

fe/fe-core/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -715,12 +715,12 @@ under the License.
715715
<dependency>
716716
<groupId>com.starrocks</groupId>
717717
<artifactId>starclient</artifactId>
718-
<version>3.1-rc4</version>
718+
<version>3.1-rc5</version>
719719
</dependency>
720720
<dependency>
721721
<groupId>com.starrocks</groupId>
722722
<artifactId>starmanager</artifactId>
723-
<version>3.1-rc4</version>
723+
<version>3.1-rc5</version>
724724
</dependency>
725725

726726
<!-- https://mvnrepository.com/artifact/io.opentelemetry/opentelemetry-api -->

run-be-ut.sh

+14-37
Original file line numberDiff line numberDiff line change
@@ -148,44 +148,21 @@ if [ "${USE_STAROS}" == "ON" ]; then
148148
# assume starlet_thirdparty is installed to ${STARROCKS_THIRDPARTY}/installed/starlet/
149149
STARLET_INSTALL_DIR=${STARROCKS_THIRDPARTY}/installed/starlet
150150
fi
151-
${CMAKE_CMD} -G "${CMAKE_GENERATOR}" \
152-
-DSTARROCKS_THIRDPARTY=${STARROCKS_THIRDPARTY}\
153-
-DSTARROCKS_HOME=${STARROCKS_HOME} \
154-
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
155-
-DMAKE_TEST=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
156-
-DUSE_AVX2=$USE_AVX2 -DUSE_AVX512=$USE_AVX512 -DUSE_SSE4_2=$USE_SSE4_2 \
157-
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
158-
-DUSE_STAROS=${USE_STAROS} -DWITH_GCOV=${WITH_GCOV} \
159-
-DWITH_CACHELIB=${WITH_CACHELIB} \
160-
-DWITH_STARCACHE=${USE_STAROS} \
161-
-DSTARCACHE_THIRDPARTY_DIR=${STARROCKS_THIRDPARTY}/installed \
162-
-DSTARCACHE_SKIP_INSTALL=ON \
163-
-Dabsl_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/absl \
164-
-DgRPC_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/grpc \
165-
-Dprometheus-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/prometheus-cpp \
166-
-DCURL_LIBRARY=${STARROCKS_THIRDPARTY}/installed/lib/libcurl.a \
167-
-DCURL_INCLUDE_DIR=${STARROCKS_THIRDPARTY}/installed/include \
168-
-DLIBXML2_INCLUDE_DIR=${STARLET_INSTALL_DIR}/third_party/include/libxml2 \
169-
-DLIBXML2_LIBRARY=${STARLET_INSTALL_DIR}/third_party/lib/libxml2.a \
170-
-Dazure-core-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-core-cpp \
171-
-Dazure-identity-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-identity-cpp \
172-
-Dazure-storage-common-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-storage-common-cpp \
173-
-Dazure-storage-blobs-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/share/azure-storage-blobs-cpp \
174-
-Dstarlet_DIR=${STARLET_INSTALL_DIR}/starlet_install/lib/cmake ..
175-
else
176-
${CMAKE_CMD} -G "${CMAKE_GENERATOR}" \
177-
-DSTARROCKS_THIRDPARTY=${STARROCKS_THIRDPARTY}\
178-
-DSTARROCKS_HOME=${STARROCKS_HOME} \
179-
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
180-
-DMAKE_TEST=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
181-
-DUSE_AVX2=$USE_AVX2 -DUSE_AVX512=$USE_AVX512 -DUSE_SSE4_2=$USE_SSE4_2 \
182-
-DWITH_GCOV=${WITH_GCOV} \
183-
-DWITH_CACHELIB=${WITH_CACHELIB} \
184-
-DWITH_STARCACHE=${USE_STAROS} \
185-
-DSTARCACHE_THIRDPARTY_DIR=${STARROCKS_THIRDPARTY}/installed \
186-
-DSTARCACHE_SKIP_INSTALL=ON \
187-
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON ../
151+
export STARLET_INSTALL_DIR
188152
fi
153+
${CMAKE_CMD} -G "${CMAKE_GENERATOR}" \
154+
-DSTARROCKS_THIRDPARTY=${STARROCKS_THIRDPARTY}\
155+
-DSTARROCKS_HOME=${STARROCKS_HOME} \
156+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
157+
-DMAKE_TEST=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
158+
-DUSE_AVX2=$USE_AVX2 -DUSE_AVX512=$USE_AVX512 -DUSE_SSE4_2=$USE_SSE4_2 \
159+
-DUSE_STAROS=${USE_STAROS} \
160+
-DSTARLET_INSTALL_DIR=${STARLET_INSTALL_DIR} \
161+
-DWITH_GCOV=${WITH_GCOV} \
162+
-DWITH_CACHELIB=${WITH_CACHELIB} \
163+
-DWITH_STARCACHE=${USE_STAROS} \
164+
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON ../
165+
189166
${BUILD_SYSTEM} -j${PARALLEL}
190167

191168
echo "*********************************"

thirdparty/starlet-artifacts-version.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
# https://hub.docker.com/r/starrocks/starlet-artifacts-centos7/tags
1010
#
1111
# Update the following tag when STARLET releases a new version.
12-
export STARLET_ARTIFACTS_TAG=v3.1-rc3
12+
export STARLET_ARTIFACTS_TAG=v3.1-rc5

0 commit comments

Comments
 (0)