From 8f4712a08269ae22a92d55b7eecb50e9a94ac920 Mon Sep 17 00:00:00 2001
From: Yan Ma <yan.ma@intel.com>
Date: Thu, 30 Nov 2023 15:45:04 +0800
Subject: [PATCH] [VL]Daily Update Velox Version (20231129) (#3877)

---
 cpp/velox/CMakeLists.txt              |  2 +-
 ep/build-velox/src/modify_velox.patch | 44 ++++++++++++++++++---------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/cpp/velox/CMakeLists.txt b/cpp/velox/CMakeLists.txt
index 8ec9df2ae52e..0d4a99dfd658 100644
--- a/cpp/velox/CMakeLists.txt
+++ b/cpp/velox/CMakeLists.txt
@@ -26,7 +26,7 @@ include(FindPackageHandleStandardArgs)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx -mavx2")
 endif()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations -Wno-attributes")
 if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
diff --git a/ep/build-velox/src/modify_velox.patch b/ep/build-velox/src/modify_velox.patch
index 2410600deb28..3aea6f332245 100644
--- a/ep/build-velox/src/modify_velox.patch
+++ b/ep/build-velox/src/modify_velox.patch
@@ -35,11 +35,22 @@ index d49115f12..1aaa8e532 100644
 +          IMPORTED_LOCATION_DEBUG "${LZ4_LIBRARY_DEBUG}")
 +  endif()
  endif()
+diff --git a/CMake/resolve_dependency_modules/cpr.cmake b/CMake/resolve_dependency_modules/cpr.cmake
+index 4e5bf23ed..1f8deb0d2 100644
+--- a/CMake/resolve_dependency_modules/cpr.cmake
++++ b/CMake/resolve_dependency_modules/cpr.cmake
+@@ -30,5 +30,5 @@ FetchContent_Declare(
+   PATCH_COMMAND git apply
+                 ${CMAKE_CURRENT_LIST_DIR}/cpr/cpr-libcurl-compatible.patch)
+ set(BUILD_SHARED_LIBS OFF)
+-set(CPR_USE_SYSTEM_CURL OFF)
++set(CPR_USE_SYSTEM_CURL ON)
+ FetchContent_MakeAvailable(cpr)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b34966b7a..1999a50f0 100644
+index e2ff67fa5..e03b246e3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -211,10 +211,15 @@ if(VELOX_ENABLE_ABFS)
+@@ -243,10 +243,15 @@ if(VELOX_ENABLE_ABFS)
  endif()
  
  if(VELOX_ENABLE_HDFS)
@@ -59,7 +70,7 @@ index b34966b7a..1999a50f0 100644
    add_definitions(-DVELOX_ENABLE_HDFS3)
  endif()
  
-@@ -380,7 +385,7 @@ resolve_dependency(Boost 1.66.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES})
+@@ -401,7 +406,7 @@ resolve_dependency(Boost 1.66.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES})
  # for reference. find_package(range-v3)
  
  set_source(gflags)
@@ -69,7 +80,7 @@ index b34966b7a..1999a50f0 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/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
-index a1dda4b6c..dc423c826 100755
+index 42054e593..4c793b785 100755
 --- a/scripts/setup-ubuntu.sh
 +++ b/scripts/setup-ubuntu.sh
 @@ -31,7 +31,7 @@ export CMAKE_BUILD_TYPE=Release
@@ -82,18 +93,20 @@ index a1dda4b6c..dc423c826 100755
    g++ \
    cmake \
 diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
-index 570af4593..6b20e7908 100644
+index c7c4d8557..2715e625c 100644
 --- a/third_party/CMakeLists.txt
 +++ b/third_party/CMakeLists.txt
-@@ -27,6 +27,7 @@ if(VELOX_ENABLE_ARROW)
+@@ -26,7 +26,8 @@ if(VELOX_ENABLE_ARROW)
+   endif()
    set(ARROW_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/arrow_ep")
    set(ARROW_CMAKE_ARGS
-       -DARROW_PARQUET=ON
+-      -DARROW_PARQUET=OFF
++      -DARROW_PARQUET=ON
 +      -DARROW_FILESYSTEM=ON
+       -DARROW_WITH_THRIFT=ON
        -DARROW_WITH_LZ4=ON
        -DARROW_WITH_SNAPPY=ON
-       -DARROW_WITH_ZLIB=ON
-@@ -68,6 +69,7 @@ if(VELOX_ENABLE_ARROW)
+@@ -69,6 +70,7 @@ if(VELOX_ENABLE_ARROW)
      arrow_ep
      PREFIX ${ARROW_PREFIX}
      URL ${VELOX_ARROW_SOURCE_URL}
@@ -125,10 +138,10 @@ index 10ee508ba..027a58ecc 100644
  }
  
 diff --git a/velox/dwio/common/CMakeLists.txt b/velox/dwio/common/CMakeLists.txt
-index c4b767317..8bcf766e7 100644
+index 61264ef8c..293d5683b 100644
 --- a/velox/dwio/common/CMakeLists.txt
 +++ b/velox/dwio/common/CMakeLists.txt
-@@ -73,4 +73,5 @@ target_link_libraries(
+@@ -76,4 +76,5 @@ target_link_libraries(
    velox_exec
    Boost::regex
    Folly::folly
@@ -136,12 +149,12 @@ index c4b767317..8bcf766e7 100644
 +  glog::glog
 +  protobuf::libprotobuf)
 diff --git a/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt b/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt
-index ce1bc6782..3139314b4 100644
+index 2cabfc29a..54329ce23 100644
 --- a/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt
 +++ b/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt
-@@ -40,7 +40,9 @@ target_link_libraries(
+@@ -39,7 +39,9 @@ target_link_libraries(
+   gtest
    gtest_main
-   parquet
    arrow
 -  arrow_testing)
 +  arrow_testing
@@ -150,3 +163,6 @@ index ce1bc6782..3139314b4 100644
  
  add_library(
    velox_dwio_arrow_parquet_writer_test_lib
+-- 
+2.25.1
+