From f8fc66d1fc445766c4de91dcf857a35fc59e5217 Mon Sep 17 00:00:00 2001
From: glutenperfbot <glutenperfbot@intel-internal.com>
Date: Mon, 4 Mar 2024 10:41:44 +0800
Subject: [PATCH 1/2] [VL] Daily Update Velox Version (2024_03_04)

Signed-off-by: glutenperfbot <glutenperfbot@intel-internal.com>
---
 ep/build-velox/src/get_velox.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 0cb16c493353..18d9a5e0a81a 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_01
+VELOX_BRANCH=2024_03_04
 VELOX_HOME=""
 
 #Set on run gluten on HDFS

From 06b3f52cf8525372ec762f61dbf1e93988051c2e Mon Sep 17 00:00:00 2001
From: PHILO-HE <feilong.he@intel.com>
Date: Mon, 4 Mar 2024 15:52:43 +0800
Subject: [PATCH 2/2] Fix Gluten CPP test failure

---
 cpp/velox/tests/FunctionTest.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cpp/velox/tests/FunctionTest.cc b/cpp/velox/tests/FunctionTest.cc
index 88c119f3b614..5eb4b6a8582b 100644
--- a/cpp/velox/tests/FunctionTest.cc
+++ b/cpp/velox/tests/FunctionTest.cc
@@ -39,6 +39,10 @@ using namespace facebook::velox::test;
 namespace gluten {
 class FunctionTest : public ::testing::Test {
  protected:
+  static void SetUpTestCase() {
+    memory::MemoryManager::testingSetInstance({});
+  }
+
   std::shared_ptr<core::QueryCtx> queryCtx_ = std::make_shared<core::QueryCtx>();
 
   std::shared_ptr<memory::MemoryPool> pool_ = gluten::defaultLeafVeloxMemoryPool();