Improves error message when conflicting partition columns are found

avulanov · Jun 23, 2015 · a935eb8 · a935eb8
1 parent d96d7b5
commit a935eb8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/sources/PartitioningUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/sources/PartitioningUtils.scala
@@ -189,8 +189,13 @@ private[sql] object PartitioningUtils {
       Seq.empty
     } else {
       assert(distinctPartitionsColNames.size == 1, {
-        val list = distinctPartitionsColNames.mkString("\t", "\n\t", "")
-        s"Conflicting partition column names detected:\n$list"
+        val list = distinctPartitionsColNames.map(_.mkString(", ")).zipWithIndex.map {
+          case (names, index) =>
+            s"\tPartition column name list #$index: $names"
+        }
+
+        s"Conflicting partition column names detected:\n${list.mkString("\n")}\n" +
+          "For partitioned table directories, data files should only live in leaf directories."
       })
 
       // Resolves possible type conflicts for each column