[GLUTEN-6887][VL] Daily Update Velox Version (2024_11_13) (#7926)

Signed-off-by: Yuan Zhou <[email protected]> Co-authored-by: Hongze Zhang <[email protected]>
apache · Nov 13, 2024 · 5a28143 · 5a28143
1 parent 73a1a01
commit 5a28143
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/...ends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala b/...ends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala
@@ -153,7 +153,8 @@ class VeloxSparkPlanExecApi extends SparkPlanExecApi {
         left.dataType.isInstanceOf[DecimalType] && right.dataType
           .isInstanceOf[DecimalType] && !SQLConf.get.decimalOperationsAllowPrecisionLoss
       ) {
-        val newName = "not_allow_precision_loss_"
+        // https://github.com/facebookincubator/velox/pull/10383
+        val newName = substraitExprName + "_deny_precision_loss"
         GenericExpressionTransformer(newName, Seq(left, right), original)
       } else {
         GenericExpressionTransformer(substraitExprName, Seq(left, right), original)

diff --git a/cpp/velox/memory/VeloxMemoryManager.cc b/cpp/velox/memory/VeloxMemoryManager.cc
@@ -99,7 +99,9 @@ class ListenableArbitrator : public velox::memory::MemoryArbitrator {
   }
 
   bool growCapacity(velox::memory::MemoryPool* pool, uint64_t targetBytes) override {
-    velox::memory::ScopedMemoryArbitrationContext ctx(pool);
+    // Set arbitration context to allow memory over-use during recursive arbitration.
+    // See MemoryPoolImpl::maybeIncrementReservation.
+    velox::memory::ScopedMemoryArbitrationContext ctx{};
     velox::memory::MemoryPool* candidate;
     {
       std::unique_lock guard{mutex_};

diff --git a/cpp/velox/operators/functions/RegistrationAllFunctions.cc b/cpp/velox/operators/functions/RegistrationAllFunctions.cc
@@ -76,13 +76,6 @@ void registerFunctionOverwrite() {
   velox::functions::registerPrestoVectorFunctions();
 }
 
-void registerFunctionForConfig() {
-  const std::string prefix = "not_allow_precision_loss_";
-  velox::functions::sparksql::registerDecimalAdd(prefix, false);
-  velox::functions::sparksql::registerDecimalSubtract(prefix, false);
-  velox::functions::sparksql::registerDecimalMultiply(prefix, false);
-  velox::functions::sparksql::registerDecimalDivide(prefix, false);
-}
 } // namespace
 
 void registerAllFunctions() {
@@ -96,7 +89,6 @@ void registerAllFunctions() {
   // Using function overwrite to handle function names mismatch between Spark
   // and Velox.
   registerFunctionOverwrite();
-  registerFunctionForConfig();
 }
 
 } // namespace gluten
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_11_12
+VELOX_BRANCH=2024_11_13
 VELOX_HOME=""
 
 OS=`uname -s`