[GLUTEN-6887][VL] Daily Update Velox Version (2024_12_07) (apache#8171)

Upstream Velox's New Commits: 2c5384ed4 by Jimmy Lu, fix: Incorrect result when hash probe dynamic filters push down through right join (11768) c11a46102 by Masha Basmanova, feat: Add Type::toSummaryString API (11776) 12ae85b56 by aditi-pandit, refactor: Change C style casts to C++ style (Part 3) (11686) 422fcee45 by zuyu, refactor(parquet): Int96 timestamp column reader (11719) e983aaccc by Deepak Majeti, refactor(parquet): Move arrow levelComparison to common (11711) 3ead2f4de by Xiaoxuan Meng, fix: Fix flaky TaskPauseTest.resumeFuture test (11773) 939c102f0 by Jialiang Tan, feat: Add priority based memory reclaim framework (11598) 7672dd541 by Yenda Li, Fix initialization order of kSpecialforms (11770) 54ad56dbc by Huameng (Michael) Jiang, refactor(nimble selective reader): Extract common deduplicated reader helper class (11766) 19533e433 by Jialiang Tan, fix: Make TopNRowNumber reclaimable when loading lazy (11764) 9226a863e by Huameng (Michael) Jiang, test(nimble selective reader): Add small read size tests for selective reader complex types (11767) 24b41e5fd by Jacob Wujciak-Jens, build(cmake): Clean up various issues (11751) 72054031f by Yenda Li, Add ipprefix cast operators for ipaddr [2/n] (11481) e7fbaea86 by Kevin Wilfong, fix: Throw on white space in percent encoded values in url_decode (11749) 71d1eca08 by Daniel Bauer, fix: Benchmark flag max_coalesced_distance_bytes type (11758) 99590e9d4 by Jialiang Tan, feat: Enable RowContainer column stats by default (11731) 28f43bf4f by Masha Basmanova, feat: Add MultiFragmentPlan::toSummaryString method (11756) d97bae061 by Masha Basmanova, feat: Add method to print plan summary (11750)
yikf · Dec 9, 2024 · ce193c4 · ce193c4
1 parent 905faea
commit ce193c4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/cpp/velox/tests/MemoryManagerTest.cc b/cpp/velox/tests/MemoryManagerTest.cc
@@ -274,7 +274,8 @@ void MockSparkTaskMemoryManager::release(uint64_t bytes) {
 
 class MockMemoryReclaimer : public facebook::velox::memory::MemoryReclaimer {
  public:
-  explicit MockMemoryReclaimer(std::vector<void*>& buffs, int32_t size) : buffs_(buffs), size_(size) {}
+  explicit MockMemoryReclaimer(std::vector<void*>& buffs, int32_t size)
+      : facebook::velox::memory::MemoryReclaimer(0), buffs_(buffs), size_(size) {}
 
   bool reclaimableBytes(const memory::MemoryPool& pool, uint64_t& reclaimableBytes) const override {
     uint64_t total = 0;

diff --git 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_12_06
+VELOX_BRANCH=2024_12_07
 VELOX_HOME=""
 
 OS=`uname -s`

diff --git a/ep/build-velox/src/modify_velox.patch b/ep/build-velox/src/modify_velox.patch
@@ -10,16 +10,15 @@ index ddd232050..b6ed2432b 100644
 +
  FetchContent_MakeAvailable(simdjson)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7fd99b6dc..e7e03a800 100644
+index 5929473ae..e4e28c4f1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -428,7 +428,7 @@ velox_resolve_dependency(Boost 1.77.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES})
- # for reference. find_package(range-v3)
+@@ -422,7 +422,7 @@ velox_resolve_dependency(Boost 1.77.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES})
 
  velox_set_source(gflags)
+
 -velox_resolve_dependency(gflags COMPONENTS ${VELOX_GFLAGS_TYPE})
 +velox_resolve_dependency(gflags)
+
  if(NOT TARGET gflags::gflags)
    # 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
-