diff --git a/be/src/pipeline/exec/partitioned_hash_join_probe_operator.cpp b/be/src/pipeline/exec/partitioned_hash_join_probe_operator.cpp
index f5568ba102297d..04b83e822c114b 100644
--- a/be/src/pipeline/exec/partitioned_hash_join_probe_operator.cpp
+++ b/be/src/pipeline/exec/partitioned_hash_join_probe_operator.cpp
@@ -859,7 +859,7 @@ bool PartitionedHashJoinProbeOperatorX::_should_revoke_memory(RuntimeState* stat
     auto& local_state = get_local_state(state);
     if (local_state._shared_state->need_to_spill) {
         const auto revocable_size = _revocable_mem_size(state);
-        const auto min_revocable_size = state->min_revocable_mem();
+        const auto min_revocable_size = state->spill_min_revocable_mem();
 
         if (state->get_query_ctx()->low_memory_mode()) {
             return revocable_size >
diff --git a/be/src/pipeline/pipeline_fragment_context.cpp b/be/src/pipeline/pipeline_fragment_context.cpp
index 9acd38af7b0d62..be0b46b627b3ae 100644
--- a/be/src/pipeline/pipeline_fragment_context.cpp
+++ b/be/src/pipeline/pipeline_fragment_context.cpp
@@ -1829,7 +1829,7 @@ size_t PipelineFragmentContext::get_revocable_size(bool* has_running_task) const
             }
 
             size_t revocable_size = task->get_revocable_size();
-            if (revocable_size > _runtime_state->min_revocable_mem()) {
+            if (revocable_size > _runtime_state->spill_min_revocable_mem()) {
                 res += revocable_size;
             }
         }
@@ -1842,7 +1842,7 @@ std::vector<PipelineTask*> PipelineFragmentContext::get_revocable_tasks() const
     for (const auto& task_instances : _tasks) {
         for (const auto& task : task_instances) {
             size_t revocable_size_ = task->get_revocable_size();
-            if (revocable_size_ > _runtime_state->min_revocable_mem() ||
+            if (revocable_size_ > _runtime_state->spill_min_revocable_mem() ||
                 (revocable_size_ > 0 && _query_ctx->enable_force_spill())) {
                 revocable_tasks.emplace_back(task.get());
             }
diff --git a/be/src/runtime/runtime_state.h b/be/src/runtime/runtime_state.h
index a47c5d6f202837..89c44bd3ed7169 100644
--- a/be/src/runtime/runtime_state.h
+++ b/be/src/runtime/runtime_state.h
@@ -565,7 +565,7 @@ class RuntimeState {
         return _query_options.__isset.enable_reserve_memory && _query_options.enable_reserve_memory;
     }
 
-    int64_t min_revocable_mem() const {
+    int64_t spill_min_revocable_mem() const {
         if (_query_options.__isset.min_revocable_mem) {
             return std::max(_query_options.min_revocable_mem, (int64_t)1);
         }
diff --git a/regression-test/suites/nereids_rules_p0/mv/variant/variant_mv.groovy b/regression-test/suites/nereids_rules_p0/mv/variant/variant_mv.groovy
index d81f01aeeaa6ca..1aab312763aa9a 100644
--- a/regression-test/suites/nereids_rules_p0/mv/variant/variant_mv.groovy
+++ b/regression-test/suites/nereids_rules_p0/mv/variant/variant_mv.groovy
@@ -574,7 +574,7 @@ suite("variant_mv") {
     where g2.actor['id'] > 34259289;
     """
     def query3_6 = """
-    SELECT  /*+SET_VAR(batch_size=4064,broker_load_batch_size=16352,disable_streaming_preaggregations=false,enable_distinct_streaming_aggregation=true,parallel_fragment_exec_instance_num=3,parallel_pipeline_task_num=0,profile_level=1,enable_pipeline_engine=true,enable_parallel_scan=true,parallel_scan_max_scanners_count=32,parallel_scan_min_rows_per_scanner=64,enable_fold_constant_by_be=true,enable_rewrite_element_at_to_slot=true,runtime_filter_type=1,enable_parallel_result_sink=false,enable_nereids_planner=true,rewrite_or_to_in_predicate_threshold=100000,enable_function_pushdown=false,enable_common_expr_pushdown=false,enable_local_exchange=true,partitioned_hash_join_rows_threshold=8,partitioned_hash_agg_rows_threshold=8,partition_pruning_expand_threshold=10,enable_share_hash_table_for_broadcast_join=true,enable_two_phase_read_opt=true,enable_common_expr_pushdown_for_inverted_index=false,enable_delete_sub_predicate_v2=false,min_revocable_mem=33554432,fetch_remote_schema_timeout_seconds=120,max_fetch_remote_schema_tablet_count=512,enable_spill=false,enable_force_spill=false,data_queue_max_blocks=1,spill_streaming_agg_mem_limit=268435456,spill_aggregation_partition_count=5) */
+    SELECT  /*+SET_VAR(batch_size=4064,broker_load_batch_size=16352,disable_streaming_preaggregations=false,enable_distinct_streaming_aggregation=true,parallel_fragment_exec_instance_num=3,parallel_pipeline_task_num=0,profile_level=1,enable_pipeline_engine=true,enable_parallel_scan=true,parallel_scan_max_scanners_count=32,parallel_scan_min_rows_per_scanner=64,enable_fold_constant_by_be=true,enable_rewrite_element_at_to_slot=true,runtime_filter_type=1,enable_parallel_result_sink=false,enable_nereids_planner=true,rewrite_or_to_in_predicate_threshold=100000,enable_function_pushdown=false,enable_common_expr_pushdown=false,enable_local_exchange=true,partitioned_hash_join_rows_threshold=8,partitioned_hash_agg_rows_threshold=8,partition_pruning_expand_threshold=10,enable_share_hash_table_for_broadcast_join=true,enable_two_phase_read_opt=true,enable_common_expr_pushdown_for_inverted_index=false,enable_delete_sub_predicate_v2=false,spill_min_revocable_mem=33554432,fetch_remote_schema_timeout_seconds=120,max_fetch_remote_schema_tablet_count=512,enable_spill=false,enable_force_spill=false,data_queue_max_blocks=1,spill_streaming_agg_mem_limit=268435456,spill_aggregation_partition_count=5) */
     g1.id,
     g2.type,
     floor(cast(g1.actor['id'] as int) + 100.5),
diff --git a/regression-test/suites/spill_p0/aggregate_spill.groovy b/regression-test/suites/spill_p0/aggregate_spill.groovy
index 9a0df219bf90a5..2a4127d177c9de 100644
--- a/regression-test/suites/spill_p0/aggregate_spill.groovy
+++ b/regression-test/suites/spill_p0/aggregate_spill.groovy
@@ -23,7 +23,7 @@ suite("aggregate_spill") {
         set enable_force_spill = true;
     """
     sql """
-        set min_revocable_mem = 1;
+        set spill_min_revocable_mem = 1;
     """
     sql """
         set parallel_pipeline_task_num = 4;
diff --git a/regression-test/suites/tpcds_sf1_p1/spill_test/q23.groovy b/regression-test/suites/tpcds_sf1_p1/spill_test/q23.groovy
index cc5408d6b81a54..08f1e04d9b87ba 100644
--- a/regression-test/suites/tpcds_sf1_p1/spill_test/q23.groovy
+++ b/regression-test/suites/tpcds_sf1_p1/spill_test/q23.groovy
@@ -17,7 +17,7 @@
 
 suite("q23") {
     sql """ set enable_force_spill  =true; """
-    sql """ set min_revocable_mem = 65536; """
+    sql """ set spill_min_revocable_mem = 65536; """
     sql """ use regression_test_tpcds_sf1_p1; """
 
     qt_select1 """
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q01.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q01.groovy
index b32601cf600547..4bb49ea12e05f1 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q01.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q01.groovy
@@ -19,7 +19,7 @@ suite("q01_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q02.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q02.groovy
index 005b5ea6e9f3c2..838ae626e3a4ff 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q02.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q02.groovy
@@ -19,7 +19,7 @@ suite("q02_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q03.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q03.groovy
index dcb40b0a1258d6..10005476014a5f 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q03.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q03.groovy
@@ -19,7 +19,7 @@ suite("q03_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q04.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q04.groovy
index ad203cf3ee1321..850a5c20776e64 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q04.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q04.groovy
@@ -19,7 +19,7 @@ suite("q04_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=500;
+    set spill_min_revocable_mem=500;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q05.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q05.groovy
index f743b03fc7fdf1..c19f657d25e562 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q05.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q05.groovy
@@ -19,7 +19,7 @@ suite("q05_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q06.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q06.groovy
index 9d7ff51f39f9e4..e50d4aaec6d2f0 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q06.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q06.groovy
@@ -19,7 +19,7 @@ suite("q06_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q07.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q07.groovy
index 7439ed1472931a..ef37208782adba 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q07.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q07.groovy
@@ -19,7 +19,7 @@ suite("q07_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q08.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q08.groovy
index 549e3af9e6ee46..2ba2478d185d0d 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q08.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q08.groovy
@@ -19,7 +19,7 @@ suite("q08_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q09.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q09.groovy
index 1f4e0b7a061fd4..0ea7b5e860f117 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q09.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q09.groovy
@@ -19,7 +19,7 @@ suite("q09_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q10.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q10.groovy
index 0b4c0de0adb2bb..f2caa94ab39e90 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q10.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q10.groovy
@@ -19,7 +19,7 @@ suite("q10_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q11.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q11.groovy
index 8c9ba7431f9749..84f9a4ee328845 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q11.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q11.groovy
@@ -19,7 +19,7 @@ suite("q11_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q12.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q12.groovy
index 2958676568aace..49008eca758de4 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q12.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q12.groovy
@@ -19,7 +19,7 @@ suite("q12_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q13.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q13.groovy
index 192de5525da7e6..6fe75c18c169cc 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q13.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q13.groovy
@@ -19,7 +19,7 @@ suite("q13_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q14_1.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q14_1.groovy
index c4f7f5c0bb5da9..08bd47a996ec00 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q14_1.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q14_1.groovy
@@ -19,7 +19,7 @@ suite("q14_1_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q14_2.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q14_2.groovy
index 7381131713baef..60539a0920eb44 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q14_2.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q14_2.groovy
@@ -19,7 +19,7 @@ suite("q14_2_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q15.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q15.groovy
index 7ab60727c5b77d..3787e84ada655f 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q15.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q15.groovy
@@ -19,7 +19,7 @@ suite("q15_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q16.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q16.groovy
index af93a322c872e2..265fa9f64f7a1c 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q16.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q16.groovy
@@ -19,7 +19,7 @@ suite("q16_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q17.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q17.groovy
index ade102222cc91e..6db3ce88b709a8 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q17.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q17.groovy
@@ -19,7 +19,7 @@ suite("q17_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q18.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q18.groovy
index 311c0a2d5dfc5d..e65507319033ee 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q18.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q18.groovy
@@ -19,7 +19,7 @@ suite("q18_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q19.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q19.groovy
index d61da8d37548ac..f73d22051e4adc 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q19.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q19.groovy
@@ -19,7 +19,7 @@ suite("q19_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q20.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q20.groovy
index dbd6382fac0b5d..ad44d54d9f17ca 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q20.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q20.groovy
@@ -19,7 +19,7 @@ suite("q20_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q21.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q21.groovy
index 3dc9caac152867..6d5cb1435c77e0 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q21.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q21.groovy
@@ -19,7 +19,7 @@ suite("q21_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q22.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q22.groovy
index 5030f6a338d542..b5dc33c0dbe274 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q22.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q22.groovy
@@ -19,7 +19,7 @@ suite("q22_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q23_1.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q23_1.groovy
index cbb9962b63d1f2..ba5f83fc26f60c 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q23_1.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q23_1.groovy
@@ -19,7 +19,7 @@ suite("q23_1_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q23_2.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q23_2.groovy
index f74cb1cd85ee52..afcef33bb05d7c 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q23_2.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q23_2.groovy
@@ -19,7 +19,7 @@ suite("q23_2_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q24_1.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q24_1.groovy
index 1847ff8a5c65d1..3725d665c4617d 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q24_1.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q24_1.groovy
@@ -19,7 +19,7 @@ suite("q24_1_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q24_2.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q24_2.groovy
index 69d40f764c5777..b609cf9cc99959 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q24_2.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q24_2.groovy
@@ -19,7 +19,7 @@ suite("q24_2_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=500;
+    set spill_min_revocable_mem=500;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q25.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q25.groovy
index f6732db8aacffc..f4dce66555b80e 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q25.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q25.groovy
@@ -19,7 +19,7 @@ suite("q25_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q26.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q26.groovy
index 6c51cc77a5cfac..d3b36339072b8d 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q26.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q26.groovy
@@ -19,7 +19,7 @@ suite("q26_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q27.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q27.groovy
index 1a9a10d73e604a..084f7045041af3 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q27.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q27.groovy
@@ -19,7 +19,7 @@ suite("q27_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q28.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q28.groovy
index 3efc9b3dc01010..85e0502adc042f 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q28.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q28.groovy
@@ -19,7 +19,7 @@ suite("q28_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q29.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q29.groovy
index df21a5e2ae111c..e5d6cbf5612211 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q29.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q29.groovy
@@ -19,7 +19,7 @@ suite("q29_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q30.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q30.groovy
index 040b98791f4686..4eb2530e3e11fc 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q30.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q30.groovy
@@ -19,7 +19,7 @@ suite("q30_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q31.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q31.groovy
index 0e22e379d52daa..fb638d506f7225 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q31.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q31.groovy
@@ -19,7 +19,7 @@ suite("q31_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q32.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q32.groovy
index 1254dd7c61adcf..11eaa781bfcc73 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q32.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q32.groovy
@@ -19,7 +19,7 @@ suite("q32_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q33.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q33.groovy
index 31ff1f96b7422e..5e89f9f497c2dd 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q33.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q33.groovy
@@ -19,7 +19,7 @@ suite("q33_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q34.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q34.groovy
index 4cecd47df8278e..9a7a71866fcdf0 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q34.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q34.groovy
@@ -19,7 +19,7 @@ suite("q34_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q35.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q35.groovy
index ed264485a06f24..b2643fb4de9ec6 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q35.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q35.groovy
@@ -19,7 +19,7 @@ suite("q35_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q36.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q36.groovy
index 313ffbcd92ff5e..05802c810f0ad2 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q36.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q36.groovy
@@ -19,7 +19,7 @@ suite("q36_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q37.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q37.groovy
index a2d83e3c6f627c..6c54188f34eb0a 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q37.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q37.groovy
@@ -19,7 +19,7 @@ suite("q37_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q38.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q38.groovy
index 103306336c1a20..505208f755c2bd 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q38.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q38.groovy
@@ -19,7 +19,7 @@ suite("q38_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q39_1.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q39_1.groovy
index c7c94b9f847814..32ed089a956fde 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q39_1.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q39_1.groovy
@@ -19,7 +19,7 @@ suite("q39_1_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q39_2.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q39_2.groovy
index 0f6f14654a2039..029fbade5d7b27 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q39_2.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q39_2.groovy
@@ -19,7 +19,7 @@ suite("q39_2_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q40.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q40.groovy
index 7c33af6a957f5c..34577c9bfccc5f 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q40.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q40.groovy
@@ -19,7 +19,7 @@ suite("q40_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q41.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q41.groovy
index 16ad8981ef7e24..870dec6e3f0a6a 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q41.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q41.groovy
@@ -19,7 +19,7 @@ suite("q41_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q42.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q42.groovy
index f9c4171ac6031f..2440976d8e15e8 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q42.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q42.groovy
@@ -19,7 +19,7 @@ suite("q42_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q43.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q43.groovy
index efc863bf5c8907..ed51ebef5c026a 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q43.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q43.groovy
@@ -19,7 +19,7 @@ suite("q43_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q44.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q44.groovy
index 05f4c8b6779cd3..9342e098333c55 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q44.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q44.groovy
@@ -19,7 +19,7 @@ suite("q44_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q45.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q45.groovy
index 70129815a1d677..91625f3b874eca 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q45.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q45.groovy
@@ -19,7 +19,7 @@ suite("q45_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q47.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q47.groovy
index d4934077bec92c..d19b95058b923a 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q47.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q47.groovy
@@ -19,7 +19,7 @@ suite("q47_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q48.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q48.groovy
index 5824dad703e1b7..bf052dc9dbf520 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q48.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q48.groovy
@@ -19,7 +19,7 @@ suite("q48_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q49.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q49.groovy
index ec1bae6277a88e..217e6d4123e12e 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q49.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q49.groovy
@@ -19,7 +19,7 @@ suite("q49_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q49_rewrite.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q49_rewrite.groovy
index 593025caecaee3..4d2a3c7c680504 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q49_rewrite.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q49_rewrite.groovy
@@ -19,7 +19,7 @@ suite("q49_rewrite_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q50.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q50.groovy
index 03c75f92df857c..0720cb8fb7b3ab 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q50.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q50.groovy
@@ -19,7 +19,7 @@ suite("q50_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q51.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q51.groovy
index a246962d2752d1..866b2af0ee7f53 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q51.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q51.groovy
@@ -19,7 +19,7 @@ suite("q51_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q52.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q52.groovy
index a51c260047f2de..cd501ac7439dfa 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q52.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q52.groovy
@@ -19,7 +19,7 @@ suite("q52_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q53.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q53.groovy
index a92cb45d097628..57d76897157d02 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q53.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q53.groovy
@@ -19,7 +19,7 @@ suite("q53_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q54.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q54.groovy
index 4db6568da95e7d..ac0ef507581ace 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q54.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q54.groovy
@@ -19,7 +19,7 @@ suite("q54_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q55.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q55.groovy
index 1825422f5a8590..1b2a829ca7c3be 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q55.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q55.groovy
@@ -19,7 +19,7 @@ suite("q55_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q56.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q56.groovy
index ede5d54db3bcdb..d5ce621d36b74a 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q56.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q56.groovy
@@ -19,7 +19,7 @@ suite("q56_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q57.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q57.groovy
index bf126dd2325040..de693026b62a00 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q57.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q57.groovy
@@ -19,7 +19,7 @@ suite("q57_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q58.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q58.groovy
index fde8e03ea566d5..68d80ab02606ea 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q58.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q58.groovy
@@ -19,7 +19,7 @@ suite("q58_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q59.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q59.groovy
index e435834e07aeb1..20c1a4977687a0 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q59.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q59.groovy
@@ -19,7 +19,7 @@ suite("q59_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q60.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q60.groovy
index ca7ee275442431..16f85bb9900a03 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q60.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q60.groovy
@@ -19,7 +19,7 @@ suite("q60_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q61.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q61.groovy
index 933c026f6d6a28..24acaea1ad3332 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q61.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q61.groovy
@@ -19,7 +19,7 @@ suite("q61_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q62.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q62.groovy
index febe9fb842940e..eeea52d314c0e1 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q62.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q62.groovy
@@ -19,7 +19,7 @@ suite("q62_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q63.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q63.groovy
index c1ff1e6dd1576c..bbb2e6fa9152af 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q63.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q63.groovy
@@ -19,7 +19,7 @@ suite("q63_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q64.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q64.groovy
index 10c446f43205d1..4fd8dfaa8b36e2 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q64.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q64.groovy
@@ -19,7 +19,7 @@ suite("q64_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q65.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q65.groovy
index e16237a3882cac..0f20dce7666b67 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q65.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q65.groovy
@@ -19,7 +19,7 @@ suite("q65_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q66.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q66.groovy
index dac5da4977a0f8..162ad7beaa65a4 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q66.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q66.groovy
@@ -19,7 +19,7 @@ suite("q66_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q67.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q67.groovy
index 971881431e581b..e297d8b01d6e9b 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q67.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q67.groovy
@@ -19,7 +19,7 @@ suite("q67_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q68.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q68.groovy
index 4994673ce2f746..ab3ad61c2e3323 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q68.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q68.groovy
@@ -19,7 +19,7 @@ suite("q68_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q69.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q69.groovy
index 9219e5e634340b..87ab225b1c2982 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q69.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q69.groovy
@@ -19,7 +19,7 @@ suite("q69_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q70.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q70.groovy
index ac90c4dfddc773..f2f8932fb52731 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q70.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q70.groovy
@@ -19,7 +19,7 @@ suite("q70_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q71.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q71.groovy
index 09612747fc5c39..af986e3e810b5e 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q71.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q71.groovy
@@ -19,7 +19,7 @@ suite("q71_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q72.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q72.groovy
index 7b03dd9f573637..f535a3715e773a 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q72.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q72.groovy
@@ -19,7 +19,7 @@ suite("q72_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q73.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q73.groovy
index 0c818fe0fff421..121582d8000840 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q73.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q73.groovy
@@ -19,7 +19,7 @@ suite("q73_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q74.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q74.groovy
index 5e0c82b8dc1dda..2a75a5e6b04210 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q74.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q74.groovy
@@ -19,7 +19,7 @@ suite("q74_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q75.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q75.groovy
index 7a245f3116389b..1c5bd5b262e3e3 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q75.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q75.groovy
@@ -19,7 +19,7 @@ suite("q75_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q76.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q76.groovy
index ad0a9e803ab055..89edf0abe1a93d 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q76.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q76.groovy
@@ -19,7 +19,7 @@ suite("q76_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q77.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q77.groovy
index 08de73daceb308..dd1fd34c1bff5d 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q77.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q77.groovy
@@ -19,7 +19,7 @@ suite("q77_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q78.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q78.groovy
index 5092857d6af166..e99ee2a67c0e0a 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q78.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q78.groovy
@@ -19,7 +19,7 @@ suite("q78_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q79.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q79.groovy
index 6a6f46d4909631..596f9f2bbcc951 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q79.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q79.groovy
@@ -19,7 +19,7 @@ suite("q79_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q80.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q80.groovy
index a1cc15cb896535..c592a8427e92f8 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q80.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q80.groovy
@@ -19,7 +19,7 @@ suite("q80_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q81.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q81.groovy
index 40bbe33eb2f51f..437fe1beffd7f6 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q81.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q81.groovy
@@ -19,7 +19,7 @@ suite("q81_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q82.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q82.groovy
index edd3f7a4247d9a..13f8fdc6379c77 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q82.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q82.groovy
@@ -19,7 +19,7 @@ suite("q82_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q83.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q83.groovy
index 12859e25595baf..e8a83ec34e76ab 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q83.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q83.groovy
@@ -19,7 +19,7 @@ suite("q83_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q84.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q84.groovy
index 0b462d141ee839..8c004720d5d32f 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q84.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q84.groovy
@@ -19,7 +19,7 @@ suite("q84_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q85.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q85.groovy
index fdc7d3db86e0af..da478a70824460 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q85.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q85.groovy
@@ -19,7 +19,7 @@ suite("q85_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q86.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q86.groovy
index 05360c66e84365..0a47fe6a5fa999 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q86.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q86.groovy
@@ -19,7 +19,7 @@ suite("q86_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q87.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q87.groovy
index 78c7e304ce4783..a51821b010e4ab 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q87.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q87.groovy
@@ -19,7 +19,7 @@ suite("q87_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q88.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q88.groovy
index 0036488937093c..cb8b9e615dced1 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q88.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q88.groovy
@@ -19,7 +19,7 @@ suite("q88_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q89.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q89.groovy
index a99c3f559db668..8ad30ac16490c7 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q89.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q89.groovy
@@ -19,7 +19,7 @@ suite("q89_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q90.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q90.groovy
index 637fdd4cb0558e..f558a72621a48a 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q90.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q90.groovy
@@ -19,7 +19,7 @@ suite("q90_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q91.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q91.groovy
index 79e5b0997eed35..dbb925c19c2762 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q91.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q91.groovy
@@ -19,7 +19,7 @@ suite("q91_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q92.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q92.groovy
index 149bf92041a1f3..b80df399d8f0d3 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q92.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q92.groovy
@@ -19,7 +19,7 @@ suite("q92_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   multi_sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q93.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q93.groovy
index 0a375e0a4299e3..13c6aa8f82326a 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q93.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q93.groovy
@@ -19,7 +19,7 @@ suite("q93_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q94.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q94.groovy
index 5aa3db3a344f48..427e563db3f875 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q94.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q94.groovy
@@ -19,7 +19,7 @@ suite("q94_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q95.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q95.groovy
index aa60089dd9fa55..50d8591b412594 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q95.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q95.groovy
@@ -19,7 +19,7 @@ suite("q95_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q96.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q96.groovy
index 0ee2566e690a48..054ddf1d72ec00 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q96.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q96.groovy
@@ -19,7 +19,7 @@ suite("q96_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q97.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q97.groovy
index be34b583df53f1..c69a1fa5f9313d 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q97.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q97.groovy
@@ -19,7 +19,7 @@ suite("q97_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q98.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q98.groovy
index ba05ea62635134..3e11a022d69b05 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q98.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q98.groovy
@@ -19,7 +19,7 @@ suite("q98_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q99.groovy b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q99.groovy
index 899cf068e582c8..4f1cdf723fe73a 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q99.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/spill/q99.groovy
@@ -19,7 +19,7 @@ suite("q99_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_ck_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q01.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q01.groovy
index a0e3b6547bcffa..1e9649fe571a42 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q01.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q01.groovy
@@ -19,7 +19,7 @@ suite("q01_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q02.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q02.groovy
index d7ce6bae65ddb5..088db6ede82681 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q02.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q02.groovy
@@ -19,7 +19,7 @@ suite("q02_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q03.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q03.groovy
index 1eb8e702da3551..15f94958de3bc2 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q03.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q03.groovy
@@ -19,7 +19,7 @@ suite("q03_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q04.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q04.groovy
index 47b73e434342c2..6b0e877e681d08 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q04.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q04.groovy
@@ -19,7 +19,7 @@ suite("q04_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=500;
+    set spill_min_revocable_mem=500;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q05.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q05.groovy
index 30532794e68d19..7cc8630bb97086 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q05.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q05.groovy
@@ -19,7 +19,7 @@ suite("q05_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q06.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q06.groovy
index 7dfbeb1941cff4..1577eee94dd138 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q06.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q06.groovy
@@ -19,7 +19,7 @@ suite("q06_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q07.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q07.groovy
index 2b615703d24cb9..380a0010d0ff61 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q07.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q07.groovy
@@ -19,7 +19,7 @@ suite("q07_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q08.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q08.groovy
index edc8e89851f937..e037c9a2a10114 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q08.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q08.groovy
@@ -19,7 +19,7 @@ suite("q08_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q09.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q09.groovy
index fc15a914000f1c..bf48659860d8ad 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q09.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q09.groovy
@@ -19,7 +19,7 @@ suite("q09_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q10.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q10.groovy
index ad2453499b58d4..e6a91e1007d2ab 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q10.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q10.groovy
@@ -19,7 +19,7 @@ suite("q10_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q11.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q11.groovy
index c2af13e200267b..c3763114678995 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q11.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q11.groovy
@@ -19,7 +19,7 @@ suite("q11_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q12.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q12.groovy
index aa1a3d44c81185..c15fda0f45b2e6 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q12.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q12.groovy
@@ -19,7 +19,7 @@ suite("q12_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q13.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q13.groovy
index f5e3f363d08983..979b103efb20e8 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q13.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q13.groovy
@@ -19,7 +19,7 @@ suite("q13_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q14_1.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q14_1.groovy
index 222773d9cf9133..14e1b8e36a81d0 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q14_1.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q14_1.groovy
@@ -19,7 +19,7 @@ suite("q14_1_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q14_2.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q14_2.groovy
index f3cae690200ecf..daf10874c3a448 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q14_2.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q14_2.groovy
@@ -19,7 +19,7 @@ suite("q14_2_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q15.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q15.groovy
index a7c57e15f1fcbf..480b66cb209b7b 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q15.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q15.groovy
@@ -19,7 +19,7 @@ suite("q15_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q16.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q16.groovy
index 868ccdcea334b5..7a353353afdc39 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q16.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q16.groovy
@@ -19,7 +19,7 @@ suite("q16_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q17.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q17.groovy
index 91bb1011474a06..73652f6a0c1b5c 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q17.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q17.groovy
@@ -19,7 +19,7 @@ suite("q17_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q18.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q18.groovy
index d9b562cc4f1f0a..062cb569be07ec 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q18.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q18.groovy
@@ -19,7 +19,7 @@ suite("q18_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q19.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q19.groovy
index 6667110fe9f8d1..88beee4e4330f7 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q19.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q19.groovy
@@ -19,7 +19,7 @@ suite("q19_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q20.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q20.groovy
index 96c978d2a05798..6992d0ce012efc 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q20.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q20.groovy
@@ -19,7 +19,7 @@ suite("q20_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q21.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q21.groovy
index 78634b748dd17d..92002103ea1027 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q21.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q21.groovy
@@ -19,7 +19,7 @@ suite("q21_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q22.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q22.groovy
index 5badf3dfed6da4..39681cb34cad00 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q22.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q22.groovy
@@ -19,7 +19,7 @@ suite("q22_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q23_1.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q23_1.groovy
index bfaf1b022ab8ff..7282bd38dfa10e 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q23_1.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q23_1.groovy
@@ -19,7 +19,7 @@ suite("q23_1_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q23_2.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q23_2.groovy
index 39056dd258d043..1a29aac8855fe1 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q23_2.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q23_2.groovy
@@ -19,7 +19,7 @@ suite("q23_2_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q24_1.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q24_1.groovy
index 1c3df66e9df461..7eb2dcd0e5d0e6 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q24_1.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q24_1.groovy
@@ -19,7 +19,7 @@ suite("q24_1_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q24_2.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q24_2.groovy
index ee4e3407e9f3ee..be07ca4c6ccb1d 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q24_2.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q24_2.groovy
@@ -19,7 +19,7 @@ suite("q24_2_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=500;
+    set spill_min_revocable_mem=500;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q25.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q25.groovy
index a5f28fd4d54a4b..cc3ecfa628b0c6 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q25.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q25.groovy
@@ -19,7 +19,7 @@ suite("q25_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q26.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q26.groovy
index 7ba39f7341075c..a6387bf646ea94 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q26.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q26.groovy
@@ -19,7 +19,7 @@ suite("q26_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q27.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q27.groovy
index fb0479f83bd211..a6956e083c7724 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q27.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q27.groovy
@@ -19,7 +19,7 @@ suite("q27_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q28.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q28.groovy
index 75299e9f875a73..0130216a522466 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q28.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q28.groovy
@@ -19,7 +19,7 @@ suite("q28_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q29.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q29.groovy
index afb9e0b3206ed9..f6839c5fb89df5 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q29.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q29.groovy
@@ -19,7 +19,7 @@ suite("q29_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q30.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q30.groovy
index b4ca8d5959c74b..527fa3add10509 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q30.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q30.groovy
@@ -19,7 +19,7 @@ suite("q30_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q31.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q31.groovy
index 7ac8da05982f8e..20db957d8d9158 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q31.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q31.groovy
@@ -19,7 +19,7 @@ suite("q31_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q32.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q32.groovy
index 61752998ac1d65..8ababd68ab6b74 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q32.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q32.groovy
@@ -19,7 +19,7 @@ suite("q32_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q33.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q33.groovy
index 20abeef48cf3a5..efa775c5fe9061 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q33.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q33.groovy
@@ -19,7 +19,7 @@ suite("q33_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q34.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q34.groovy
index aad3cdc275864f..4f16cf0511ae08 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q34.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q34.groovy
@@ -19,7 +19,7 @@ suite("q34_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q35.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q35.groovy
index cf623eb634e4c6..f3cb4a222dbd0a 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q35.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q35.groovy
@@ -19,7 +19,7 @@ suite("q35_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q36.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q36.groovy
index 8da71f4b555cc0..ac3d8606e64562 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q36.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q36.groovy
@@ -19,7 +19,7 @@ suite("q36_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q37.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q37.groovy
index 7bdc85c62713c1..e491c41a1cf462 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q37.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q37.groovy
@@ -19,7 +19,7 @@ suite("q37_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q38.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q38.groovy
index f873cdaede0bef..c80b7d53e65eee 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q38.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q38.groovy
@@ -19,7 +19,7 @@ suite("q38_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q39_1.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q39_1.groovy
index 7eea2bd291d4d0..ccd8ca379af401 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q39_1.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q39_1.groovy
@@ -19,7 +19,7 @@ suite("q39_1_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q39_2.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q39_2.groovy
index e46c4917515c4d..05a3122f4f0a1d 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q39_2.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q39_2.groovy
@@ -19,7 +19,7 @@ suite("q39_2_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q40.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q40.groovy
index dca463d78d0eb9..cad7707c2ec027 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q40.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q40.groovy
@@ -19,7 +19,7 @@ suite("q40_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q41.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q41.groovy
index 88c61037b37701..6228aebb1384b0 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q41.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q41.groovy
@@ -19,7 +19,7 @@ suite("q41_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q42.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q42.groovy
index 31716d6a3c5272..9fd51830fc4b4d 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q42.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q42.groovy
@@ -19,7 +19,7 @@ suite("q42_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q43.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q43.groovy
index 6a7bcc37f0359f..d456b67176d76a 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q43.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q43.groovy
@@ -19,7 +19,7 @@ suite("q43_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q44.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q44.groovy
index e3dc65bb7392e3..03100cb0ae40ce 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q44.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q44.groovy
@@ -19,7 +19,7 @@ suite("q44_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q45.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q45.groovy
index b1adb93f8244ff..6213201ada480d 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q45.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q45.groovy
@@ -19,7 +19,7 @@ suite("q45_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q47.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q47.groovy
index af2c8be0f28076..f25fe0c481e3a7 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q47.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q47.groovy
@@ -19,7 +19,7 @@ suite("q47_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q48.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q48.groovy
index 76126f3ae34667..0c473f9f665d0b 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q48.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q48.groovy
@@ -19,7 +19,7 @@ suite("q48_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q49.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q49.groovy
index fbaddf96b4956f..95ccd2a1549fc4 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q49.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q49.groovy
@@ -19,7 +19,7 @@ suite("q49_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q49_rewrite.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q49_rewrite.groovy
index 9ab0b51ec02d8b..622d492f120e74 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q49_rewrite.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q49_rewrite.groovy
@@ -19,7 +19,7 @@ suite("q49_rewrite_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q50.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q50.groovy
index 38c40367c27a5e..bae703858767a2 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q50.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q50.groovy
@@ -19,7 +19,7 @@ suite("q50_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q51.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q51.groovy
index 651d0619358502..8b45df390dd9e9 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q51.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q51.groovy
@@ -19,7 +19,7 @@ suite("q51_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q52.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q52.groovy
index 71f73d4fa6ad89..5de5a103e5b579 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q52.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q52.groovy
@@ -19,7 +19,7 @@ suite("q52_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q53.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q53.groovy
index f84eb890174026..02bd6a1e2f9206 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q53.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q53.groovy
@@ -19,7 +19,7 @@ suite("q53_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q54.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q54.groovy
index 6ce489b8e834c3..ad53d1f361b18e 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q54.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q54.groovy
@@ -19,7 +19,7 @@ suite("q54_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q55.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q55.groovy
index 53787e629e040e..e25d16ecb02af3 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q55.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q55.groovy
@@ -19,7 +19,7 @@ suite("q55_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q56.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q56.groovy
index 41f38eb763b856..1685ec947e8853 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q56.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q56.groovy
@@ -19,7 +19,7 @@ suite("q56_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q57.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q57.groovy
index a320a4df279cee..37d06f98b39277 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q57.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q57.groovy
@@ -19,7 +19,7 @@ suite("q57_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q58.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q58.groovy
index 637d632c6a651b..e6296ccce3156b 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q58.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q58.groovy
@@ -19,7 +19,7 @@ suite("q58_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q59.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q59.groovy
index eb065d22fd6700..da486030252710 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q59.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q59.groovy
@@ -19,7 +19,7 @@ suite("q59_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q60.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q60.groovy
index 0335d8cb589685..254b584d71cb3e 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q60.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q60.groovy
@@ -19,7 +19,7 @@ suite("q60_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q61.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q61.groovy
index 8ede55f9e0daa4..e6e52c634e9baa 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q61.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q61.groovy
@@ -19,7 +19,7 @@ suite("q61_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q62.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q62.groovy
index 4190b32d43be87..17edf56ceedcc1 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q62.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q62.groovy
@@ -19,7 +19,7 @@ suite("q62_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q63.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q63.groovy
index 079e8ed610089f..114a2e19c87380 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q63.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q63.groovy
@@ -19,7 +19,7 @@ suite("q63_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q64.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q64.groovy
index b3ae5ad3caba77..5e79261a529e19 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q64.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q64.groovy
@@ -19,7 +19,7 @@ suite("q64_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q65.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q65.groovy
index 132e6b0bfaaa32..fa83c6614a7f9a 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q65.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q65.groovy
@@ -19,7 +19,7 @@ suite("q65_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q66.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q66.groovy
index e91825e267f524..baf2205ca33cc3 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q66.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q66.groovy
@@ -19,7 +19,7 @@ suite("q66_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q67.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q67.groovy
index a51232f4da46a0..eef17357003e65 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q67.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q67.groovy
@@ -19,7 +19,7 @@ suite("q67_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q68.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q68.groovy
index d52f42c6ee58ab..9f7d2d5eed7a54 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q68.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q68.groovy
@@ -19,7 +19,7 @@ suite("q68_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q69.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q69.groovy
index 36bc9171c91d70..1fcbdd40918618 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q69.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q69.groovy
@@ -19,7 +19,7 @@ suite("q69_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q70.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q70.groovy
index 4382906f148a59..a1405302022f7d 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q70.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q70.groovy
@@ -19,7 +19,7 @@ suite("q70_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q71.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q71.groovy
index 40d0940e0af17a..94c871f784a9ae 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q71.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q71.groovy
@@ -19,7 +19,7 @@ suite("q71_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q72.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q72.groovy
index 54b04396fd5d2d..f80cc3008414fc 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q72.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q72.groovy
@@ -19,7 +19,7 @@ suite("q72_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q73.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q73.groovy
index e6d36b6d3a46c5..f3cc0ce591442d 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q73.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q73.groovy
@@ -19,7 +19,7 @@ suite("q73_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q74.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q74.groovy
index ce8fea2afd4378..278c780e8bfc94 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q74.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q74.groovy
@@ -19,7 +19,7 @@ suite("q74_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q75.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q75.groovy
index 7d795447d73756..dd7333444ce476 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q75.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q75.groovy
@@ -19,7 +19,7 @@ suite("q75_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=100;
+    set spill_min_revocable_mem=100;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q76.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q76.groovy
index a99e8165bde247..2be430b975e5f4 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q76.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q76.groovy
@@ -19,7 +19,7 @@ suite("q76_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q77.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q77.groovy
index c869b8b9c1b8f5..59877d37da7283 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q77.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q77.groovy
@@ -19,7 +19,7 @@ suite("q77_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q78.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q78.groovy
index 6ee9f33cb9b867..8956e8c83a7b5d 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q78.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q78.groovy
@@ -19,7 +19,7 @@ suite("q78_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q79.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q79.groovy
index e22beae644640e..b9381a852ba06e 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q79.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q79.groovy
@@ -19,7 +19,7 @@ suite("q79_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q80.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q80.groovy
index ccd40c0edf9db0..133971b96fdc07 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q80.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q80.groovy
@@ -19,7 +19,7 @@ suite("q80_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q81.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q81.groovy
index 7f5d625229aebc..893afa4000265a 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q81.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q81.groovy
@@ -19,7 +19,7 @@ suite("q81_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q82.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q82.groovy
index d8afc0e1860165..b7585861eedd9d 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q82.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q82.groovy
@@ -19,7 +19,7 @@ suite("q82_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q83.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q83.groovy
index 9146c1d36bd795..4bfceae1d23059 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q83.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q83.groovy
@@ -19,7 +19,7 @@ suite("q83_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q84.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q84.groovy
index d64ab5d4f7d202..d1b8aa0ceb7fb1 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q84.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q84.groovy
@@ -19,7 +19,7 @@ suite("q84_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q85.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q85.groovy
index 11330cd1dc7a0e..6c61281f87f78f 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q85.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q85.groovy
@@ -19,7 +19,7 @@ suite("q85_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q86.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q86.groovy
index bbc956a82fce27..447a965f9784cb 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q86.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q86.groovy
@@ -19,7 +19,7 @@ suite("q86_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q87.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q87.groovy
index c6479dbebe65ad..f7d303881049cb 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q87.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q87.groovy
@@ -19,7 +19,7 @@ suite("q87_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q88.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q88.groovy
index 8077197a61ae75..28462ebcd530af 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q88.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q88.groovy
@@ -19,7 +19,7 @@ suite("q88_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q89.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q89.groovy
index d6e6bf9ae70fbb..57cec480023a1d 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q89.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q89.groovy
@@ -19,7 +19,7 @@ suite("q89_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q90.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q90.groovy
index 7724c6d0eb816e..1032699123fbd9 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q90.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q90.groovy
@@ -19,7 +19,7 @@ suite("q90_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q91.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q91.groovy
index bc56a712531d2d..a0f7b91c82edea 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q91.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q91.groovy
@@ -19,7 +19,7 @@ suite("q91_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q92.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q92.groovy
index 3194c15030ef27..957a78575d6a01 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q92.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q92.groovy
@@ -19,7 +19,7 @@ suite("q92_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   multi_sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q93.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q93.groovy
index a2f4d8c3b90045..af2371dc2c624f 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q93.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q93.groovy
@@ -19,7 +19,7 @@ suite("q93_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q94.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q94.groovy
index ce5ed847ce571c..9c7a6ed5380e95 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q94.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q94.groovy
@@ -19,7 +19,7 @@ suite("q94_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q95.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q95.groovy
index 9bc5e5b2bbae1b..46cdb7301b5e4a 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q95.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q95.groovy
@@ -19,7 +19,7 @@ suite("q95_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q96.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q96.groovy
index 474073b10b59dd..e0e68fc3b4c68c 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q96.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q96.groovy
@@ -19,7 +19,7 @@ suite("q96_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q97.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q97.groovy
index 2a8ac3e21015ac..97adde154ef70c 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q97.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q97.groovy
@@ -19,7 +19,7 @@ suite("q97_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q98.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q98.groovy
index b28776964b7341..aec36c9c6de8ae 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q98.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q98.groovy
@@ -19,7 +19,7 @@ suite("q98_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q99.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q99.groovy
index 5bc0ee63ce4358..20300a1b671519 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q99.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q99.groovy
@@ -19,7 +19,7 @@ suite("q99_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpcds_sf1_unique_p1;
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q01.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q01.groovy
index dc8390eb487263..30e47e823dea80 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q01.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q01.groovy
@@ -19,7 +19,7 @@ suite("q01_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q02.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q02.groovy
index 1d32eae44dc282..7857ac2ccde9f6 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q02.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q02.groovy
@@ -19,7 +19,7 @@ suite("q02_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q03.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q03.groovy
index 80d5f905f1a6b4..3750e383f4532f 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q03.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q03.groovy
@@ -19,7 +19,7 @@ suite("q03_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q03_spill") {
   qt_q03 """
 -- tables: customer,orders,lineitem
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   l_orderkey,
   sum(l_extendedprice * (1 - l_discount)) AS revenue,
   o_orderdate,
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q04.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q04.groovy
index c87e6fb13781ac..6559e12454bbb1 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q04.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q04.groovy
@@ -19,7 +19,7 @@ suite("q04_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q04_spill") {
   qt_q04 """
 -- tables: orders,lineitem
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   o_orderpriority,
   count(*) AS order_count
 FROM orders
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q05.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q05.groovy
index 84c14a49c49fa3..a32adfa3107bf0 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q05.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q05.groovy
@@ -19,7 +19,7 @@ suite("q05_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q05_spill") {
   qt_q05 """
 -- tables: customer,orders,lineitem,supplier,nation,region
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   n_name,
   sum(l_extendedprice * (1 - l_discount)) AS revenue
 FROM
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q06.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q06.groovy
index a63c041b137fdc..5b83fad0bdad70 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q06.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q06.groovy
@@ -19,7 +19,7 @@ suite("q06_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q06_spill") {
   qt_q06 """
 -- tables: lineitem
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   sum(l_extendedprice * l_discount) AS revenue
 FROM
   lineitem
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q07.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q07.groovy
index 3a09e72b7ef7a2..0d72f4875c462d 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q07.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q07.groovy
@@ -19,7 +19,7 @@ suite("q07_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q07_spill") {
   qt_q07 """
 -- tables: supplier,lineitem,orders,customer,nation
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   supp_nation,
   cust_nation,
   l_year,
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q08.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q08.groovy
index 0bdf04392922eb..a9fbc45e8f0ec4 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q08.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q08.groovy
@@ -19,7 +19,7 @@ suite("q08_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q08_spill") {
   qt_q08 """
 -- tables: part,supplier,lineitem,orders,customer,nation,region
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   o_year,
   sum(CASE
       WHEN nation = 'BRAZIL'
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q09.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q09.groovy
index 282e20b9bffc76..6ef0ed78177524 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q09.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q09.groovy
@@ -19,7 +19,7 @@ suite("q09_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q10.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q10.groovy
index 2626bff0fea6ed..1b4b64427a9d0c 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q10.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q10.groovy
@@ -19,7 +19,7 @@ suite("q10_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q10_spill") {
   qt_q10 """
 -- tables: customer,orders,lineitem,nation
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   c_custkey,
   c_name,
   sum(l_extendedprice * (1 - l_discount)) AS revenue,
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q11.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q11.groovy
index 07b8a3b97715c9..7687eb21854609 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q11.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q11.groovy
@@ -19,7 +19,7 @@ suite("q11_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q11_spill") {
   qt_q11 """
 -- tables: partsupp,supplier,nation
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   ps_partkey,
   sum(ps_supplycost * ps_availqty) AS value
 FROM
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q12.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q12.groovy
index 73f5b19bdb2cfb..4f08be43b85769 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q12.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q12.groovy
@@ -19,7 +19,7 @@ suite("q12_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q12_spill") {
   qt_q12 """
 -- tables: orders,lineitem
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   l_shipmode,
   sum(CASE
       WHEN o_orderpriority = '1-URGENT'
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q13.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q13.groovy
index 64cd5e0babd008..3eb7c07c0badb3 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q13.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q13.groovy
@@ -19,7 +19,7 @@ suite("q13_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q13_spill") {
   qt_q13 """
 -- tables: customer
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   c_count,
   count(*) AS custdist
 FROM (
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q14.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q14.groovy
index 3bb423b92f1da1..cd3ea166dd4ed5 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q14.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q14.groovy
@@ -19,7 +19,7 @@ suite("q14_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q14_spill") {
   qt_q14 """
 -- tables: lineitem,part
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   100.00 * sum(CASE
                     WHEN p_type LIKE 'PROMO%'
                       THEN l_extendedprice * (1 - l_discount)
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q15.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q15.groovy
index ffe0e68c5e8d90..290e2cb55ba1f3 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q15.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q15.groovy
@@ -19,14 +19,14 @@ suite("q15_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
   """
   qt_q15 """
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   s_suppkey,
   s_name,
   s_address,
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q16.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q16.groovy
index b8f5347dacb6dc..d4743a215990f9 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q16.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q16.groovy
@@ -19,7 +19,7 @@ suite("q16_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q16_spill") {
   qt_q16 """
 -- tables: partsupp,part,supplier
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   p_brand,
   p_type,
   p_size,
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q17.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q17.groovy
index 01aeaa49e3d217..88eb0fcc207fbb 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q17.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q17.groovy
@@ -19,7 +19,7 @@ suite("q17_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q17_spill") {
   qt_q17 """
 -- tables: lineitem,part
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   sum(l_extendedprice) / 7.0 AS avg_yearly
 FROM
   lineitem,
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q18.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q18.groovy
index b8d712928cf351..87549541ba8f49 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q18.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q18.groovy
@@ -19,7 +19,7 @@ suite("q18_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q18_spill") {
   qt_q18 """
 -- tables: customer,orders,lineitem
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   c_name,
   c_custkey,
   o_orderkey,
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q19.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q19.groovy
index 511f875a6544f8..a29a0711647894 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q19.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q19.groovy
@@ -19,7 +19,7 @@ suite("q19_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q19_spill") {
   qt_q19 """
 -- tables: lineitem,part
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   sum(l_extendedprice * (1 - l_discount)) AS revenue
 FROM
   lineitem,
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q20.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q20.groovy
index 21a57bcbbe02db..02b809e79706da 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q20.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q20.groovy
@@ -19,7 +19,7 @@ suite("q20_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q20_spill") {
   qt_q20 """
 -- tables: supplier,nation,partsupp,lineitem,part
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   s_name,
   s_address
 FROM
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q21.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q21.groovy
index c32546362ec0bc..7d82a4c8875724 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q21.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q21.groovy
@@ -19,7 +19,7 @@ suite("q21_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q21_spill") {
   qt_q21 """
 -- tables: supplier,lineitem,orders,nation
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   s_name,
   count(*) AS numwait
 FROM
diff --git a/regression-test/suites/tpch_sf0.1_p1/spill/q22.groovy b/regression-test/suites/tpch_sf0.1_p1/spill/q22.groovy
index 26a15704d9b9ec..45a26a0db68e3c 100644
--- a/regression-test/suites/tpch_sf0.1_p1/spill/q22.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/spill/q22.groovy
@@ -19,7 +19,7 @@ suite("q22_spill") {
     set enable_force_spill=true;
   """
   sql """
-    set min_revocable_mem=1;
+    set spill_min_revocable_mem=1;
   """
   sql """
     use regression_test_tpch_sf0_1_p1;
@@ -27,7 +27,7 @@ suite("q22_spill") {
   qt_q22 """
 -- tables: orders,customer
 SELECT
-/*+SET_VAR(enable_force_spill=true, min_revocable_mem=1)*/
+/*+SET_VAR(enable_force_spill=true, spill_min_revocable_mem=1)*/
   cntrycode,
   count(*)       AS numcust,
   sum(c_acctbal) AS totacctbal
diff --git a/regression-test/suites/tpch_sf1_p2/spill/partitioned_agg_fault_injection.groovy b/regression-test/suites/tpch_sf1_p2/spill/partitioned_agg_fault_injection.groovy
index f80b0a987bd134..f568e5d8f04220 100644
--- a/regression-test/suites/tpch_sf1_p2/spill/partitioned_agg_fault_injection.groovy
+++ b/regression-test/suites/tpch_sf1_p2/spill/partitioned_agg_fault_injection.groovy
@@ -19,7 +19,7 @@ suite("partitioned_agg_fault_injection", "p2, nonConcurrent") {
     multi_sql """
     use regression_test_tpch_sf1_p2;
     set enable_force_spill=true;
-    set min_revocable_mem=1024;
+    set spill_min_revocable_mem=1024;
     """
     def test_sql = """
     select
diff --git a/regression-test/suites/tpch_sf1_p2/spill/partitioned_hash_join_fault_injection.groovy b/regression-test/suites/tpch_sf1_p2/spill/partitioned_hash_join_fault_injection.groovy
index b79e584ca97b5f..6f5e9d58e77b1c 100644
--- a/regression-test/suites/tpch_sf1_p2/spill/partitioned_hash_join_fault_injection.groovy
+++ b/regression-test/suites/tpch_sf1_p2/spill/partitioned_hash_join_fault_injection.groovy
@@ -19,7 +19,7 @@ suite("partitioned_hash_join_fault_injection", "p2, nonConcurrent") {
     multi_sql """
     use regression_test_tpch_sf1_p2;
     set enable_force_spill=true;
-    set min_revocable_mem=1024;
+    set spill_min_revocable_mem=1024;
     """
     def test_sql = """
     SELECT
diff --git a/regression-test/suites/tpch_sf1_p2/spill/spill_sort_fault_injection.groovy b/regression-test/suites/tpch_sf1_p2/spill/spill_sort_fault_injection.groovy
index 3030b123e45170..37870221243526 100644
--- a/regression-test/suites/tpch_sf1_p2/spill/spill_sort_fault_injection.groovy
+++ b/regression-test/suites/tpch_sf1_p2/spill/spill_sort_fault_injection.groovy
@@ -19,7 +19,7 @@ suite("spill_sort_fault_injection", "p2, nonConcurrent") {
     multi_sql """
     use regression_test_tpch_sf1_p2;
     set enable_force_spill=true;
-    set min_revocable_mem=1024;
+    set spill_min_revocable_mem=1024;
     """
     def test_sql = """
     select
diff --git a/regression-test/suites/variant_p0/load.groovy b/regression-test/suites/variant_p0/load.groovy
index 1b93ecc974748b..6fb6b5e7ee1b7b 100644
--- a/regression-test/suites/variant_p0/load.groovy
+++ b/regression-test/suites/variant_p0/load.groovy
@@ -290,7 +290,7 @@ suite("regression_test_variant", "p0"){
         sql """insert into ${table_name} values (5, '{"i" : 1}'), (1, '{"a" : 1}')"""
         sql """insert into ${table_name} values (6, '{"j" : 1}'), (1, '{"a" : 1}')"""
         sql """insert into ${table_name} values (6, '{"k" : 1}'), (1, '{"a" : 1}')"""
-        sql "select /*+SET_VAR(batch_size=4064,broker_load_batch_size=16352,disable_streaming_preaggregations=false,enable_distinct_streaming_aggregation=true,parallel_fragment_exec_instance_num=1,parallel_pipeline_task_num=4,profile_level=1,enable_pipeline_engine=true,enable_parallel_scan=true,parallel_scan_max_scanners_count=16,parallel_scan_min_rows_per_scanner=128,enable_fold_constant_by_be=true,enable_rewrite_element_at_to_slot=true,runtime_filter_type=2,enable_parallel_result_sink=false,sort_phase_num=0,enable_nereids_planner=true,rewrite_or_to_in_predicate_threshold=2,enable_function_pushdown=true,enable_common_expr_pushdown=true,enable_local_exchange=true,partitioned_hash_join_rows_threshold=1048576,partitioned_hash_agg_rows_threshold=8,partition_pruning_expand_threshold=10,enable_share_hash_table_for_broadcast_join=true,enable_two_phase_read_opt=true,enable_common_expr_pushdown_for_inverted_index=false,enable_delete_sub_predicate_v2=true,min_revocable_mem=33554432,fetch_remote_schema_timeout_seconds=120,max_fetch_remote_schema_tablet_count=512,enable_spill=false,enable_force_spill=false,data_queue_max_blocks=1,spill_streaming_agg_mem_limit=268435456,spill_aggregation_partition_count=5) */ * from ${table_name}"
+        sql "select /*+SET_VAR(batch_size=4064,broker_load_batch_size=16352,disable_streaming_preaggregations=false,enable_distinct_streaming_aggregation=true,parallel_fragment_exec_instance_num=1,parallel_pipeline_task_num=4,profile_level=1,enable_pipeline_engine=true,enable_parallel_scan=true,parallel_scan_max_scanners_count=16,parallel_scan_min_rows_per_scanner=128,enable_fold_constant_by_be=true,enable_rewrite_element_at_to_slot=true,runtime_filter_type=2,enable_parallel_result_sink=false,sort_phase_num=0,enable_nereids_planner=true,rewrite_or_to_in_predicate_threshold=2,enable_function_pushdown=true,enable_common_expr_pushdown=true,enable_local_exchange=true,partitioned_hash_join_rows_threshold=1048576,partitioned_hash_agg_rows_threshold=8,partition_pruning_expand_threshold=10,enable_share_hash_table_for_broadcast_join=true,enable_two_phase_read_opt=true,enable_common_expr_pushdown_for_inverted_index=false,enable_delete_sub_predicate_v2=true,spill_min_revocable_mem=33554432,fetch_remote_schema_timeout_seconds=120,max_fetch_remote_schema_tablet_count=512,enable_spill=false,enable_force_spill=false,data_queue_max_blocks=1,spill_streaming_agg_mem_limit=268435456,spill_aggregation_partition_count=5) */ * from ${table_name}"
         qt_sql_36_1 "select cast(v['a'] as int), cast(v['b'] as int), cast(v['c'] as int) from ${table_name} order by k limit 10"
         sql "DELETE FROM ${table_name} WHERE k=1"
         sql "select * from ${table_name}"
diff --git a/regression-test/suites/variant_p0/nested.groovy b/regression-test/suites/variant_p0/nested.groovy
index 6ae7ee2c3a74d2..a7699c1fd2b5dd 100644
--- a/regression-test/suites/variant_p0/nested.groovy
+++ b/regression-test/suites/variant_p0/nested.groovy
@@ -133,7 +133,7 @@ suite("regression_test_variant_nested", "p0"){
 
         qt_sql """select  /*+SET_VAR(batch_size=1024,broker_load_batch_size=16352,disable_streaming_preaggregations=true,enable_distinct_streaming_aggregation=true,parallel_fragment_exec_
 parallel_pipeline_task_num=7,parallel_fragment_exec_instance_num=4,profile_level=1,enable_pipeline_engine=true,enable_parallel_scan=false,parallel_scan_max_scanners_count=16
-,parallel_scan_min_rows_per_scanner=128,enable_fold_constant_by_be=false,enable_rewrite_element_at_to_slot=true,runtime_filter_type=2,enable_parallel_result_sink=true,sort_phase_num=0,enable_nereids_planner=true,rewrite_or_to_in_predicate_threshold=2,enable_function_pushdown=true,enable_common_expr_pushdown=false,enable_local_exchange=true,partitioned_hash_join_rows_threshold=8,partitioned_hash_agg_rows_threshold=8,partition_pruning_expand_threshold=10,enable_share_hash_table_for_broadcast_join=false,enable_two_phase_read_opt=true,enable_common_expr_pushdown_for_inverted_index=true,enable_delete_sub_predicate_v2=true,min_revocable_mem=1,fetch_remote_schema_timeout_seconds=120,max_fetch_remote_schema_tablet_count=512,enable_spill=true,enable_force_spill=false,data_queue_max_blocks=1,spill_streaming_agg_mem_limit=268435456,spill_aggregation_partition_count=5) */ * from var_nested where v['k2'] = 'some' order by k limit 10"""
+,parallel_scan_min_rows_per_scanner=128,enable_fold_constant_by_be=false,enable_rewrite_element_at_to_slot=true,runtime_filter_type=2,enable_parallel_result_sink=true,sort_phase_num=0,enable_nereids_planner=true,rewrite_or_to_in_predicate_threshold=2,enable_function_pushdown=true,enable_common_expr_pushdown=false,enable_local_exchange=true,partitioned_hash_join_rows_threshold=8,partitioned_hash_agg_rows_threshold=8,partition_pruning_expand_threshold=10,enable_share_hash_table_for_broadcast_join=false,enable_two_phase_read_opt=true,enable_common_expr_pushdown_for_inverted_index=true,enable_delete_sub_predicate_v2=true,spill_min_revocable_mem=1,fetch_remote_schema_timeout_seconds=120,max_fetch_remote_schema_tablet_count=512,enable_spill=true,enable_force_spill=false,data_queue_max_blocks=1,spill_streaming_agg_mem_limit=268435456,spill_aggregation_partition_count=5) */ * from var_nested where v['k2'] = 'some' order by k limit 10"""
         qt_sql """select * from var_nested where v['k2'] = 'some'  and array_contains(cast(v['nested1']['nested2']['a'] as array<tinyint>), 10) order by k limit 1;"""
 
         sql """INSERT INTO var_nested SELECT *, '{"k1":1, "k2": "some", "k3" : [1234], "k4" : 1.10000, "k5" : [[123]], "nested1" : {"nested2" : [{"a" : 10, "b" : 1.1, "c" : "1111"}]}}' FROM numbers("number" = "4096") where number > 1024 limit 1024;"""
@@ -162,7 +162,7 @@ parallel_pipeline_task_num=7,parallel_fragment_exec_instance_num=4,profile_level
                 properties("replication_num" = "1", "disable_auto_compaction" = "false", "enable_unique_key_merge_on_write" = "true", "variant_enable_flatten_nested" = "true");
             """
         sql """insert into var_nested2 select * from var_nested order by k limit 1024"""
-        qt_sql """select  /*+SET_VAR(batch_size=4064,broker_load_batch_size=16352,disable_streaming_preaggregations=true,enable_distinct_streaming_aggregation=true,parallel_fragment_exec_instance_num=5,parallel_pipeline_task_num=1,profile_level=1,enable_pipeline_engine=false,enable_parallel_scan=true,parallel_scan_max_scanners_count=48,parallel_scan_min_rows_per_scanner=16384,enable_fold_constant_by_be=true,enable_rewrite_element_at_to_slot=true,runtime_filter_type=12,enable_parallel_result_sink=false,enable_nereids_planner=true,rewrite_or_to_in_predicate_threshold=2,enable_function_pushdown=true,enable_common_expr_pushdown=false,enable_local_exchange=false,partitioned_hash_join_rows_threshold=1048576,partitioned_hash_agg_rows_threshold=8,partition_pruning_expand_threshold=10,enable_share_hash_table_for_broadcast_join=false,enable_two_phase_read_opt=true,enable_common_expr_pushdown_for_inverted_index=true,enable_delete_sub_predicate_v2=true,min_revocable_mem=33554432,fetch_remote_schema_timeout_seconds=120,max_fetch_remote_schema_tablet_count=512,enable_spill=false,enable_force_spill=false,data_queue_max_blocks=1,spill_streaming_agg_mem_limit=268435456,spill_aggregation_partition_count=5) */  * from var_nested2 order by k limit 10;"""
+        qt_sql """select  /*+SET_VAR(batch_size=4064,broker_load_batch_size=16352,disable_streaming_preaggregations=true,enable_distinct_streaming_aggregation=true,parallel_fragment_exec_instance_num=5,parallel_pipeline_task_num=1,profile_level=1,enable_pipeline_engine=false,enable_parallel_scan=true,parallel_scan_max_scanners_count=48,parallel_scan_min_rows_per_scanner=16384,enable_fold_constant_by_be=true,enable_rewrite_element_at_to_slot=true,runtime_filter_type=12,enable_parallel_result_sink=false,enable_nereids_planner=true,rewrite_or_to_in_predicate_threshold=2,enable_function_pushdown=true,enable_common_expr_pushdown=false,enable_local_exchange=false,partitioned_hash_join_rows_threshold=1048576,partitioned_hash_agg_rows_threshold=8,partition_pruning_expand_threshold=10,enable_share_hash_table_for_broadcast_join=false,enable_two_phase_read_opt=true,enable_common_expr_pushdown_for_inverted_index=true,enable_delete_sub_predicate_v2=true,spill_min_revocable_mem=33554432,fetch_remote_schema_timeout_seconds=120,max_fetch_remote_schema_tablet_count=512,enable_spill=false,enable_force_spill=false,data_queue_max_blocks=1,spill_streaming_agg_mem_limit=268435456,spill_aggregation_partition_count=5) */  * from var_nested2 order by k limit 10;"""
         qt_sql """select v['nested'] from var_nested2 where k < 10 order by k limit 10;"""
         // 0. nomal explode variant array
         order_qt_explode_sql """select count(),cast(vv['xx'] as int) from var_nested lateral view explode_variant_array(v['nested']) tmp as vv where vv['xx'] = 10 group by cast(vv['xx'] as int)"""
diff --git a/regression-test/suites/variant_p0/test_sub_path_pruning.groovy b/regression-test/suites/variant_p0/test_sub_path_pruning.groovy
index 4b9cc3173183b9..52868f00511a5a 100644
--- a/regression-test/suites/variant_p0/test_sub_path_pruning.groovy
+++ b/regression-test/suites/variant_p0/test_sub_path_pruning.groovy
@@ -139,7 +139,7 @@ suite("variant_sub_path_pruning", "variant_type"){
 
     // two children
     order_qt_sql """
-        select  /*+SET_VAR(batch_size=50,disable_streaming_preaggregations=false,enable_distinct_streaming_aggregation=true,parallel_fragment_exec_instance_num=6,parallel_pipeline_task_num=2,profile_level=1,enable_pipeline_engine=true,enable_parallel_scan=false,parallel_scan_max_scanners_count=16,parallel_scan_min_rows_per_scanner=128,enable_fold_constant_by_be=false,enable_rewrite_element_at_to_slot=true,runtime_filter_type=2,enable_nereids_planner=true,rewrite_or_to_in_predicate_threshold=2,enable_function_pushdown=true,enable_common_expr_pushdown=true,enable_local_exchange=false,partitioned_hash_join_rows_threshold=1048576,partitioned_hash_agg_rows_threshold=8,partition_pruning_expand_threshold=10,enable_share_hash_table_for_broadcast_join=false,enable_two_phase_read_opt=true,enable_delete_sub_predicate_v2=true,min_revocable_mem=33554432,fetch_remote_schema_timeout_seconds=120,enable_spill=false,enable_force_spill=false,data_queue_max_blocks=1,spill_streaming_agg_mem_limit=268435456,spill_aggregation_partition_count=5) */ dt['a'] as c1 from pruning_test union all select dt['a'] as c1 from pruning_test;
+        select  /*+SET_VAR(batch_size=50,disable_streaming_preaggregations=false,enable_distinct_streaming_aggregation=true,parallel_fragment_exec_instance_num=6,parallel_pipeline_task_num=2,profile_level=1,enable_pipeline_engine=true,enable_parallel_scan=false,parallel_scan_max_scanners_count=16,parallel_scan_min_rows_per_scanner=128,enable_fold_constant_by_be=false,enable_rewrite_element_at_to_slot=true,runtime_filter_type=2,enable_nereids_planner=true,rewrite_or_to_in_predicate_threshold=2,enable_function_pushdown=true,enable_common_expr_pushdown=true,enable_local_exchange=false,partitioned_hash_join_rows_threshold=1048576,partitioned_hash_agg_rows_threshold=8,partition_pruning_expand_threshold=10,enable_share_hash_table_for_broadcast_join=false,enable_two_phase_read_opt=true,enable_delete_sub_predicate_v2=true,spill_min_revocable_mem=33554432,fetch_remote_schema_timeout_seconds=120,enable_spill=false,enable_force_spill=false,data_queue_max_blocks=1,spill_streaming_agg_mem_limit=268435456,spill_aggregation_partition_count=5) */ dt['a'] as c1 from pruning_test union all select dt['a'] as c1 from pruning_test;
         """
     order_qt_sql """select c1['a'] from (select dt as c1 from pruning_test union all select dt as c1 from pruning_test) v1;"""
     order_qt_sql """select c1['b'] from (select dt['a'] as c1 from pruning_test union all select dt['a'] as c1 from pruning_test) v1;"""