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

yuanzhou 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 ca5cafeb0d [GLUTEN-6887][VL] Daily Update Velox Version (2025_03_07) 
(#8924)
ca5cafeb0d is described below

commit ca5cafeb0d335a2c6866c80d40ed03560318d8a7
Author: Gluten Performance Bot 
<[email protected]>
AuthorDate: Sat Mar 8 17:37:58 2025 +0000

    [GLUTEN-6887][VL] Daily Update Velox Version (2025_03_07) (#8924)
    
    e6c6d9503 by Masha Basmanova, refactor: Extract OperatorStats into its own 
file (12567)
    586117039 by Xiaoxuan Meng, misc: Allow dictionary encoding in index join 
test (12564)
    9fd081304 by Jialiang Tan, fix: Fix error type of arbitration failure 
(12507)
    9a5946a09 by James Gill, feat: BingTile cast to/from Bigint (12505)
    0e3e0d2c4 by Natasha Sehgal, Add support for Unknown Type in Set Union 
(12559)
    b9d1ed01a by Orri Erling, feat: Add field access resolving hook (12530)
    a1e07f321 by Jimmy Lu, fix: Uninitialized inMap in NullColumnReader (12549)
---
 .github/workflows/velox_backend.yml    | 2 +-
 cpp/velox/memory/VeloxMemoryManager.cc | 5 ++---
 ep/build-velox/src/get_velox.sh        | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/velox_backend.yml 
b/.github/workflows/velox_backend.yml
index ec5ee19c7e..4d8fdb2480 100644
--- a/.github/workflows/velox_backend.yml
+++ b/.github/workflows/velox_backend.yml
@@ -1015,7 +1015,7 @@ jobs:
           cd $GITHUB_WORKSPACE/
           export SPARK_SCALA_VERSION=2.13
           $MVN_CMD clean test -Pspark-3.5 -Pscala-2.13 -Pbackends-velox 
-Pceleborn -Piceberg \
-          -Pdelta -Pspark-ut 
-DargLine="-Dspark.test.home=/opt/shims/spark35-scala2.13/spark_home/" \
+          -Pdelta -Pspark-ut 
-DargLine="-Dspark.test.home=/opt/shims/spark35-scala-2.13/spark_home/" \
           
-DtagsToExclude=org.apache.spark.tags.ExtendedSQLTest,org.apache.gluten.tags.UDFTest,org.apache.gluten.tags.SkipTestTags
       - name: Upload test report
         if: always()
diff --git a/cpp/velox/memory/VeloxMemoryManager.cc 
b/cpp/velox/memory/VeloxMemoryManager.cc
index 46c5186f5b..c4317c25a5 100644
--- a/cpp/velox/memory/VeloxMemoryManager.cc
+++ b/cpp/velox/memory/VeloxMemoryManager.cc
@@ -107,7 +107,7 @@ class ListenableArbitrator : public 
velox::memory::MemoryArbitrator {
     VELOX_CHECK_EQ(ret, 1);
   }
 
-  bool growCapacity(velox::memory::MemoryPool* pool, uint64_t targetBytes) 
override {
+  void growCapacity(velox::memory::MemoryPool* pool, uint64_t targetBytes) 
override {
     // Set arbitration context to allow memory over-use during recursive 
arbitration.
     // See MemoryPoolImpl::maybeIncrementReservation.
     velox::memory::ScopedMemoryArbitrationContext ctx{};
@@ -120,7 +120,6 @@ class ListenableArbitrator : public 
velox::memory::MemoryArbitrator {
     VELOX_CHECK(pool->root() == candidate, "Illegal state in 
ListenableArbitrator");
 
     growCapacityInternal(pool->root(), targetBytes);
-    return true;
   }
 
   uint64_t shrinkCapacity(uint64_t targetBytes, bool allowSpill, bool 
allowAbort) override {
@@ -146,7 +145,7 @@ class ListenableArbitrator : public 
velox::memory::MemoryArbitrator {
   }
 
   std::string toString() const override {
-    return fmt::format("ARBITRATOR[{}] CAPACITY {} {}", kind_, 
velox::succinctBytes(capacity_), stats().toString());
+    return fmt::format("ARBITRATOR[{}] CAPACITY {} {}", kind_, 
velox::succinctBytes(capacity()), stats().toString());
   }
 
  private:
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index cc3102caca..06d5bc3cec 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=2025_03_06
+VELOX_BRANCH=2025_03_07
 VELOX_HOME=""
 
 OS=`uname -s`


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

Reply via email to