Skip to content
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.

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

[GLUTEN-6887][VL] Daily Update Velox Version (2024_08_26) #7002

Merged
merged 2 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 ep/build-velox/src/get_velox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
set -exu

VELOX_REPO=https://github.com/oap-project/velox.git
VELOX_BRANCH=2024_08_23
VELOX_BRANCH=2024_08_26
VELOX_HOME=""

OS=`uname -s`
Expand Down
17 changes: 9 additions & 8 deletions ep/build-velox/src/modify_velox.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMake/resolve_dependency_modules/arrow/CMakeLists.txt b/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
index 56b673e87..ef48ae9d9 100644
index ddf1fac71..ef48ae9d9 100644
--- a/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
+++ b/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
@@ -14,16 +14,13 @@
@@ -14,17 +14,13 @@
project(Arrow)

if(VELOX_ENABLE_ARROW)
Expand All @@ -16,6 +16,7 @@ index 56b673e87..ef48ae9d9 100644
set(ARROW_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/arrow_ep")
set(ARROW_CMAKE_ARGS
- -DARROW_PARQUET=OFF
- -DARROW_DEPENDENCY_SOURCE=AUTO
+ -DARROW_PARQUET=ON
+ -DARROW_FILESYSTEM=ON
+ -DARROW_PROTOBUF_USE_SHARED=OFF
Expand All @@ -24,7 +25,7 @@ index 56b673e87..ef48ae9d9 100644
-DARROW_WITH_THRIFT=ON
-DARROW_WITH_LZ4=ON
-DARROW_WITH_SNAPPY=ON
@@ -37,18 +34,16 @@ if(VELOX_ENABLE_ARROW)
@@ -38,18 +34,16 @@ if(VELOX_ENABLE_ARROW)
-DCMAKE_INSTALL_PREFIX=${ARROW_PREFIX}/install
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DARROW_BUILD_STATIC=ON
Expand All @@ -48,7 +49,7 @@ index 56b673e87..ef48ae9d9 100644

set_property(TARGET thrift PROPERTY INTERFACE_INCLUDE_DIRECTORIES
${THRIFT_INCLUDE_DIR})
@@ -67,6 +62,9 @@ if(VELOX_ENABLE_ARROW)
@@ -68,6 +62,9 @@ if(VELOX_ENABLE_ARROW)
arrow_ep
PREFIX ${ARROW_PREFIX}
URL ${VELOX_ARROW_SOURCE_URL}
Expand All @@ -70,10 +71,10 @@ index 69e7f2044..777eb5ec1 100644
+
FetchContent_MakeAvailable(simdjson)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc180b86c..7ca6fa727 100644
index 7f7cbc92f..52adb1250 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,10 +236,15 @@ if(VELOX_ENABLE_ABFS)
@@ -242,10 +242,15 @@ if(VELOX_ENABLE_ABFS)
endif()

if(VELOX_ENABLE_HDFS)
Expand All @@ -93,7 +94,7 @@ index cc180b86c..7ca6fa727 100644
add_definitions(-DVELOX_ENABLE_HDFS3)
endif()

@@ -380,7 +385,7 @@ resolve_dependency(Boost 1.77.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES})
@@ -385,7 +390,7 @@ resolve_dependency(Boost 1.77.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES})
# for reference. find_package(range-v3)

set_source(gflags)
Expand All @@ -115,7 +116,7 @@ index 23ef279c2..7e4c2f2b2 100644
+ 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 5a566770f..8c2a48cc2 100644
index a8b0df52a..254c56b70 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(
Expand Down
Loading