This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new f63fc67fdf1 branch-4.1: [build](variant) Support Variant NestedGroup
release hooks #64727 #64737 (#64775)
f63fc67fdf1 is described below
commit f63fc67fdf1d9275f9e69d880dc690917e98a411
Author: lihangyu <[email protected]>
AuthorDate: Thu Jun 25 18:24:12 2026 +0800
branch-4.1: [build](variant) Support Variant NestedGroup release hooks
#64727 #64737 (#64775)
cherry-pick from #64727
cherry-pick from #64737
---
be/CMakeLists.txt | 6 ++++++
be/src/storage/CMakeLists.txt | 8 ++++++++
be/test/CMakeLists.txt | 6 ++++++
build.sh | 11 +++++++++++
4 files changed, 31 insertions(+)
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index e76a1156115..b9d65f4ef87 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -148,6 +148,12 @@ message(STATUS "build file cache lru tool:
${BUILD_FILE_CACHE_LRU_TOOL}")
option(ENABLE_PAIMON_CPP "Enable Paimon C++ integration" ON)
set(PAIMON_HOME "" CACHE PATH "Paimon install prefix")
+option(ENABLE_VARIANT_NESTED_GROUP "Enable Variant NestedGroup feature module"
OFF)
+set(VARIANT_NESTED_GROUP_MODULE_DIR "" CACHE STRING "Variant NestedGroup
feature module directory under be/src")
+
+if (ENABLE_VARIANT_NESTED_GROUP AND "${VARIANT_NESTED_GROUP_MODULE_DIR}"
STREQUAL "")
+ message(FATAL_ERROR "ENABLE_VARIANT_NESTED_GROUP requires
VARIANT_NESTED_GROUP_MODULE_DIR")
+endif()
# Allow env to override when reconfiguring (avoid picking /usr/local).
if (DEFINED ENV{ENABLE_PAIMON_CPP})
diff --git a/be/src/storage/CMakeLists.txt b/be/src/storage/CMakeLists.txt
index 18a6109f610..e7a82b486db 100644
--- a/be/src/storage/CMakeLists.txt
+++ b/be/src/storage/CMakeLists.txt
@@ -29,6 +29,14 @@ file(GLOB_RECURSE SRC_FILES CONFIGURE_DEPENDS *.cpp)
# and linked by Storage.
list(FILTER SRC_FILES EXCLUDE REGEX ".*/storage/index/ann/.*\\.cpp$")
+if (ENABLE_VARIANT_NESTED_GROUP)
+ list(REMOVE_ITEM SRC_FILES
+
"${CMAKE_CURRENT_SOURCE_DIR}/segment/variant/nested_group_provider.cpp")
+ file(GLOB_RECURSE VARIANT_NESTED_GROUP_SOURCES CONFIGURE_DEPENDS
+
"${CMAKE_CURRENT_SOURCE_DIR}/../${VARIANT_NESTED_GROUP_MODULE_DIR}/*.cpp")
+ list(APPEND SRC_FILES ${VARIANT_NESTED_GROUP_SOURCES})
+endif()
+
add_library(Storage STATIC ${SRC_FILES})
target_link_libraries(Storage PRIVATE ann_index)
diff --git a/be/test/CMakeLists.txt b/be/test/CMakeLists.txt
index dc41d79b380..deb4fd922a0 100644
--- a/be/test/CMakeLists.txt
+++ b/be/test/CMakeLists.txt
@@ -23,6 +23,12 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_DIR}/test")
file(GLOB_RECURSE UT_FILES CONFIGURE_DEPENDS *.cpp)
+if (ENABLE_VARIANT_NESTED_GROUP)
+ file(GLOB_RECURSE VARIANT_NESTED_GROUP_UT_FILES CONFIGURE_DEPENDS
+
"${CMAKE_CURRENT_SOURCE_DIR}/${VARIANT_NESTED_GROUP_MODULE_DIR}/*.cpp")
+ list(APPEND UT_FILES ${VARIANT_NESTED_GROUP_UT_FILES})
+endif()
+
# Remove all cpp files from vector search (ANN index) subdirectory
# Since cpp files in vector search subdirs use header files from faiss.
# The compile check used by doris can not be applied to faiss headers.
diff --git a/build.sh b/build.sh
index 0277003e3ab..09327431a16 100755
--- a/build.sh
+++ b/build.sh
@@ -534,6 +534,12 @@ fi
if [[ -z "${WITH_TDE_DIR}" ]]; then
WITH_TDE_DIR=''
fi
+if [[ -z "${ENABLE_VARIANT_NESTED_GROUP}" ]]; then
+ ENABLE_VARIANT_NESTED_GROUP='OFF'
+fi
+if [[ -z "${VARIANT_NESTED_GROUP_MODULE_DIR}" ]]; then
+ VARIANT_NESTED_GROUP_MODULE_DIR=''
+fi
echo "Get params:
BUILD_FE -- ${BUILD_FE}
@@ -564,10 +570,13 @@ echo "Get params:
DISPLAY_BUILD_TIME -- ${DISPLAY_BUILD_TIME}
ENABLE_PCH -- ${ENABLE_PCH}
WITH_TDE_DIR -- ${WITH_TDE_DIR}
+ ENABLE_VARIANT_NESTED_GROUP -- ${ENABLE_VARIANT_NESTED_GROUP}
+ VARIANT_NESTED_GROUP_MODULE_DIR -- ${VARIANT_NESTED_GROUP_MODULE_DIR}
"
FEAT=()
FEAT+=($([[ -n "${WITH_TDE_DIR}" ]] && echo "+TDE" || echo "-TDE"))
+FEAT+=($([[ "${ENABLE_VARIANT_NESTED_GROUP}" == "ON" ]] && echo
"+VARIANT_NESTED_GROUP" || echo "-VARIANT_NESTED_GROUP"))
FEAT+=($([[ "${ENABLE_HDFS_STORAGE_VAULT:-OFF}" == "ON" ]] && echo
"+HDFS_STORAGE_VAULT" || echo "-HDFS_STORAGE_VAULT"))
FEAT+=($([[ ${BUILD_UI} -eq 1 ]] && echo "+UI" || echo "-UI"))
FEAT+=($([[ "${BUILD_AZURE}" == "ON" ]] && echo
"+AZURE_BLOB,+AZURE_STORAGE_VAULT" || echo "-AZURE_BLOB,-AZURE_STORAGE_VAULT"))
@@ -701,6 +710,8 @@ if [[ "${BUILD_BE}" -eq 1 ]]; then
-DDORIS_JAVA_HOME="${JAVA_HOME}" \
-DBUILD_AZURE="${BUILD_AZURE}" \
-DWITH_TDE_DIR="${WITH_TDE_DIR}" \
+ -DENABLE_VARIANT_NESTED_GROUP="${ENABLE_VARIANT_NESTED_GROUP}" \
+ -DVARIANT_NESTED_GROUP_MODULE_DIR="${VARIANT_NESTED_GROUP_MODULE_DIR}"
\
"${DORIS_HOME}/be"
if [[ "${OUTPUT_BE_BINARY}" -eq 1 ]]; then
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
