From a0b59ac7b01bf480d0e6b3408faa6ac907672492 Mon Sep 17 00:00:00 2001
From: shuke <37901441+shuke987@users.noreply.github.com>
Date: Fri, 10 Jul 2026 17:11:14 +0800
Subject: [PATCH 1/2] [fix](regression) stabilize DPHyp query85 shape check

---
 .../suites/shape_check/tpcds_sf1000/dphyper/query85.groovy       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/regression-test/suites/shape_check/tpcds_sf1000/dphyper/query85.groovy b/regression-test/suites/shape_check/tpcds_sf1000/dphyper/query85.groovy
index d3f2691847e1d3..e87fb4988e9434 100644
--- a/regression-test/suites/shape_check/tpcds_sf1000/dphyper/query85.groovy
+++ b/regression-test/suites/shape_check/tpcds_sf1000/dphyper/query85.groovy
@@ -38,6 +38,7 @@ suite("query85") {
     sql "SET enable_dphyp_optimizer = true"
     sql "set max_table_count_use_cascades_join_reorder = 1"
     sql "set dphyper_limit=2600"
+    sql "set join_reorder_time_limit=10000"
 
     def ds = """select  substr(r_reason_desc,1,20)
        ,avg(ws_quantity)

From 7b287ad31d9ca1c9e23e41ef1e4877bb5b1fd66e Mon Sep 17 00:00:00 2001
From: shuke <37901441+shuke987@users.noreply.github.com>
Date: Fri, 17 Jul 2026 10:03:36 +0800
Subject: [PATCH 2/2] [fix](regression) Use registered join order time limit

### What problem does this PR solve?

Issue Number: None

Related PR: #65461

Problem Summary: The query85 regression case used the unregistered session variable name `join_reorder_time_limit`, so Doris rejected the SET before reaching the shape assertion. Use the registered `join_order_time_limit` name bound to `SessionVariable.joinReorderTimeLimit`.

### Release note

None

### Check List (For Author)

- Test: Static validation and Groovy compilation
- Behavior changed: No
- Does this need documentation: No
---
 .../suites/shape_check/tpcds_sf1000/dphyper/query85.groovy      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regression-test/suites/shape_check/tpcds_sf1000/dphyper/query85.groovy b/regression-test/suites/shape_check/tpcds_sf1000/dphyper/query85.groovy
index e87fb4988e9434..7756863ecfd7a0 100644
--- a/regression-test/suites/shape_check/tpcds_sf1000/dphyper/query85.groovy
+++ b/regression-test/suites/shape_check/tpcds_sf1000/dphyper/query85.groovy
@@ -38,7 +38,7 @@ suite("query85") {
     sql "SET enable_dphyp_optimizer = true"
     sql "set max_table_count_use_cascades_join_reorder = 1"
     sql "set dphyper_limit=2600"
-    sql "set join_reorder_time_limit=10000"
+    sql "set join_order_time_limit=10000"
 
     def ds = """select  substr(r_reason_desc,1,20)
        ,avg(ws_quantity)