merged in changes

Author: Joseph Batchik

sql/core/src/main/scala/org/apache/spark/sql/json/JSONRelation.scala

@@ -42,24 +42,24 @@ private[sql] class DefaultSource extends HadoopFsRelationProvider with DataSourc
   def format(): String = "json"
 
   override def createRelation(
-                               sqlContext: SQLContext,
-                               paths: Array[String],
-                               dataSchema: Option[StructType],
-                               partitionColumns: Option[StructType],
-                               parameters: Map[String, String]): HadoopFsRelation = {
+      sqlContext: SQLContext,
+      paths: Array[String],
+      dataSchema: Option[StructType],
+      partitionColumns: Option[StructType],
+      parameters: Map[String, String]): HadoopFsRelation = {
     val samplingRatio = parameters.get("samplingRatio").map(_.toDouble).getOrElse(1.0)
 
     new JSONRelation(None, samplingRatio, dataSchema, None, partitionColumns, paths)(sqlContext)
   }
 }
 
 private[sql] class JSONRelation(
-                                 val inputRDD: Option[RDD[String]],
-                                 val samplingRatio: Double,
-                                 val maybeDataSchema: Option[StructType],
-                                 val maybePartitionSpec: Option[PartitionSpec],
-                                 override val userDefinedPartitionColumns: Option[StructType],
-                                 override val paths: Array[String] = Array.empty[String])(@transient val sqlContext: SQLContext)
+    val inputRDD: Option[RDD[String]],
+    val samplingRatio: Double,
+    val maybeDataSchema: Option[StructType],
+    val maybePartitionSpec: Option[PartitionSpec],
+    override val userDefinedPartitionColumns: Option[StructType],
+    override val paths: Array[String] = Array.empty[String])(@transient val sqlContext: SQLContext)
   extends HadoopFsRelation(maybePartitionSpec) {
 
   /** Constraints to be imposed on schema to be stored. */
@@ -109,9 +109,9 @@ private[sql] class JSONRelation(
   }
 
   override def buildScan(
-                          requiredColumns: Array[String],
-                          filters: Array[Filter],
-                          inputPaths: Array[FileStatus]): RDD[Row] = {
+      requiredColumns: Array[String],
+      filters: Array[Filter],
+      inputPaths: Array[FileStatus]): RDD[Row] = {
     JacksonParser(
       inputRDD.getOrElse(createBaseRdd(inputPaths)),
       StructType(requiredColumns.map(dataSchema(_))),
@@ -142,19 +142,19 @@ private[sql] class JSONRelation(
   override def prepareJobForWrite(job: Job): OutputWriterFactory = {
     new OutputWriterFactory {
       override def newInstance(
-                                path: String,
-                                dataSchema: StructType,
-                                context: TaskAttemptContext): OutputWriter = {
+          path: String,
+          dataSchema: StructType,
+          context: TaskAttemptContext): OutputWriter = {
         new JsonOutputWriter(path, dataSchema, context)
       }
     }
   }
 }
 
 private[json] class JsonOutputWriter(
-                                      path: String,
-                                      dataSchema: StructType,
-                                      context: TaskAttemptContext)
+    path: String,
+    dataSchema: StructType,
+    context: TaskAttemptContext)
   extends OutputWriterInternal with SparkHadoopMapRedUtil with Logging {
 
   val writer = new CharArrayWriter()
@@ -187,4 +187,4 @@ private[json] class JsonOutputWriter(
     gen.close()
     recordWriter.close(context)
   }
-}
+}

sql/hive/src/test/scala/org/apache/spark/sql/sources/SimpleTextRelation.scala

@@ -37,8 +37,6 @@ import org.apache.spark.sql.{Row, SQLContext}
  */
 class SimpleTextSource extends HadoopFsRelationProvider {
 
-  override def format(): String = "simple text source"
-
   override def createRelation(
       sqlContext: SQLContext,
       paths: Array[String],
@@ -138,8 +136,6 @@ class SimpleTextRelation(
  */
 class CommitFailureTestSource extends HadoopFsRelationProvider {
 
-  override def format(): String = "commit failure test"
-
   override def createRelation(
       sqlContext: SQLContext,
       paths: Array[String],