This is an automated email from the ASF dual-hosted git repository.
chengchengjin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 9361e8cab [VL] Daily update velox version(2024_08_13) (#6794)
9361e8cab is described below
commit 9361e8cab463916d5a0a693ac665ccc70c949750
Author: Jin Chengcheng <[email protected]>
AuthorDate: Tue Aug 13 14:38:57 2024 +0800
[VL] Daily update velox version(2024_08_13) (#6794)
---
ep/build-velox/src/get_velox.sh | 2 +-
ep/build-velox/src/modify_velox.patch | 40 +++++++++++++++++------------------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index b65dfda1c..5e231ae21 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_08_11
+VELOX_BRANCH=2024_08_13
VELOX_HOME=""
OS=`uname -s`
diff --git a/ep/build-velox/src/modify_velox.patch
b/ep/build-velox/src/modify_velox.patch
index c710ff545..fa2926c61 100644
--- a/ep/build-velox/src/modify_velox.patch
+++ b/ep/build-velox/src/modify_velox.patch
@@ -95,8 +95,19 @@ index 56b673e87..ef48ae9d9 100644
URL_HASH ${VELOX_ARROW_BUILD_SHA256_CHECKSUM}
SOURCE_SUBDIR cpp
CMAKE_ARGS ${ARROW_CMAKE_ARGS}
+diff --git a/CMake/resolve_dependency_modules/simdjson.cmake
b/CMake/resolve_dependency_modules/simdjson.cmake
+index 69e7f2044..777eb5ec1 100644
+--- a/CMake/resolve_dependency_modules/simdjson.cmake
++++ b/CMake/resolve_dependency_modules/simdjson.cmake
+@@ -29,4 +29,6 @@ FetchContent_Declare(
+ URL ${VELOX_SIMDJSON_SOURCE_URL}
+ URL_HASH ${VELOX_SIMDJSON_BUILD_SHA256_CHECKSUM})
+
++set(SIMDJSON_SKIPUTF8VALIDATION ON)
++
+ FetchContent_MakeAvailable(simdjson)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2dc95f972..391485879 100644
+index cc180b86c..7ca6fa727 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,10 +236,15 @@ if(VELOX_ENABLE_ABFS)
@@ -129,19 +140,19 @@ index 2dc95f972..391485879 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 f5e6aae72..4c4afe70b 100644
+index 23ef279c2..7e4c2f2b2 100644
--- a/velox/common/process/tests/CMakeLists.txt
+++ b/velox/common/process/tests/CMakeLists.txt
@@ -24,4 +24,6 @@ target_link_libraries(
fmt::fmt
- gtest
velox_time
-- gtest_main)
-+ gtest_main
+ GTest::gtest
+- GTest::gtest_main)
++ GTest::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
+index 5a566770f..8c2a48cc2 100644
--- a/velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.cpp
+++ b/velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.cpp
@@ -38,7 +38,6 @@ std::shared_ptr<FileSystem> abfsFileSystemGenerator(
@@ -166,12 +177,12 @@ 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 97266c253..11d88dcc4 100644
+index 0cda25430..b15565796 100644
--- a/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt
+++ b/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt
@@ -38,7 +38,9 @@ target_link_libraries(
- gtest
- gtest_main
+ GTest::gtest
+ GTest::gtest_main
arrow
- arrow_testing)
+ arrow_testing
@@ -180,14 +191,3 @@ index 97266c253..11d88dcc4 100644
add_library(
velox_dwio_arrow_parquet_writer_test_lib
-diff --git a/CMake/resolve_dependency_modules/simdjson.cmake
b/CMake/resolve_dependency_modules/simdjson.cmake
-index 69e7f2044..777eb5ec1 100644
---- a/CMake/resolve_dependency_modules/simdjson.cmake
-+++ b/CMake/resolve_dependency_modules/simdjson.cmake
-@@ -29,4 +29,6 @@ FetchContent_Declare(
- URL ${VELOX_SIMDJSON_SOURCE_URL}
- URL_HASH ${VELOX_SIMDJSON_BUILD_SHA256_CHECKSUM})
-
-+set(SIMDJSON_SKIPUTF8VALIDATION ON)
-+
- FetchContent_MakeAvailable(simdjson)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
