You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2016/01/07 19:39:49 UTC
spark git commit: [MINOR] Fix for BUILD FAILURE for Scala 2.11
Repository: spark
Updated Branches:
refs/heads/master f194d9911 -> 07b314a57
[MINOR] Fix for BUILD FAILURE for Scala 2.11
It was introduced in 917d3fc069fb9ea1c1487119c9c12b373f4f9b77
/cc cloud-fan rxin
Author: Jacek Laskowski <ja...@japila.pl>
Closes #10636 from jaceklaskowski/fix-for-build-failure-2.11.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/07b314a5
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/07b314a5
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/07b314a5
Branch: refs/heads/master
Commit: 07b314a57a638a232ee0b5cd14169e57d742f0f9
Parents: f194d99
Author: Jacek Laskowski <ja...@japila.pl>
Authored: Thu Jan 7 10:39:46 2016 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Thu Jan 7 10:39:46 2016 -0800
----------------------------------------------------------------------
.../datasources/json/JSONRelation.scala | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/07b314a5/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JSONRelation.scala
----------------------------------------------------------------------
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 b92edf6..8a6fa4a 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. */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org