diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index 1315f1124854..841787d64c23 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -17,7 +17,7 @@ set -exu VELOX_REPO=https://github.com/oap-project/velox.git -VELOX_BRANCH=2024_07_25-1 +VELOX_BRANCH=2024_07_26 VELOX_HOME="" OS=`uname -s` diff --git a/ep/build-velox/src/modify_velox.patch b/ep/build-velox/src/modify_velox.patch index 5fd8b8b1eda8..533b493539e4 100644 --- a/ep/build-velox/src/modify_velox.patch +++ b/ep/build-velox/src/modify_velox.patch @@ -96,10 +96,10 @@ index 56b673e87..ef48ae9d9 100644 SOURCE_SUBDIR cpp CMAKE_ARGS ${ARROW_CMAKE_ARGS} diff --git a/CMakeLists.txt b/CMakeLists.txt -index bb7c49907..3372d48b4 100644 +index 2dc95f972..391485879 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -234,10 +234,15 @@ if(VELOX_ENABLE_ABFS) +@@ -236,10 +236,15 @@ if(VELOX_ENABLE_ABFS) endif() if(VELOX_ENABLE_HDFS) @@ -119,7 +119,7 @@ index bb7c49907..3372d48b4 100644 add_definitions(-DVELOX_ENABLE_HDFS3) endif() -@@ -378,7 +383,7 @@ resolve_dependency(Boost 1.77.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES}) +@@ -380,7 +385,7 @@ resolve_dependency(Boost 1.77.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES}) # for reference. find_package(range-v3) set_source(gflags) @@ -129,15 +129,17 @@ index bb7c49907..3372d48b4 100644 # This is a bit convoluted, but we want to be able to use gflags::gflags as a # target even when velox is built as a subproject which uses diff --git a/velox/common/process/tests/CMakeLists.txt b/velox/common/process/tests/CMakeLists.txt -index 6797697a1..3e241f8f7 100644 +index f5e6aae72..4c4afe70b 100644 --- a/velox/common/process/tests/CMakeLists.txt +++ b/velox/common/process/tests/CMakeLists.txt -@@ -18,4 +18,4 @@ add_executable(velox_process_test ProfilerTest.cpp ThreadLocalRegistryTest.cpp - add_test(velox_process_test velox_process_test) - - target_link_libraries(velox_process_test PRIVATE velox_process fmt::fmt gtest -- velox_time gtest_main) -+ velox_time gtest_main glog::glog gflags::gflags) +@@ -24,4 +24,6 @@ target_link_libraries( + fmt::fmt + gtest + velox_time +- gtest_main) ++ gtest_main ++ glog::glog ++ gflags::gflags) diff --git a/velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.cpp b/velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.cpp index e2a638df6..e383cf205 100644 --- a/velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.cpp @@ -164,10 +166,10 @@ index 10ee508ba..027a58ecc 100644 } diff --git a/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt b/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt -index 2cabfc29a..54329ce23 100644 +index 97266c253..11d88dcc4 100644 --- a/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt +++ b/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt -@@ -39,7 +39,9 @@ target_link_libraries( +@@ -38,7 +38,9 @@ target_link_libraries( gtest gtest_main arrow diff --git a/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index d5e8df63869e..f8a075ec0c41 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -220,6 +220,8 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("to_timestamp exception mode") // Replaced by a gluten test to pass timezone through config. .exclude("from_unixtime") + // https://github.com/facebookincubator/velox/pull/10563/files#diff-140dc50e6dac735f72d29014da44b045509df0dd1737f458de1fe8cfd33d8145 + .excludeGlutenTest("from_unixtime") enableSuite[GlutenDecimalExpressionSuite] enableSuite[GlutenDecimalPrecisionSuite] enableSuite[GlutenStringFunctionsSuite] diff --git a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index fcc2bd343262..6c21fc7cc2ba 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -135,6 +135,8 @@ class VeloxTestSettings extends BackendTestSettings { // Replaced by a gluten test to pass timezone through config. .exclude("from_unixtime") .exclude("test timestamp add") + // https://github.com/facebookincubator/velox/pull/10563/files#diff-140dc50e6dac735f72d29014da44b045509df0dd1737f458de1fe8cfd33d8145 + .excludeGlutenTest("from_unixtime") enableSuite[GlutenDecimalExpressionSuite] enableSuite[GlutenDecimalPrecisionSuite] enableSuite[GlutenHashExpressionsSuite] diff --git a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index 57346f493945..800e64a5a143 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -113,6 +113,8 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("to_timestamp exception mode") // Replaced by a gluten test to pass timezone through config. .exclude("from_unixtime") + // https://github.com/facebookincubator/velox/pull/10563/files#diff-140dc50e6dac735f72d29014da44b045509df0dd1737f458de1fe8cfd33d8145 + .excludeGlutenTest("from_unixtime") enableSuite[GlutenDecimalExpressionSuite] enableSuite[GlutenDecimalPrecisionSuite] enableSuite[GlutenHashExpressionsSuite] diff --git a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index 9716a7c14374..bea42826dd84 100644 --- a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -114,6 +114,8 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("to_timestamp exception mode") // Replaced by a gluten test to pass timezone through config. .exclude("from_unixtime") + // https://github.com/facebookincubator/velox/pull/10563/files#diff-140dc50e6dac735f72d29014da44b045509df0dd1737f458de1fe8cfd33d8145 + .excludeGlutenTest("from_unixtime") enableSuite[GlutenDecimalExpressionSuite] enableSuite[GlutenDecimalPrecisionSuite] enableSuite[GlutenHashExpressionsSuite]