aboutsummaryrefslogtreecommitdiff
path: root/sql/catalyst
diff options
context:
space:
mode:
authorCheng Lian <lian@databricks.com>2016-01-30 23:02:49 -0800
committerReynold Xin <rxin@databricks.com>2016-01-30 23:02:49 -0800
commita1303de0a0e9d0c80327977abf52a79e2aa95e1f (patch)
tree4e4af212fd658a4f91ba8205d631d26462bb1775 /sql/catalyst
parentde283719980ae78b740e507e4d70c7ebbf6c5f74 (diff)
downloadspark-a1303de0a0e9d0c80327977abf52a79e2aa95e1f.tar.gz
spark-a1303de0a0e9d0c80327977abf52a79e2aa95e1f.tar.bz2
spark-a1303de0a0e9d0c80327977abf52a79e2aa95e1f.zip
[SPARK-13070][SQL] Better error message when Parquet schema merging fails
Make sure we throw better error messages when Parquet schema merging fails. Author: Cheng Lian <lian@databricks.com> Author: Liang-Chi Hsieh <viirya@gmail.com> Closes #10979 from viirya/schema-merging-failure-message.
Diffstat (limited to 'sql/catalyst')
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala
index da0c92864e..c9e7e7fe63 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/StructType.scala
@@ -424,13 +424,13 @@ object StructType extends AbstractDataType {
if ((leftPrecision == rightPrecision) && (leftScale == rightScale)) {
DecimalType(leftPrecision, leftScale)
} else if ((leftPrecision != rightPrecision) && (leftScale != rightScale)) {
- throw new SparkException("Failed to merge Decimal Tpes with incompatible " +
+ throw new SparkException("Failed to merge decimal types with incompatible " +
s"precision $leftPrecision and $rightPrecision & scale $leftScale and $rightScale")
} else if (leftPrecision != rightPrecision) {
- throw new SparkException("Failed to merge Decimal Tpes with incompatible " +
+ throw new SparkException("Failed to merge decimal types with incompatible " +
s"precision $leftPrecision and $rightPrecision")
} else {
- throw new SparkException("Failed to merge Decimal Tpes with incompatible " +
+ throw new SparkException("Failed to merge decimal types with incompatible " +
s"scala $leftScale and $rightScale")
}