aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Laskowski <jacek@japila.pl>2016-01-07 10:39:46 -0800
committerReynold Xin <rxin@databricks.com>2016-01-07 10:39:46 -0800
commit07b314a57a638a232ee0b5cd14169e57d742f0f9 (patch)
treea956eee5181f8f06aa958c18b381798a8d3b7990
parentf194d9911a93fc3a78be820096d4836f22d09976 (diff)
downloadspark-07b314a57a638a232ee0b5cd14169e57d742f0f9.tar.gz
spark-07b314a57a638a232ee0b5cd14169e57d742f0f9.tar.bz2
spark-07b314a57a638a232ee0b5cd14169e57d742f0f9.zip
[MINOR] Fix for BUILD FAILURE for Scala 2.11
It was introduced in 917d3fc069fb9ea1c1487119c9c12b373f4f9b77 /cc cloud-fan rxin Author: Jacek Laskowski <jacek@japila.pl> Closes #10636 from jaceklaskowski/fix-for-build-failure-2.11.
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JSONRelation.scala19
1 files changed, 1 insertions, 18 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JSONRelation.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JSONRelation.scala
index b92edf65bf..8a6fa4aeeb 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JSONRelation.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JSONRelation.scala
@@ -68,29 +68,12 @@ private[sql] class JSONRelation(
val maybeDataSchema: Option[StructType],
val maybePartitionSpec: Option[PartitionSpec],
override val userDefinedPartitionColumns: Option[StructType],
- override val bucketSpec: Option[BucketSpec],
+ override val bucketSpec: Option[BucketSpec] = None,
override val paths: Array[String] = Array.empty[String],
parameters: Map[String, String] = Map.empty[String, String])
(@transient val sqlContext: SQLContext)
extends HadoopFsRelation(maybePartitionSpec, parameters) {
- def this(
- inputRDD: Option[RDD[String]],
- maybeDataSchema: Option[StructType],
- maybePartitionSpec: Option[PartitionSpec],
- userDefinedPartitionColumns: Option[StructType],
- paths: Array[String] = Array.empty[String],
- parameters: Map[String, String] = Map.empty[String, String])(sqlContext: SQLContext) = {
- this(
- inputRDD,
- maybeDataSchema,
- maybePartitionSpec,
- userDefinedPartitionColumns,
- None,
- paths,
- parameters)(sqlContext)
- }
-
val options: JSONOptions = JSONOptions.createFromConfigMap(parameters)
/** Constraints to be imposed on schema to be stored. */