From a935eb81f0e6cfe95d7b5ffd8edf9308dacd7f4d Mon Sep 17 00:00:00 2001 From: Cheng Lian Date: Wed, 3 Jun 2015 17:50:39 +0800 Subject: [PATCH] Improves error message when conflicting partition columns are found --- .../org/apache/spark/sql/sources/PartitioningUtils.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 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 index c6f535dde7676..2972c6142ce05 100644 --- 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