Skip to content

[GLUTEN-6887][VL] Daily Update Velox Version (2026_05_11) #12068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhouyuan merged 3 commits into from
May 12, 2026
Merged

[GLUTEN-6887][VL] Daily Update Velox Version (2026_05_11) #12068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7703c62
[GLUTEN-6887][VL] Daily Update Velox Version (dft-2026_05_11)
May 11, 2026
f8990af
[VL] Fix decimal partition serialization
malinjawi May 11, 2026
e2324ec
[VL] Link roaring in Velox test targets
malinjawi May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxIteratorApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class VeloxIteratorApi extends IteratorApi with Logging {
case _: DateType =>
dateFormatter.format(pv.asInstanceOf[Integer])
case _: DecimalType =>
pv.asInstanceOf[Decimal].toJavaBigDecimal.unscaledValue().toString
pv.asInstanceOf[Decimal].toJavaBigDecimal.toPlainString
case _: TimestampType =>
timestampFormatter.format(pv.asInstanceOf[java.lang.Long])
case _ => pv.toString
Expand Down
10 changes: 4 additions & 6 deletions cpp/CMake/FindRoaring.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,10 @@ if(Roaring_INCLUDE_DIR
endif()

if(_roaring_found_via_pkgconfig)
add_library(roaring INTERFACE)
target_link_libraries(roaring INTERFACE PkgConfig::Roaring)
_gluten_roaring_add_headers(roaring)
set(Roaring_FOUND TRUE)
message(STATUS "Found roaring via pkg-config imported target fallback.")
return()
message(
STATUS
"Found roaring via pkg-config without direct library; using FetchContent."
)
endif()

include(BuildRoaring)
Expand Down
3 changes: 2 additions & 1 deletion cpp/velox/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ if(NOT DEFINED VELOX_BUILD_PATH)
endif()

find_package(Roaring REQUIRED)
set(GLUTEN_ROARING_LINK_LIBRARY roaring)

set(VELOX_PROTO_SRC_DIR
${GLUTEN_HOME}/backends-velox/src/main/resources/org/apache/gluten/proto)
Expand Down Expand Up @@ -326,7 +327,7 @@ endif()
target_link_libraries(velox PUBLIC facebook::velox)

target_link_libraries(velox PUBLIC Folly::folly)
target_link_libraries(velox PUBLIC roaring)
target_link_libraries(velox PUBLIC ${GLUTEN_ROARING_LINK_LIBRARY})

find_re2()
target_link_libraries(velox PUBLIC ${RE2_LIBRARY})
Expand Down
5 changes: 3 additions & 2 deletions cpp/velox/compute/delta/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@

add_executable(velox_roaring_bitmap_array_test RoaringBitmapArrayTest.cpp)

target_link_libraries(velox_roaring_bitmap_array_test velox roaring
GTest::gtest GTest::gtest_main)
target_link_libraries(
velox_roaring_bitmap_array_test velox ${GLUTEN_ROARING_LINK_LIBRARY}
GTest::gtest GTest::gtest_main)

add_test(
NAME velox_roaring_bitmap_array_test
Expand Down
8 changes: 5 additions & 3 deletions cpp/velox/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ function(add_velox_test TEST_EXEC)
add_executable(${TEST_EXEC} ${SOURCES} ${VELOX_TEST_COMMON_SRCS})
target_include_directories(${TEST_EXEC} PRIVATE ${CMAKE_SOURCE_DIR}/velox
${CMAKE_SOURCE_DIR}/src)
target_link_libraries(${TEST_EXEC} velox GTest::gtest GTest::gtest_main)
target_link_libraries(${TEST_EXEC} velox ${GLUTEN_ROARING_LINK_LIBRARY}
GTest::gtest GTest::gtest_main)
if(ENABLE_GPU)
target_link_libraries(${TEST_EXEC} velox_curl)
endif()
Expand Down Expand Up @@ -82,8 +83,9 @@ if(ENABLE_GPU)
facebook::velox::velox_cudf_exec
facebook::velox::velox_cudf_vector
facebook::velox::velox_cudf_hive_connector)
target_link_libraries(${TEST_EXEC} PRIVATE velox cudf::cudf velox_curl
GTest::gtest GTest::gtest_main)
target_link_libraries(
${TEST_EXEC} PRIVATE velox ${GLUTEN_ROARING_LINK_LIBRARY} cudf::cudf
velox_curl GTest::gtest GTest::gtest_main)
gtest_discover_tests(
${TEST_EXEC} DISCOVERY_MODE PRE_TEST
PROPERTIES LABELS "cuda_driver"
Expand Down
4 changes: 2 additions & 2 deletions ep/build-velox/src/get-velox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ set -exu

CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
VELOX_REPO=https://github.com/IBM/velox.git
VELOX_BRANCH=dft-2026_05_06
VELOX_ENHANCED_BRANCH=ibm-2026_05_06
VELOX_BRANCH=dft-2026_05_11
VELOX_ENHANCED_BRANCH=ibm-2026_05_11
VELOX_HOME=""
RUN_SETUP_SCRIPT=ON
ENABLE_ENHANCED_FEATURES=OFF
Expand Down
Loading