From a78040128edf82a22e338c7a35d007129963187c Mon Sep 17 00:00:00 2001
From: minghong <zhouminghong@selectdb.com>
Date: Thu, 7 Aug 2025 12:38:12 +0800
Subject: [PATCH 1/2] pick

---
 .../apache/doris/nereids/stats/StatsCalculator.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/stats/StatsCalculator.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/stats/StatsCalculator.java
index a4f06cb9568eb6..1314d81b1b8392 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/stats/StatsCalculator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/stats/StatsCalculator.java
@@ -258,8 +258,14 @@ public static Optional<String> disableJoinReorderIfStatsInvalid(List<CatalogRela
             double rowCount = calculator.getTableRowCount(scan);
             // row count not available
             if (rowCount == -1) {
-                LOG.info("disable join reorder since row count not available: "
-                        + scan.getTable().getNameWithFullQualifiers());
+                try {
+                    ConnectContext.get().getSessionVariable()
+                            .setVarOnce(SessionVariable.DISABLE_JOIN_REORDER, "true");
+                    LOG.info("disable join reorder since row count not available: "
+                            + scan.getTable().getNameWithFullQualifiers());
+                } catch (Exception e) {
+                    LOG.info("disableNereidsJoinReorderOnce failed");
+                }
                 return Optional.of("table[" + scan.getTable().getName() + "] row count is invalid");
             }
             if (scan instanceof OlapScan) {

From 97872fa69a0264340d6402b617767f6fb57c8354 Mon Sep 17 00:00:00 2001
From: minghong <zhouminghong@selectdb.com>
Date: Mon, 11 Aug 2025 10:56:23 +0800
Subject: [PATCH 2/2] mv_ssb_test.groovy

---
 .../suites/nereids_rules_p0/mv/ssb/mv_ssb_test.groovy     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/regression-test/suites/nereids_rules_p0/mv/ssb/mv_ssb_test.groovy b/regression-test/suites/nereids_rules_p0/mv/ssb/mv_ssb_test.groovy
index a80690a7bbef5a..c0fe409c74f87b 100644
--- a/regression-test/suites/nereids_rules_p0/mv/ssb/mv_ssb_test.groovy
+++ b/regression-test/suites/nereids_rules_p0/mv/ssb/mv_ssb_test.groovy
@@ -89,7 +89,13 @@ suite("mv_ssb_test") {
     sql "set runtime_filter_mode=OFF"
     sql "SET enable_nereids_timeout = false"
     sql "SET BATCH_SIZE = 4064"
-
+    sql """
+          alter table customer modify column c_mktsegment SET STATS ('ndv'='5', 'num_nulls'='0', 'row_count'='3000');
+          alter table lineorder modify column lo_revenue SET STATS ('ndv'='453898', 'num_nulls'='0', 'row_count'='30600572');
+          alter table part modify column p_mfgr SET STATS ('ndv'='5', 'num_nulls'='0', 'row_count'='20000.0');
+          alter table date modify column d_dayofweek  SET STATS ('ndv'='7', 'num_nulls'='0', 'row_count'='255');
+          alter table supplier modify column s_phone  SET STATS ('ndv'='200', 'num_nulls'='0', 'row_count'='200');
+        """
     def mv1_1 = """
             SELECT SUM(lo_extendedprice*lo_discount) AS
             REVENUE