From f801da73aa5516f61f89c29b39d951f9f7e270a1 Mon Sep 17 00:00:00 2001
From: Jialiang Tan <jacob.jialiang.tan@gmail.com>
Date: Wed, 13 Mar 2024 12:46:46 -0700
Subject: [PATCH] [native] Remove threshold spill session properties

---
 .../presto/SystemSessionProperties.java        | 18 ------------------
 .../presto_cpp/main/QueryContextManager.cpp    |  6 ------
 .../presto_cpp/main/common/Configs.cpp         |  9 ---------
 3 files changed, 33 deletions(-)

diff --git a/presto-main/src/main/java/com/facebook/presto/SystemSessionProperties.java b/presto-main/src/main/java/com/facebook/presto/SystemSessionProperties.java
index 0205438c4c31d..07d9a8bd9836c 100644
--- a/presto-main/src/main/java/com/facebook/presto/SystemSessionProperties.java
+++ b/presto-main/src/main/java/com/facebook/presto/SystemSessionProperties.java
@@ -326,10 +326,7 @@ public final class SystemSessionProperties
 
     // TODO: Native execution related session properties that are temporarily put here. They will be relocated in the future.
     public static final String NATIVE_SIMPLIFIED_EXPRESSION_EVALUATION_ENABLED = "native_simplified_expression_evaluation_enabled";
-    public static final String NATIVE_AGGREGATION_SPILL_MEMORY_THRESHOLD = "native_aggregation_spill_memory_threshold";
     public static final String NATIVE_AGGREGATION_SPILL_ALL = "native_aggregation_spill_all";
-    public static final String NATIVE_JOIN_SPILL_MEMORY_THRESHOLD = "native_join_spill_memory_threshold";
-    public static final String NATIVE_ORDER_BY_SPILL_MEMORY_THRESHOLD = "native_order_by_spill_memory_threshold";
     public static final String NATIVE_MAX_SPILL_LEVEL = "native_max_spill_level";
     public static final String NATIVE_MAX_SPILL_FILE_SIZE = "native_max_spill_file_size";
     public static final String NATIVE_SPILL_COMPRESSION_CODEC = "native_spill_compression_codec";
@@ -1594,11 +1591,6 @@ public SystemSessionProperties(
                         "Native Execution only. Enable simplified path in expression evaluation",
                         false,
                         false),
-                integerProperty(
-                        NATIVE_AGGREGATION_SPILL_MEMORY_THRESHOLD,
-                        "Native Execution only. The max memory that a final aggregation can use before spilling. If it is 0, then there is no limit",
-                        0,
-                        false),
                 booleanProperty(
                         NATIVE_AGGREGATION_SPILL_ALL,
                         "Native Execution only. If true and spilling has been triggered during the input " +
@@ -1607,16 +1599,6 @@ public SystemSessionProperties(
                                 "output processing stage.",
                         true,
                         false),
-                integerProperty(
-                        NATIVE_JOIN_SPILL_MEMORY_THRESHOLD,
-                        "Native Execution only. The max memory that hash join can use before spilling. If it is 0, then there is no limit",
-                        0,
-                        false),
-                integerProperty(
-                        NATIVE_ORDER_BY_SPILL_MEMORY_THRESHOLD,
-                        "Native Execution only. The max memory that order by can use before spilling. If it is 0, then there is no limit",
-                        0,
-                        false),
                 integerProperty(
                         NATIVE_MAX_SPILL_LEVEL,
                         "Native Execution only. The maximum allowed spilling level for hash join build.\n" +
diff --git a/presto-native-execution/presto_cpp/main/QueryContextManager.cpp b/presto-native-execution/presto_cpp/main/QueryContextManager.cpp
index 159b5903aa1f4..1f8f80e0da742 100644
--- a/presto-native-execution/presto_cpp/main/QueryContextManager.cpp
+++ b/presto-native-execution/presto_cpp/main/QueryContextManager.cpp
@@ -31,14 +31,8 @@ std::string toVeloxConfig(const std::string& name) {
   using velox::core::QueryConfig;
   static const folly::F14FastMap<std::string, std::string>
       kPrestoToVeloxMapping = {
-          {"native_aggregation_spill_memory_threshold",
-           QueryConfig::kAggregationSpillMemoryThreshold},
           {"native_simplified_expression_evaluation_enabled",
            QueryConfig::kExprEvalSimplified},
-          {"native_join_spill_memory_threshold",
-           QueryConfig::kJoinSpillMemoryThreshold},
-          {"native_order_by_spill_memory_threshold",
-           QueryConfig::kOrderBySpillMemoryThreshold},
           {"native_max_spill_level", QueryConfig::kMaxSpillLevel},
           {"native_max_spill_file_size", QueryConfig::kMaxSpillFileSize},
           {"native_spill_compression_codec",
diff --git a/presto-native-execution/presto_cpp/main/common/Configs.cpp b/presto-native-execution/presto_cpp/main/common/Configs.cpp
index 891806fc049a4..7f5eb53853183 100644
--- a/presto-native-execution/presto_cpp/main/common/Configs.cpp
+++ b/presto-native-execution/presto_cpp/main/common/Configs.cpp
@@ -721,15 +721,6 @@ BaseVeloxQueryConfig::BaseVeloxQueryConfig() {
               c.aggregationSpillEnabled()),
           BOOL_PROP(QueryConfig::kJoinSpillEnabled, c.joinSpillEnabled()),
           BOOL_PROP(QueryConfig::kOrderBySpillEnabled, c.orderBySpillEnabled()),
-          NUM_PROP(
-              QueryConfig::kAggregationSpillMemoryThreshold,
-              c.aggregationSpillMemoryThreshold()),
-          NUM_PROP(
-              QueryConfig::kJoinSpillMemoryThreshold,
-              c.joinSpillMemoryThreshold()),
-          NUM_PROP(
-              QueryConfig::kOrderBySpillMemoryThreshold,
-              c.orderBySpillMemoryThreshold()),
           NUM_PROP(QueryConfig::kMaxSpillLevel, c.maxSpillLevel()),
           NUM_PROP(QueryConfig::kMaxSpillFileSize, c.maxSpillFileSize()),
           NUM_PROP(QueryConfig::kMinSpillRunSize, c.minSpillRunSize()),