Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-6777] [SQL] Implements backwards compatibility rules in CatalystSchemaConverter #6617

Closed
wants to merge 11 commits into from
Closed

[SPARK-6777] [SQL] Implements backwards compatibility rules in CatalystSchemaConverter #6617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cceaf3f
Implements backwards compatibility rules in CatalystSchemaConverter
liancheng Jun 3, 2015
b10c322
Replaces require() with analysisRequire() which throws AnalysisException
liancheng Jun 3, 2015
28ef95b
More AnalysisExceptions
liancheng Jun 3, 2015
81de5b0
Fixes UDT, workaround read path, and add tests
liancheng Jun 5, 2015
13cb8d5
Fixes MiMa failure
liancheng Jun 5, 2015
ba84f4b
Fixes MapType schema conversion bug
liancheng Jun 8, 2015
1f71d8d
Adds feature flag to allow falling back to old style Parquet schema c…
liancheng Jun 10, 2015
a104a9e
Fixes Scala style issue
liancheng Jun 11, 2015
743730f
Decimal scale shouldn't be larger than precision
liancheng Jun 12, 2015
b60979b
Adds a constructor which accepts a Configuration, and fixes default v…
liancheng Jun 24, 2015
2a2062d
Don't convert decimals without precision information
liancheng Jun 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion project/MimaExcludes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,12 @@ object MimaExcludes {
ProblemFilters.exclude[MissingClassProblem](
"org.apache.spark.sql.parquet.CatalystTimestampConverter"),
ProblemFilters.exclude[MissingClassProblem](
"org.apache.spark.sql.parquet.CatalystTimestampConverter$")
"org.apache.spark.sql.parquet.CatalystTimestampConverter$"),
// SPARK-6777 Implements backwards compatibility rules in CatalystSchemaConverter
ProblemFilters.exclude[MissingClassProblem](
"org.apache.spark.sql.parquet.ParquetTypeInfo"),
ProblemFilters.exclude[MissingClassProblem](
"org.apache.spark.sql.parquet.ParquetTypeInfo$")
)
case v if v.startsWith("1.4") =>
Seq(
Expand Down
9 changes: 7 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/types/DecimalType.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,18 @@ package org.apache.spark.sql.types
import scala.reflect.runtime.universe.typeTag

import org.apache.spark.annotation.DeveloperApi
import org.apache.spark.sql.AnalysisException
import org.apache.spark.sql.catalyst.ScalaReflectionLock
import org.apache.spark.sql.catalyst.expressions.Expression


/** Precision parameters for a Decimal */
case class PrecisionInfo(precision: Int, scale: Int)

case class PrecisionInfo(precision: Int, scale: Int) {
if (scale > precision) {
throw new AnalysisException(
s"Decimal scale ($scale) cannot be greater than precision ($precision).")
}
}

/**
* :: DeveloperApi ::
Expand Down
14 changes: 14 additions & 0 deletions sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,14 @@ private[spark] object SQLConf {
defaultValue = Some(true),
doc = "<TODO>")

val PARQUET_FOLLOW_PARQUET_FORMAT_SPEC = booleanConf(
key = "spark.sql.parquet.followParquetFormatSpec",
defaultValue = Some(false),
doc = "Wether to stick to Parquet format specification when converting Parquet schema to " +
"Spark SQL schema and vice versa. Sticks to the specification if set to true; falls back " +
"to compatible mode if set to false.",
isPublic = false)

val PARQUET_OUTPUT_COMMITTER_CLASS = stringConf(
key = "spark.sql.parquet.output.committer.class",
defaultValue = Some(classOf[ParquetOutputCommitter].getName),
Expand Down Expand Up @@ -498,6 +506,12 @@ private[sql] class SQLConf extends Serializable with CatalystConf {
*/
private[spark] def isParquetINT96AsTimestamp: Boolean = getConf(PARQUET_INT96_AS_TIMESTAMP)

/**
* When set to true, sticks to Parquet format spec when converting Parquet schema to Spark SQL
* schema and vice versa. Otherwise, falls back to compatible mode.
*/
private[spark] def followParquetFormatSpec: Boolean = getConf(PARQUET_FOLLOW_PARQUET_FORMAT_SPEC)

/**
* When set to true, partition pruning for in-memory columnar tables is enabled.
*/
Expand Down
Loading