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/03/15 07:23:08 UTC
spark git commit: [SPARK-13870][SQL] Add scalastyle escaping
correctly in CVSSuite.scala
Repository: spark
Updated Branches:
refs/heads/master 43304b175 -> a51f877b5
[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 <do...@apache.org>
Closes #11700 from dongjoon-hyun/SPARK-13870.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a51f877b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a51f877b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a51f877b
Branch: refs/heads/master
Commit: a51f877b5dc56b7bb9ef95044a50024c6b64718e
Parents: 43304b1
Author: Dongjoon Hyun <do...@apache.org>
Authored: Mon Mar 14 23:23:05 2016 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Mon Mar 14 23:23:05 2016 -0700
----------------------------------------------------------------------
.../apache/spark/sql/execution/datasources/csv/CSVSuite.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/a51f877b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVSuite.scala
----------------------------------------------------------------------
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 680759d..58d9d69 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)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org