fix.

gatorsmile · gatorsmile · commit 5780ef529fcb · 2017-06-05T11:02:41.000-07:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVDataSource.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/CSVDataSource.scala
@@ -112,7 +112,7 @@ abstract class CSVDataSource extends Serializable {
 object CSVDataSource {
   def apply(options: CSVOptions): CSVDataSource = {
     if (options.multiLine) {
-      WholeFileCSVDataSource
+      MultiLineCSVDataSource
     } else {
       TextInputCSVDataSource
     }
@@ -197,7 +197,7 @@ object TextInputCSVDataSource extends CSVDataSource {
   }
 }
 
-object WholeFileCSVDataSource extends CSVDataSource {
+object MultiLineCSVDataSource extends CSVDataSource {
   override val isSplitable: Boolean = false
 
   override def readFile(
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonDataSource.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JsonDataSource.scala
@@ -87,7 +87,7 @@ abstract class JsonDataSource extends Serializable {
 object JsonDataSource {
   def apply(options: JSONOptions): JsonDataSource = {
     if (options.multiLine) {
-      WholeFileJsonDataSource
+      MultiLineJsonDataSource
     } else {
       TextInputJsonDataSource
     }
@@ -147,7 +147,7 @@ object TextInputJsonDataSource extends JsonDataSource {
   }
 }
 
-object WholeFileJsonDataSource extends JsonDataSource {
+object MultiLineJsonDataSource extends JsonDataSource {
   override val isSplitable: Boolean = {
     false
   }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ abstract class CSVDataSource extends Serializable {`
`112`	`112`	`object CSVDataSource {`
`113`	`113`	`def apply(options: CSVOptions): CSVDataSource = {`
`114`	`114`	`if (options.multiLine) {`
`115`		`- WholeFileCSVDataSource`
	`115`	`+ MultiLineCSVDataSource`
`116`	`116`	`} else {`
`117`	`117`	`TextInputCSVDataSource`
`118`	`118`	`}`
`@@ -197,7 +197,7 @@ object TextInputCSVDataSource extends CSVDataSource {`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`
`200`		`-object WholeFileCSVDataSource extends CSVDataSource {`
	`200`	`+object MultiLineCSVDataSource extends CSVDataSource {`
`201`	`201`	`override val isSplitable: Boolean = false`
`202`	`202`
`203`	`203`	`override def readFile(`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ abstract class JsonDataSource extends Serializable {`
`87`	`87`	`object JsonDataSource {`
`88`	`88`	`def apply(options: JSONOptions): JsonDataSource = {`
`89`	`89`	`if (options.multiLine) {`
`90`		`- WholeFileJsonDataSource`
	`90`	`+ MultiLineJsonDataSource`
`91`	`91`	`} else {`
`92`	`92`	`TextInputJsonDataSource`
`93`	`93`	`}`
`@@ -147,7 +147,7 @@ object TextInputJsonDataSource extends JsonDataSource {`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`150`		`-object WholeFileJsonDataSource extends JsonDataSource {`
	`150`	`+object MultiLineJsonDataSource extends JsonDataSource {`
`151`	`151`	`override val isSplitable: Boolean = {`
`152`	`152`	`false`
`153`	`153`	`}`