Support cross join without any join clause

Author: lgbo-ustc

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseJoinSuite.scala

@@ -170,4 +170,76 @@ class GlutenClickHouseJoinSuite extends GlutenClickHouseWholeStageTransformerSui
     }
   }
 
+  test("GLUTEN-10961 cross join with empty join clause") {
+    val crossSql1 =
+      """
+        |select a, b from (select id as a from range(1) )
+        |cross join (
+        | select id as b from range(2)
+        |);
+        |""".stripMargin
+    compareResultsAgainstVanillaSpark(crossSql1, true, { _ => })
+
+    val crossSql2 =
+      """
+        |select a, b from (select id as a from range(1) where id > 1 )
+        |cross join (
+        | select id as b from range(2)
+        |);
+        |""".stripMargin
+    compareResultsAgainstVanillaSpark(crossSql2, true, { _ => })
+
+    val fullSql1 =
+      """
+        |select a, b from (select id as a from range(1) where id > 1)
+        |full join (
+        | select id as b from range(2)
+        |)
+        |""".stripMargin
+    compareResultsAgainstVanillaSpark(fullSql1, true, { _ => })
+
+    val fullSql2 =
+      """
+        |select a, b from (select id as a from range(1) )
+        |full join (
+        | select id as b from range(2)
+        |)
+        |""".stripMargin
+    compareResultsAgainstVanillaSpark(fullSql2, true, { _ => })
+
+    val innerSql1 =
+      """
+        |select a, b from (select id as a from range(1) where id > 1)
+        |inner join (
+        | select id as b from range(2)
+        |)
+        |""".stripMargin
+    compareResultsAgainstVanillaSpark(innerSql1, true, { _ => })
+    val innerSql2 =
+      """
+        |select a, b from (select id as a from range(1) )
+        |inner join (
+        | select id as b from range(2)
+        |)
+        |""".stripMargin
+    compareResultsAgainstVanillaSpark(innerSql2, true, { _ => })
+
+    val leftSql1 =
+      """
+        |select a, b from (select id as a from range(1) where id > 1)
+        |left join (
+        | select id as b from range(2)
+        |)
+        |""".stripMargin
+    compareResultsAgainstVanillaSpark(leftSql1, true, { _ => })
+    val leftSql2 =
+      """
+        |select a, b from (select id as a from range(1) )
+        |left join (
+        | select id as b from range(2)
+        |)
+        |""".stripMargin
+    compareResultsAgainstVanillaSpark(leftSql2, true, { _ => })
+  }
+
 }

cpp-ch/clickhouse.version

@@ -1,3 +1,3 @@
 CH_ORG=Kyligence
 CH_BRANCH=rebase_ch/20250729
-CH_COMMIT=77ef0818976
+CH_COMMIT=fc5d7b7b234

cpp-ch/local-engine/Common/CHUtil.cpp

@@ -1097,9 +1097,11 @@ std::pair<DB::JoinKind, DB::JoinStrictness> JoinUtil::getCrossJoinKindAndStrictn
     switch (join_type)
     {
         case substrait::CrossRel_JoinType_JOIN_TYPE_INNER:
+            return {DB::JoinKind::Cross, DB::JoinStrictness::All};
         case substrait::CrossRel_JoinType_JOIN_TYPE_LEFT:
+            return {DB::JoinKind::Left, DB::JoinStrictness::All};
         case substrait::CrossRel_JoinType_JOIN_TYPE_OUTER:
-            return {DB::JoinKind::Cross, DB::JoinStrictness::All};
+            return {DB::JoinKind::Full, DB::JoinStrictness::All};
         default:
             throw Exception(ErrorCodes::UNKNOWN_TYPE, "unsupported join type {}.", magic_enum::enum_name(join_type));
     }