From 8449d6689e763b7e33c1d3d83429f24d55705def Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Tue, 16 Jul 2019 17:33:41 -0700 Subject: [PATCH] Update error message to fix failing test. --- .../org/apache/spark/sql/catalyst/parser/AstBuilder.scala | 2 +- .../src/test/scala/org/apache/spark/sql/hive/InsertSuite.scala | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala index c49e2f3d1513e..7d1ff153aef2b 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala @@ -316,7 +316,7 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging val dynamicPartitionKeys: Map[String, Option[String]] = partitionKeys.filter(_._2.isEmpty) if (ctx.EXISTS != null && dynamicPartitionKeys.nonEmpty) { operationNotAllowed("IF NOT EXISTS with dynamic partitions: " + - dynamicPartitionKeys.keys.mkString(","), ctx) + dynamicPartitionKeys.keys.mkString(", "), ctx) } (tableIdent, partitionKeys, ctx.EXISTS() != null) diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/InsertSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/InsertSuite.scala index 70307ed7e830e..73f5bbd88624e 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/InsertSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/InsertSuite.scala @@ -201,8 +201,7 @@ class InsertSuite extends QueryTest with TestHiveSingleton with BeforeAndAfter |SELECT 7, 8, 3 """.stripMargin) } - assert(e.getMessage.contains( - "Dynamic partitions do not support IF NOT EXISTS. Specified partitions with value: [c]")) + assert(e.getMessage.contains("IF NOT EXISTS with dynamic partitions: c")) // If the partition already exists, the insert will overwrite the data // unless users specify IF NOT EXISTS