From adcf3d2d87cdfe15055f19502393564226b22759 Mon Sep 17 00:00:00 2001
From: xiaoxmeng <xiaoxmeng@fb.com>
Date: Tue, 9 Apr 2024 20:07:33 -0700
Subject: [PATCH] [native] Advance velox version

Also deprecate presto_cpp.query_memory_pool_init_capacity which has been
supported in velox
---
 .../presto_cpp/main/QueryContextManager.cpp            |  2 --
 .../presto_cpp/main/common/Counters.cpp                | 10 ----------
 .../presto_cpp/main/common/Counters.h                  |  3 ---
 presto-native-execution/velox                          |  2 +-
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/presto-native-execution/presto_cpp/main/QueryContextManager.cpp b/presto-native-execution/presto_cpp/main/QueryContextManager.cpp
index e5c004d8297b0..37fb00689784d 100644
--- a/presto-native-execution/presto_cpp/main/QueryContextManager.cpp
+++ b/presto-native-execution/presto_cpp/main/QueryContextManager.cpp
@@ -193,8 +193,6 @@ std::shared_ptr<core::QueryCtx> QueryContextManager::findOrCreateQueryCtx(
       !SystemConfig::instance()->memoryArbitratorKind().empty()
           ? memory::MemoryReclaimer::create()
           : nullptr);
-  RECORD_HISTOGRAM_METRIC_VALUE(
-      kCounterQueryMemoryPoolInitCapacity, pool->capacity());
 
   auto queryCtx = std::make_shared<core::QueryCtx>(
       driverExecutor_,
diff --git a/presto-native-execution/presto_cpp/main/common/Counters.cpp b/presto-native-execution/presto_cpp/main/common/Counters.cpp
index a67046a0ee37a..f30a2f9bcba7f 100644
--- a/presto-native-execution/presto_cpp/main/common/Counters.cpp
+++ b/presto-native-execution/presto_cpp/main/common/Counters.cpp
@@ -90,16 +90,6 @@ void registerPrestoMetrics() {
       0,
       62l * 1024 * 1024 * 1024, // max bucket value: 62GB
       100);
-  DEFINE_HISTOGRAM_METRIC(
-      kCounterQueryMemoryPoolInitCapacity,
-      4l * 1024 * 1024, // 4MB bucket size
-      0,
-      1024l * 1024 * 1024, // 1GB max size
-      5,
-      50,
-      90,
-      95,
-      100);
 
   /// ================== AsyncDataCache Counters ==================
 
diff --git a/presto-native-execution/presto_cpp/main/common/Counters.h b/presto-native-execution/presto_cpp/main/common/Counters.h
index a840fb41ba3ab..043b87b9ff028 100644
--- a/presto-native-execution/presto_cpp/main/common/Counters.h
+++ b/presto-native-execution/presto_cpp/main/common/Counters.h
@@ -141,9 +141,6 @@ constexpr folly::StringPiece kCounterMmapRawAllocBytesSmall{
 /// Peak number of bytes queued in PrestoExchangeSource waiting for consume.
 constexpr folly::StringPiece kCounterExchangeSourcePeakQueuedBytes{
     "presto_cpp.exchange_source_peak_queued_bytes"};
-/// Initial capacity of the root memory pool of queries
-constexpr folly::StringPiece kCounterQueryMemoryPoolInitCapacity{
-    "presto_cpp.query_memory_pool_init_capacity"};
 
 /// ================== Memory Arbitrator Counters =================
 
diff --git a/presto-native-execution/velox b/presto-native-execution/velox
index 84ae6bfd6f617..89de5d37a35e9 160000
--- a/presto-native-execution/velox
+++ b/presto-native-execution/velox
@@ -1 +1 @@
-Subproject commit 84ae6bfd6f61775b9e20742cdc5bc73ecd0829c3
+Subproject commit 89de5d37a35e94245fd069ab887f1e4855b5db1e