diff --git a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxIteratorApi.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxIteratorApi.scala index 8a80023244..d8b23b358f 100644 --- a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxIteratorApi.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxIteratorApi.scala @@ -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 diff --git a/cpp/CMake/FindRoaring.cmake b/cpp/CMake/FindRoaring.cmake index 0d36108373..bfb7e9fb22 100644 --- a/cpp/CMake/FindRoaring.cmake +++ b/cpp/CMake/FindRoaring.cmake @@ -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) diff --git a/cpp/velox/CMakeLists.txt b/cpp/velox/CMakeLists.txt index 5034c1601a..532dd6e6a7 100644 --- a/cpp/velox/CMakeLists.txt +++ b/cpp/velox/CMakeLists.txt @@ -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) @@ -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}) diff --git a/cpp/velox/compute/delta/tests/CMakeLists.txt b/cpp/velox/compute/delta/tests/CMakeLists.txt index ec86cab0d7..9641cc341c 100644 --- a/cpp/velox/compute/delta/tests/CMakeLists.txt +++ b/cpp/velox/compute/delta/tests/CMakeLists.txt @@ -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 diff --git a/cpp/velox/tests/CMakeLists.txt b/cpp/velox/tests/CMakeLists.txt index 0c61850e12..37d9cfb238 100644 --- a/cpp/velox/tests/CMakeLists.txt +++ b/cpp/velox/tests/CMakeLists.txt @@ -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() @@ -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" diff --git a/ep/build-velox/src/get-velox.sh b/ep/build-velox/src/get-velox.sh index 4d6eccdb34..042a9bc43e 100755 --- a/ep/build-velox/src/get-velox.sh +++ b/ep/build-velox/src/get-velox.sh @@ -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