Skip to content
Snippets Groups Projects
Commit 07b314a5 authored by Jacek Laskowski's avatar Jacek Laskowski Committed by Reynold Xin
Browse files

[MINOR] Fix for BUILD FAILURE for Scala 2.11

It was introduced in 917d3fc0

/cc cloud-fan rxin

Author: Jacek Laskowski <jacek@japila.pl>

Closes #10636 from jaceklaskowski/fix-for-build-failure-2.11.
parent f194d991
No related branches found
No related tags found
No related merge requests found
...@@ -68,29 +68,12 @@ private[sql] class JSONRelation( ...@@ -68,29 +68,12 @@ private[sql] class JSONRelation(
val maybeDataSchema: Option[StructType], val maybeDataSchema: Option[StructType],
val maybePartitionSpec: Option[PartitionSpec], val maybePartitionSpec: Option[PartitionSpec],
override val userDefinedPartitionColumns: Option[StructType], override val userDefinedPartitionColumns: Option[StructType],
override val bucketSpec: Option[BucketSpec], override val bucketSpec: Option[BucketSpec] = None,
override val paths: Array[String] = Array.empty[String], override val paths: Array[String] = Array.empty[String],
parameters: Map[String, String] = Map.empty[String, String]) parameters: Map[String, String] = Map.empty[String, String])
(@transient val sqlContext: SQLContext) (@transient val sqlContext: SQLContext)
extends HadoopFsRelation(maybePartitionSpec, parameters) { 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) val options: JSONOptions = JSONOptions.createFromConfigMap(parameters)
/** Constraints to be imposed on schema to be stored. */ /** Constraints to be imposed on schema to be stored. */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment