Repository: spark Updated Branches: refs/heads/master 513266c04 -> 0bb73554a
Fix typo disvoered => discovered Author: Julien Baley <julien.ba...@gmail.com> Closes #10773 from julienbaley/patch-1. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0bb73554 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0bb73554 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0bb73554 Branch: refs/heads/master Commit: 0bb73554a96088adca9dcd62a5a37b13772b02d8 Parents: 513266c Author: Julien Baley <julien.ba...@gmail.com> Authored: Fri Jan 15 13:53:20 2016 -0800 Committer: Reynold Xin <r...@databricks.com> Committed: Fri Jan 15 13:53:20 2016 -0800 ---------------------------------------------------------------------- .../spark/sql/execution/datasources/PartitioningUtils.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/0bb73554/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/PartitioningUtils.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/PartitioningUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/PartitioningUtils.scala index 81962f8..65a715c 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/PartitioningUtils.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/PartitioningUtils.scala @@ -102,11 +102,11 @@ private[sql] object PartitioningUtils { // It will be recognised as conflicting directory structure: // "hdfs://host:9000/invalidPath" // "hdfs://host:9000/path" - val disvoeredBasePaths = optDiscoveredBasePaths.flatMap(x => x) + val discoveredBasePaths = optDiscoveredBasePaths.flatMap(x => x) assert( - disvoeredBasePaths.distinct.size == 1, + discoveredBasePaths.distinct.size == 1, "Conflicting directory structures detected. Suspicious paths:\b" + - disvoeredBasePaths.distinct.mkString("\n\t", "\n\t", "\n\n") + + discoveredBasePaths.distinct.mkString("\n\t", "\n\t", "\n\n") + "If provided paths are partition directories, please set " + "\"basePath\" in the options of the data source to specify the " + "root directory of the table. If there are multiple root directories, " + --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org