Backport #81754 to 25.5: Fix crash in ConcurrentHashJoin with empty USING ()

robot-clickhouse · robot-clickhouse · commit e3d37211034b · 2025-06-14T00:31:12.000Z
diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
@@ -576,7 +576,7 @@ bool TableJoin::sameStrictnessAndKind(JoinStrictness strictness_, JoinKind kind_
 
 bool TableJoin::oneDisjunct() const
 {
-    return clauses.size() == 1;
+    return clauses.size() == 1 && !clauses.front().isEmpty();
 }
 
 bool TableJoin::needStreamWithNonJoinedRows() const
diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h
@@ -121,6 +121,12 @@ class TableJoin
                 "Left keys: [{}] Right keys [{}] Condition columns: '{}', '{}'",
                  fmt::join(key_names_left, ", "), fmt::join(key_names_right, ", "), left_cond, right_cond);
         }
+
+        bool isEmpty() const
+        {
+            return key_names_left.empty() && key_names_right.empty() && !on_filter_condition_left && !on_filter_condition_right
+                && analyzer_left_filter_condition_column_name.empty() && analyzer_right_filter_condition_column_name.empty();
+        }
     };
 
     using Clauses = std::vector<JoinOnClause>;
diff --git a/tests/queries/0_stateless/03538_crash_in_parallel_hash_with_empty_using.reference b/tests/queries/0_stateless/03538_crash_in_parallel_hash_with_empty_using.reference
diff --git a/tests/queries/0_stateless/03538_crash_in_parallel_hash_with_empty_using.sql b/tests/queries/0_stateless/03538_crash_in_parallel_hash_with_empty_using.sql
@@ -0,0 +1,33 @@
+set  enable_parallel_replicas = 0;
+
+SELECT
+    n,
+    myfield
+FROM
+(
+    SELECT toString(number) AS n
+    FROM system.numbers
+    LIMIT 1000
+) AS a
+ANY LEFT JOIN
+(
+    SELECT 1 AS myfield
+) AS b USING ()
+FORMAT Null
+SETTINGS allow_experimental_analyzer = false;
+
+SELECT
+    n,
+    myfield
+FROM
+(
+    SELECT toString(number) AS n
+    FROM system.numbers
+    LIMIT 1000
+) AS a
+ANY LEFT JOIN
+(
+    SELECT 1 AS myfield
+) AS b USING ()
+FORMAT Null
+SETTINGS allow_experimental_analyzer = true; -- { serverError INVALID_JOIN_ON_EXPRESSION }

Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ bool TableJoin::sameStrictnessAndKind(JoinStrictness strictness_, JoinKind kind_`
`576`	`576`
`577`	`577`	`bool TableJoin::oneDisjunct() const`
`578`	`578`	`{`
`579`		`- return clauses.size() == 1;`
	`579`	`+ return clauses.size() == 1 && !clauses.front().isEmpty();`
`580`	`580`	`}`
`581`	`581`
`582`	`582`	`bool TableJoin::needStreamWithNonJoinedRows() const`