This is an automated email from the ASF dual-hosted git repository.

kejia 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 d7ed0844e [VL] Daily Update Velox Version (2024_03_13) (#4944)
d7ed0844e is described below

commit d7ed0844ebe7a750c52000944e9a4f65343f5e79
Author: Gluten Performance Bot 
<[email protected]>
AuthorDate: Wed Mar 13 19:26:39 2024 +0800

    [VL] Daily Update Velox Version (2024_03_13) (#4944)
    
    85f39732b by hengjiang.ly, Add prefix-sort with support for fixed width 
sorting keys (8146)
    de54d1e18 by Ma, Rong, Allow binding fixed precision or scale for decimal 
type (9044)
    86f559c38 by xiaoxmeng, Fix a task early termination with group execution 
(9047)
    451db90f0 by Christian Zentgraf, Fix equality check for simple floating 
types in RowContainer (7780)
    17de646b6 by Patrick Sullivan, Fix overflow in 
FloatingPointColumnReader::skip (9046)
    a108c70cc by Jake Jung, Remove `InputStream` access (9032)
    b49f90954 by Jake Jung, Curly initializer and member initialize. (9031)
    9c54819f8 by Jake Jung, More C++: Remove virtual for destructor (9030)
    814a86d51 by zhli1142015, Add monotonically_increasing_id Spark function 
(9007)
    18deebee6 by Jialiang Tan, Add force path to MemoryManager::shrinkPools 
(9020)
    829132ad6 by Kevin Wilfong, Fix potential SIGSEGV in RowContainer cleanup 
after OOM (9034)
    c80cb01ef by Kevin Wilfong, Speed up MemoryPool in debug mode (9040)
    5847d125d by Kevin Wilfong, Fix memory leak in Spill (9039)
    49d1224fa by Daniel Munoz, Add non-blocking support for DwrfReader (8884)
    21242cb87 by Sandino Flores, Update dependencies of GCS (8960)
---
 cpp/velox/memory/VeloxMemoryManager.cc | 7 +++++--
 ep/build-velox/src/get_velox.sh        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cpp/velox/memory/VeloxMemoryManager.cc 
b/cpp/velox/memory/VeloxMemoryManager.cc
index 3f6682e2c..0d22a9d08 100644
--- a/cpp/velox/memory/VeloxMemoryManager.cc
+++ b/cpp/velox/memory/VeloxMemoryManager.cc
@@ -63,8 +63,11 @@ class ListenableArbitrator : public 
velox::memory::MemoryArbitrator {
     return true;
   }
 
-  uint64_t shrinkCapacity(const 
std::vector<std::shared_ptr<velox::memory::MemoryPool>>& pools, uint64_t 
targetBytes)
-      override {
+  uint64_t shrinkCapacity(
+      const std::vector<std::shared_ptr<velox::memory::MemoryPool>>& pools,
+      uint64_t targetBytes,
+      bool allowSpill = true,
+      bool allowAbort = false) override {
     facebook::velox::exec::MemoryReclaimer::Stats status;
     GLUTEN_CHECK(pools.size() == 1, "Should shrink a single pool at a time");
     std::lock_guard<std::recursive_mutex> l(mutex_); // FIXME: Do we have 
recursive locking for this mutex?
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index e6b3a1716..2845cfa64 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_03_12
+VELOX_BRANCH=2024_03_13
 VELOX_HOME=""
 
 #Set on run gluten on HDFS


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to