xianyinxin commented on a change in pull request #28875:
URL: https://github.com/apache/spark/pull/28875#discussion_r446593529
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
##########
@@ -468,13 +458,25 @@ class AstBuilder(conf: SQLConf) extends
SqlBaseBaseVisitor[AnyRef] with Logging
throw new ParseException("There must be at least one WHEN clause in a
MERGE statement", ctx)
}
// children being empty means that the condition is not set
- if (matchedActions.length == 2 && matchedActions.head.children.isEmpty) {
- throw new ParseException("When there are 2 MATCHED clauses in a MERGE
statement, " +
- "the first MATCHED clause must have a condition", ctx)
- }
- if (matchedActions.groupBy(_.getClass).mapValues(_.size).exists(_._2 > 1))
{
+ val matchedActionSize = matchedActions.length
+ if (matchedActionSize >= 2 &&
!matchedActions.init.forall(_.condition.nonEmpty)) {
Review comment:
Yes, it was a bug.
##########
File path:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/DDLParserSuite.scala
##########
@@ -1134,58 +1134,53 @@ class DDLParserSuite extends AnalysisTest {
}
}
- test("merge into table: at most two matched clauses") {
- val exc = intercept[ParseException] {
- parsePlan(
- """
- |MERGE INTO testcat1.ns1.ns2.tbl AS target
- |USING testcat2.ns1.ns2.tbl AS source
- |ON target.col1 = source.col1
- |WHEN MATCHED AND (target.col2='delete') THEN DELETE
- |WHEN MATCHED AND (target.col2='update1') THEN UPDATE SET
target.col2 = source.col2
- |WHEN MATCHED AND (target.col2='update2') THEN UPDATE SET
target.col2 = source.col2
- |WHEN NOT MATCHED AND (target.col2='insert')
- |THEN INSERT (target.col1, target.col2) values (source.col1,
source.col2)
- """.stripMargin)
- }
-
- assert(exc.getMessage.contains("There should be at most 2 'WHEN MATCHED'
clauses."))
- }
-
- test("merge into table: at most one not matched clause") {
- val exc = intercept[ParseException] {
- parsePlan(
- """
- |MERGE INTO testcat1.ns1.ns2.tbl AS target
- |USING testcat2.ns1.ns2.tbl AS source
- |ON target.col1 = source.col1
- |WHEN MATCHED AND (target.col2='delete') THEN DELETE
- |WHEN MATCHED AND (target.col2='update1') THEN UPDATE SET
target.col2 = source.col2
- |WHEN NOT MATCHED AND (target.col2='insert1')
- |THEN INSERT (target.col1, target.col2) values (source.col1,
source.col2)
- |WHEN NOT MATCHED AND (target.col2='insert2')
- |THEN INSERT (target.col1, target.col2) values (source.col1,
source.col2)
- """.stripMargin)
- }
-
- assert(exc.getMessage.contains("There should be at most 1 'WHEN NOT
MATCHED' clause."))
+ test("merge into table: multi matched and not matched clauses") {
+ parseCompare(
+ """
+ |MERGE INTO testcat1.ns1.ns2.tbl AS target
+ |USING testcat2.ns1.ns2.tbl AS source
+ |ON target.col1 = source.col1
+ |WHEN MATCHED AND (target.col2='delete') THEN DELETE
+ |WHEN MATCHED AND (target.col2='update to 1') THEN UPDATE SET
target.col2 = 1
+ |WHEN MATCHED AND (target.col2='update to 2') THEN UPDATE SET
target.col2 = 2
+ |WHEN NOT MATCHED AND (target.col2='insert 1')
+ |THEN INSERT (target.col1, target.col2) values (source.col1, 1)
+ |WHEN NOT MATCHED AND (target.col2='insert 2')
+ |THEN INSERT (target.col1, target.col2) values (source.col1, 2)
+ """.stripMargin,
+ MergeIntoTable(
+ SubqueryAlias("target", UnresolvedRelation(Seq("testcat1", "ns1",
"ns2", "tbl"))),
+ SubqueryAlias("source", UnresolvedRelation(Seq("testcat2", "ns1",
"ns2", "tbl"))),
+ EqualTo(UnresolvedAttribute("target.col1"),
UnresolvedAttribute("source.col1")),
+ Seq(DeleteAction(Some(EqualTo(UnresolvedAttribute("target.col2"),
Literal("delete")))),
+ UpdateAction(Some(EqualTo(UnresolvedAttribute("target.col2"),
Literal("update to 1"))),
+ Seq(Assignment(UnresolvedAttribute("target.col2"), Literal(1)))),
+ UpdateAction(Some(EqualTo(UnresolvedAttribute("target.col2"),
Literal("update to 2"))),
+ Seq(Assignment(UnresolvedAttribute("target.col2"), Literal(2))))),
+ Seq(InsertAction(Some(EqualTo(UnresolvedAttribute("target.col2"),
Literal("insert 1"))),
+ Seq(Assignment(UnresolvedAttribute("target.col1"),
UnresolvedAttribute("source.col1")),
+ Assignment(UnresolvedAttribute("target.col2"), Literal(1)))),
+ InsertAction(Some(EqualTo(UnresolvedAttribute("target.col2"),
Literal("insert 2"))),
+ Seq(Assignment(UnresolvedAttribute("target.col1"),
UnresolvedAttribute("source.col1")),
+ Assignment(UnresolvedAttribute("target.col2"), Literal(2)))))))
}
- test("merge into table: the first matched clause must have a condition if
there's a second") {
+ test("merge into table: only the last matched clause can omit the
condition") {
Review comment:
done.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
