From a51f877b5dc56b7bb9ef95044a50024c6b64718e Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Mon, 14 Mar 2016 23:23:05 -0700 Subject: [SPARK-13870][SQL] Add scalastyle escaping correctly in CVSSuite.scala ## What changes were proposed in this pull request? When initial creating `CVSSuite.scala` in SPARK-12833, there was a typo on `scalastyle:on`: `scalstyle:on`. So, it turns off ScalaStyle checking for the rest of the file mistakenly. So, it can not find a violation on the code of `SPARK-12668` added recently. This issue fixes the existing escaping correctly and adds a new escaping for `SPARK-12668` code like the following. ```scala test("test aliases sep and encoding for delimiter and charset") { + // scalastyle:off val cars = sqlContext ... .load(testFile(carsFile8859)) + // scalastyle:on ``` This will prevent future potential problems, too. ## How was this patch tested? Pass the Jenkins test. Author: Dongjoon Hyun Closes #11700 from dongjoon-hyun/SPARK-13870. --- .../org/apache/spark/sql/execution/datasources/csv/CSVSuite.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sql/core/src') diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVSuite.scala index 680759d457..58d9d69d9a 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVSuite.scala @@ -160,12 +160,13 @@ class CSVSuite extends QueryTest with SharedSQLContext with SQLTestUtils { |OPTIONS (path "${testFile(carsFile8859)}", header "true", |charset "iso-8859-1", delimiter "þ") """.stripMargin.replaceAll("\n", " ")) - //scalstyle:on + // scalastyle:on verifyCars(sqlContext.table("carsTable"), withHeader = true) } test("test aliases sep and encoding for delimiter and charset") { + // scalastyle:off val cars = sqlContext .read .format("csv") @@ -173,6 +174,7 @@ class CSVSuite extends QueryTest with SharedSQLContext with SQLTestUtils { .option("encoding", "iso-8859-1") .option("sep", "þ") .load(testFile(carsFile8859)) + // scalastyle:on verifyCars(cars, withHeader = true) } -- cgit v1.2.3