From fb5a607948fc26e2d8d01d83b8963bdd4b22ef9e Mon Sep 17 00:00:00 2001 From: Cheng Lian Date: Fri, 24 Apr 2015 00:30:41 +0800 Subject: [PATCH] Fixes compilation error --- .../org/apache/spark/sql/sources/interfaces.scala | 4 ++-- .../spark/sql/sources/FSBasedRelationSuite.scala | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/sources/interfaces.scala b/sql/core/src/main/scala/org/apache/spark/sql/sources/interfaces.scala index ebd7567f4f836..094ccefd8c832 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/sources/interfaces.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/sources/interfaces.scala @@ -314,7 +314,7 @@ abstract class FSBasedRelation extends BaseRelation { def dataSchema: StructType /** - * Builds an `RDD[Row` containing all rows within this relation. + * Builds an `RDD[Row]` containing all rows within this relation. * * @param inputPaths Data files to be read. If the underlying relation is partitioned, only data * files within required partition directories are included. @@ -325,7 +325,7 @@ abstract class FSBasedRelation extends BaseRelation { } /** - * Builds an `RDD[Row` containing all rows within this relation. + * Builds an `RDD[Row]` containing all rows within this relation. * * @param requiredColumns Required columns. * @param inputPaths Data files to be read. If the underlying relation is partitioned, only data diff --git a/sql/core/src/test/scala/org/apache/spark/sql/sources/FSBasedRelationSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/sources/FSBasedRelationSuite.scala index 442d18c2d084c..55800af8f9bc9 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/sources/FSBasedRelationSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/sources/FSBasedRelationSuite.scala @@ -41,15 +41,15 @@ case class SimpleFSBasedRelation (val sqlContext: SQLContext) extends FSBasedRelation { + class SimpleOutputWriter extends OutputWriter { + override def write(row: Row): Unit = TestResult.writtenRows += row + } + override val path = parameter("path") override def dataSchema: StructType = DataType.fromJson(parameter("schema")).asInstanceOf[StructType] - override def newOutputWriter(path: String): OutputWriter = new OutputWriter { - override def write(row: Row): Unit = TestResult.writtenRows += row - } - override def buildScan( requiredColumns: Array[String], filters: Array[Filter], @@ -67,6 +67,8 @@ case class SimpleFSBasedRelation Option(TestResult.rowsToRead).getOrElse(sqlContext.emptyResult) } + + override def outputWriterClass: Class[_ <: OutputWriter] = classOf[SimpleOutputWriter] } object TestResult {