chore: codefmt

KKould · KKould · commit f316f9d4962e · 2025-09-26T15:59:26.000+08:00
diff --git a/src/query/service/src/physical_plans/physical_join.rs b/src/query/service/src/physical_plans/physical_join.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use databend_common_exception::ErrorCode;
 use databend_common_exception::Result;
 use databend_common_sql::binder::JoinPredicate;
 use databend_common_sql::optimizer::ir::RelExpr;
@@ -40,6 +41,13 @@ pub fn physical_join(join: &Join, s_expr: &SExpr) -> Result<PhysicalJoinType> {
         JoinType::Asof | JoinType::LeftAsof | JoinType::RightAsof
     );
 
+    if join.equi_conditions.is_empty()
+        && (join.join_type.is_any_join() || join.join_type == JoinType::Cross(true))
+    {
+        return Err(ErrorCode::SemanticError(
+            "ANY JOIN only supports equality-based hash joins",
+        ));
+    }
     if !join.equi_conditions.is_empty() && !check_asof {
         // Contain equi condition, use hash join
         return Ok(PhysicalJoinType::Hash);
diff --git a/src/query/service/src/pipelines/processors/transforms/hash_join/hash_join_state.rs b/src/query/service/src/pipelines/processors/transforms/hash_join/hash_join_state.rs
@@ -344,4 +344,9 @@ impl HashJoinHashTable {
             HashJoinHashTable::KeysU256(table) => table.hash_table.len(),
         }
     }
+
+    #[allow(dead_code)]
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
 }
diff --git a/src/query/service/tests/it/sql/planner/optimizer/data/results/basic/01_cross_join_aggregation_optimized.txt b/src/query/service/tests/it/sql/planner/optimizer/data/results/basic/01_cross_join_aggregation_optimized.txt
@@ -5,7 +5,7 @@ Aggregate(Final)
     ├── group items: []
     ├── aggregate functions: [SUM(i1.i) AS (#2), MIN(i1.i) AS (#3), MAX(i2.i) AS (#4)]
     └── Exchange(Merge)
-        └── Join(Cross)
+        └── Join(Cross(false))
             ├── build keys: []
             ├── probe keys: []
             ├── other filters: []
diff --git a/src/query/service/tests/it/sql/planner/optimizer/data/results/basic/01_cross_join_aggregation_raw.txt b/src/query/service/tests/it/sql/planner/optimizer/data/results/basic/01_cross_join_aggregation_raw.txt
@@ -5,7 +5,7 @@ EvalScalar
     ├── aggregate functions: [SUM(i1.i) AS (#2), MIN(i1.i) AS (#3), MAX(i2.i) AS (#4)]
     └── EvalScalar
         ├── scalars: [i1.i (#0) AS (#0), i1.i (#0) AS (#0), i2.i (#1) AS (#1)]
-        └── Join(Cross)
+        └── Join(Cross(false))
             ├── build keys: []
             ├── probe keys: []
             ├── other filters: []
diff --git a/src/query/service/tests/it/sql/planner/optimizer/data/results/obfuscated/01_multi_join_avg_case_expression_optimized.txt b/src/query/service/tests/it/sql/planner/optimizer/data/results/obfuscated/01_multi_join_avg_case_expression_optimized.txt
@@ -13,15 +13,15 @@ Exchange(Merge)
                     ├── Exchange(Hash): keys: [a.a0d (#0)]
                     └── EvalScalar
                         ├── scalars: [a.a0d (#0) AS (#0), a.a0k (#7) AS (#7), a.a0m (#9) AS (#9), c.a5m (#144) AS (#144), if(eq(d.a1v (#154), '603020'), 1, 0) AS (#166), b.a2t (#70) AS (#171), c.a4m (#118) AS (#172), d.a5w (#156) AS (#173)]
-                        └── Join(Inner)
+                        └── Join(Inner(false))
                             ├── build keys: [c.a0m (#149)]
                             ├── probe keys: [a.a0m (#9)]
                             ├── other filters: []
-                            ├── Join(Inner)
+                            ├── Join(Inner(false))
                             │   ├── build keys: [b.a0k (#48), b.a0n (#50)]
                             │   ├── probe keys: [a.a0k (#7), a.a0n (#10)]
                             │   ├── other filters: [lte(b.a2c (#52), a.a0d (#0)), gt(b.a2k (#61), a.a0d (#0))]
-                            │   ├── Join(Inner)
+                            │   ├── Join(Inner(false))
                             │   │   ├── build keys: [d.a5t (#151)]
                             │   │   ├── probe keys: [a.a0l (#8)]
                             │   │   ├── other filters: []
diff --git a/src/query/service/tests/it/sql/planner/optimizer/data/results/obfuscated/01_multi_join_avg_case_expression_raw.txt b/src/query/service/tests/it/sql/planner/optimizer/data/results/obfuscated/01_multi_join_avg_case_expression_raw.txt
@@ -9,15 +9,15 @@ EvalScalar
             ├── scalars: [a.a0d (#0) AS (#0), a.a0k (#7) AS (#7), a.a0m (#9) AS (#9), c.a5m (#144) AS (#144), if(eq(d.a1v (#154), '603020'), 1, 0) AS (#166)]
             └── Filter
                 ├── filters: [gte(a.a0d (#0), '20240526'), lte(a.a0d (#0), '20250525'), eq(b.a2t (#70), '624100'), eq(substring(c.a4m (#118), 20, 1), '1'), eq(substring(d.a5w (#156), 1, 1), '1')]
-                └── Join(Left)
+                └── Join(Left(false))
                     ├── build keys: [d.a5t (#151)]
                     ├── probe keys: [a.a0l (#8)]
                     ├── other filters: []
-                    ├── Join(Left)
+                    ├── Join(Left(false))
                     │   ├── build keys: [c.a0m (#149)]
                     │   ├── probe keys: [a.a0m (#9)]
                     │   ├── other filters: []
-                    │   ├── Join(Left)
+                    │   ├── Join(Left(false))
                     │   │   ├── build keys: [b.a0k (#48), b.a0n (#50)]
                     │   │   ├── probe keys: [a.a0k (#7), a.a0n (#10)]
                     │   │   ├── other filters: [lte(b.a2c (#52), a.a0d (#0)), gt(b.a2k (#61), a.a0d (#0))]
diff --git a/src/query/service/tests/it/sql/planner/optimizer/data/results/obfuscated/01_multi_join_sum_case_expression_optimized.txt b/src/query/service/tests/it/sql/planner/optimizer/data/results/obfuscated/01_multi_join_sum_case_expression_optimized.txt
@@ -9,7 +9,7 @@ Exchange(Merge)
             ├── aggregate functions: [sum(CASE WHEN d.a1v = '603020' THEN 1 ELSE 0 END) AS (#173)]
             └── Exchange(Hash)
                 ├── Exchange(Hash): keys: [a.a0d (#0)]
-                └── Join(Inner)
+                └── Join(Inner(false))
                     ├── build keys: [c.a0m (#149)]
                     ├── probe keys: [a.a0m (#9)]
                     ├── other filters: []
@@ -23,11 +23,11 @@ Exchange(Merge)
                     │           ├── Exchange(Hash): keys: [a.a0d (#0)]
                     │           └── EvalScalar
                     │               ├── scalars: [a.a0d (#0) AS (#0), a.a0k (#7) AS (#7), a.a0m (#9) AS (#9), if(eq(d.a1v (#154), '603020'), 1, 0) AS (#166), b.a2t (#70) AS (#169), d.a5w (#156) AS (#171)]
-                    │               └── Join(Inner)
+                    │               └── Join(Inner(false))
                     │                   ├── build keys: [b.a0k (#48), b.a0n (#50)]
                     │                   ├── probe keys: [a.a0k (#7), a.a0n (#10)]
                     │                   ├── other filters: [lte(b.a2c (#52), a.a0d (#0)), gt(b.a2k (#61), a.a0d (#0))]
-                    │                   ├── Join(Inner)
+                    │                   ├── Join(Inner(false))
                     │                   │   ├── build keys: [d.a5t (#151)]
                     │                   │   ├── probe keys: [a.a0l (#8)]
                     │                   │   ├── other filters: []
diff --git a/src/query/service/tests/it/sql/planner/optimizer/data/results/obfuscated/01_multi_join_sum_case_expression_raw.txt b/src/query/service/tests/it/sql/planner/optimizer/data/results/obfuscated/01_multi_join_sum_case_expression_raw.txt
@@ -9,15 +9,15 @@ EvalScalar
             ├── scalars: [a.a0d (#0) AS (#0), a.a0k (#7) AS (#7), a.a0m (#9) AS (#9), c.a5m (#144) AS (#144), if(eq(d.a1v (#154), '603020'), 1, 0) AS (#166)]
             └── Filter
                 ├── filters: [gte(a.a0d (#0), '20240526'), lte(a.a0d (#0), '20250525'), eq(b.a2t (#70), '624100'), eq(substring(c.a4m (#118), 20, 1), '1'), eq(substring(d.a5w (#156), 1, 1), '1')]
-                └── Join(Left)
+                └── Join(Left(false))
                     ├── build keys: [d.a5t (#151)]
                     ├── probe keys: [a.a0l (#8)]
                     ├── other filters: []
-                    ├── Join(Left)
+                    ├── Join(Left(false))
                     │   ├── build keys: [c.a0m (#149)]
                     │   ├── probe keys: [a.a0m (#9)]
                     │   ├── other filters: []
-                    │   ├── Join(Left)
+                    │   ├── Join(Left(false))
                     │   │   ├── build keys: [b.a0k (#48), b.a0n (#50)]
                     │   │   ├── probe keys: [a.a0k (#7), a.a0n (#10)]
                     │   │   ├── other filters: [lte(b.a2c (#52), a.a0d (#0)), gt(b.a2k (#61), a.a0d (#0))]
diff --git a/src/query/service/tests/it/sql/planner/optimizer/data/results/tpcds/Q01_optimized.txt b/src/query/service/tests/it/sql/planner/optimizer/data/results/tpcds/Q01_optimized.txt
@@ -10,7 +10,7 @@ Limit
             ├── limit: [100]
             └── EvalScalar
                 ├── scalars: [customer.c_customer_id (#79) AS (#79), ctr1.ctr_total_return (#48) AS (#154), scalar_subquery_147 (#147) AS (#155), store.s_store_sk (#49) AS (#156), ctr1.ctr_store_sk (#7) AS (#157), store.s_state (#73) AS (#158), ctr1.ctr_customer_sk (#3) AS (#159), customer.c_customer_sk (#78) AS (#160)]
-                └── Join(Inner)
+                └── Join(Inner(false))
                     ├── build keys: [ctr1.ctr_customer_sk (#3)]
                     ├── probe keys: [customer.c_customer_sk (#78)]
                     ├── other filters: []
@@ -20,7 +20,7 @@ Limit
                     │   ├── order by: []
                     │   └── limit: NONE
                     └── Exchange(Broadcast)
-                        └── Join(Inner)
+                        └── Join(Inner(false))
                             ├── build keys: [sr_store_sk (#103)]
                             ├── probe keys: [sr_store_sk (#7)]
                             ├── other filters: [gt(ctr1.ctr_total_return (#48), scalar_subquery_147 (#147))]
@@ -34,7 +34,7 @@ Limit
                             │           ├── Exchange(Hash): keys: [store_returns.sr_customer_sk (#3)]
                             │           └── EvalScalar
                             │               ├── scalars: [store_returns.sr_customer_sk (#3) AS (#3), store_returns.sr_store_sk (#7) AS (#7), store_returns.sr_return_amt (#11) AS (#11), store_returns.sr_returned_date_sk (#0) AS (#148), date_dim.d_date_sk (#20) AS (#149), date_dim.d_year (#26) AS (#150)]
-                            │               └── Join(Inner)
+                            │               └── Join(Inner(false))
                             │                   ├── build keys: [date_dim.d_date_sk (#20)]
                             │                   ├── probe keys: [store_returns.sr_returned_date_sk (#0)]
                             │                   ├── other filters: []
@@ -50,7 +50,7 @@ Limit
                             │                           ├── order by: []
                             │                           └── limit: NONE
                             └── Exchange(Broadcast)
-                                └── Join(Inner)
+                                └── Join(Inner(false))
                                     ├── build keys: [sr_store_sk (#103)]
                                     ├── probe keys: [store.s_store_sk (#49)]
                                     ├── other filters: []
@@ -80,7 +80,7 @@ Limit
                                                                     ├── Exchange(Hash): keys: [store_returns.sr_customer_sk (#99)]
                                                                     └── EvalScalar
                                                                         ├── scalars: [store_returns.sr_customer_sk (#99) AS (#99), store_returns.sr_store_sk (#103) AS (#103), store_returns.sr_return_amt (#107) AS (#107), store_returns.sr_returned_date_sk (#96) AS (#151), date_dim.d_date_sk (#116) AS (#152), date_dim.d_year (#122) AS (#153)]
-                                                                        └── Join(Inner)
+                                                                        └── Join(Inner(false))
                                                                             ├── build keys: [date_dim.d_date_sk (#116)]
                                                                             ├── probe keys: [store_returns.sr_returned_date_sk (#96)]
                                                                             ├── other filters: []
diff --git a/src/query/service/tests/it/sql/planner/optimizer/data/results/tpcds/Q01_raw.txt b/src/query/service/tests/it/sql/planner/optimizer/data/results/tpcds/Q01_raw.txt
@@ -29,7 +29,7 @@ Limit
             │                                   ├── scalars: [store_returns.sr_customer_sk (#99) AS (#99), store_returns.sr_store_sk (#103) AS (#103), store_returns.sr_return_amt (#107) AS (#107)]
             │                                   └── Filter
             │                                       ├── filters: [eq(store_returns.sr_returned_date_sk (#96), date_dim.d_date_sk (#116)), eq(date_dim.d_year (#122), 2001)]
-            │                                       └── Join(Cross)
+            │                                       └── Join(Cross(false))
             │                                           ├── build keys: []
             │                                           ├── probe keys: []
             │                                           ├── other filters: []
@@ -43,11 +43,11 @@ Limit
             │                                               ├── filters: []
             │                                               ├── order by: []
             │                                               └── limit: NONE
-            └── Join(Cross)
+            └── Join(Cross(false))
                 ├── build keys: []
                 ├── probe keys: []
                 ├── other filters: []
-                ├── Join(Cross)
+                ├── Join(Cross(false))
                 │   ├── build keys: []
                 │   ├── probe keys: []
                 │   ├── other filters: []
@@ -60,7 +60,7 @@ Limit
                 │   │           ├── scalars: [store_returns.sr_customer_sk (#3) AS (#3), store_returns.sr_store_sk (#7) AS (#7), store_returns.sr_return_amt (#11) AS (#11)]
                 │   │           └── Filter
                 │   │               ├── filters: [eq(store_returns.sr_returned_date_sk (#0), date_dim.d_date_sk (#20)), eq(date_dim.d_year (#26), 2001)]
-                │   │               └── Join(Cross)
+                │   │               └── Join(Cross(false))
                 │   │                   ├── build keys: []
                 │   │                   ├── probe keys: []
                 │   │                   ├── other filters: []
diff --git a/src/query/service/tests/it/sql/planner/optimizer/data/results/tpcds/Q03_optimized.txt b/src/query/service/tests/it/sql/planner/optimizer/data/results/tpcds/Q03_optimized.txt
@@ -18,11 +18,11 @@ Limit
                         ├── Exchange(Hash): keys: [dt.d_year (#6)]
                         └── EvalScalar
                             ├── scalars: [dt.d_year (#6) AS (#6), store_sales.ss_ext_sales_price (#43) AS (#43), item.i_brand_id (#58) AS (#58), item.i_brand (#59) AS (#59), dt.d_date_sk (#0) AS (#74), store_sales.ss_sold_date_sk (#28) AS (#75), store_sales.ss_item_sk (#30) AS (#76), item.i_item_sk (#51) AS (#77), item.i_manufact_id (#64) AS (#78), dt.d_moy (#8) AS (#79)]
-                            └── Join(Inner)
+                            └── Join(Inner(false))
                                 ├── build keys: [dt.d_date_sk (#0)]
                                 ├── probe keys: [store_sales.ss_sold_date_sk (#28)]
                                 ├── other filters: []
-                                ├── Join(Inner)
+                                ├── Join(Inner(false))
                                 │   ├── build keys: [item.i_item_sk (#51)]
                                 │   ├── probe keys: [store_sales.ss_item_sk (#30)]
                                 │   ├── other filters: []
diff --git a/src/query/service/tests/it/sql/planner/optimizer/data/results/tpcds/Q03_raw.txt b/src/query/service/tests/it/sql/planner/optimizer/data/results/tpcds/Q03_raw.txt
@@ -13,11 +13,11 @@ Limit
                 ├── scalars: [dt.d_year (#6) AS (#6), store_sales.ss_ext_sales_price (#43) AS (#43), item.i_brand_id (#58) AS (#58), item.i_brand (#59) AS (#59)]
                 └── Filter
                     ├── filters: [eq(dt.d_date_sk (#0), store_sales.ss_sold_date_sk (#28)), eq(store_sales.ss_item_sk (#30), item.i_item_sk (#51)), eq(item.i_manufact_id (#64), 128), eq(dt.d_moy (#8), 11)]
-                    └── Join(Cross)
+                    └── Join(Cross(false))
                         ├── build keys: []
                         ├── probe keys: []
                         ├── other filters: []
-                        ├── Join(Cross)
+                        ├── Join(Cross(false))
                         │   ├── build keys: []
                         │   ├── probe keys: []
                         │   ├── other filters: []
diff --git a/src/query/service/tests/it/sql/planner/optimizer/ir/expr/visitor.rs b/src/query/service/tests/it/sql/planner/optimizer/ir/expr/visitor.rs
@@ -76,7 +76,7 @@ fn create_complex_expr() -> SExpr {
     let join_condition = builder.join_condition(t1_id, t2_id, false);
 
     // Create JOIN node
-    let joined = builder.join(scan1, scan2, vec![join_condition], JoinType::Inner);
+    let joined = builder.join(scan1, scan2, vec![join_condition], JoinType::Inner(false));
 
     // Add WHERE filter condition (simplified as boolean constant)
     let where_condition = builder.bool(true);
diff --git a/src/query/service/tests/it/sql/planner/optimizer/optimizers/operator/filter/deduplicate_join_condition_test.rs b/src/query/service/tests/it/sql/planner/optimizer/optimizers/operator/filter/deduplicate_join_condition_test.rs
diff --git a/src/query/service/tests/it/sql/planner/optimizer/optimizers/rule/filter_rules/push_down_filter_join_test.rs b/src/query/service/tests/it/sql/planner/optimizer/optimizers/rule/filter_rules/push_down_filter_join_test.rs
diff --git a/src/query/sql/src/planner/optimizer/optimizers/hyper_dp/dphyp.rs b/src/query/sql/src/planner/optimizer/optimizers/hyper_dp/dphyp.rs
diff --git a/tests/sqllogictests/suites/query/join/any_join.test b/tests/sqllogictests/suites/query/join/any_join.test

Original file line number	Diff line number	Diff line change
`@@ -344,4 +344,9 @@ impl HashJoinHashTable {`
`344`	`344`	`HashJoinHashTable::KeysU256(table) => table.hash_table.len(),`
`345`	`345`	`}`
`346`	`346`	`}`
	`347`	`+`
	`348`	`+ #[allow(dead_code)]`
	`349`	`+ pub fn is_empty(&self) -> bool {`
	`350`	`+ self.len() == 0`
	`351`	`+ }`
`347`	`352`	`}`