From 5c6bcdbda4dd23bbd112a7395cd9d1cfd04cf4bb Mon Sep 17 00:00:00 2001 From: Tathagata Das Date: Tue, 6 Dec 2016 21:51:38 -0800 Subject: [SPARK-18671][SS][TEST-MAVEN] Follow up PR to fix test for Maven ## What changes were proposed in this pull request? Maven compilation seem to not allow resource is sql/test to be easily referred to in kafka-0-10-sql tests. So moved the kafka-source-offset-version-2.1.0 from sql test resources to kafka-0-10-sql test resources. ## How was this patch tested? Manually ran maven test Author: Tathagata Das Closes #16183 from tdas/SPARK-18671-1. --- .../src/test/resources/kafka-source-offset-version-2.1.0.txt | 1 + .../scala/org/apache/spark/sql/kafka010/KafkaSourceOffsetSuite.scala | 3 ++- .../structured-streaming/kafka-source-offset-version-2.1.0.txt | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 external/kafka-0-10-sql/src/test/resources/kafka-source-offset-version-2.1.0.txt delete mode 100644 sql/core/src/test/resources/structured-streaming/kafka-source-offset-version-2.1.0.txt diff --git a/external/kafka-0-10-sql/src/test/resources/kafka-source-offset-version-2.1.0.txt b/external/kafka-0-10-sql/src/test/resources/kafka-source-offset-version-2.1.0.txt new file mode 100644 index 0000000000..6410031743 --- /dev/null +++ b/external/kafka-0-10-sql/src/test/resources/kafka-source-offset-version-2.1.0.txt @@ -0,0 +1 @@ +{"topic1":{"0":456,"1":789},"topic2":{"0":0}} diff --git a/external/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaSourceOffsetSuite.scala b/external/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaSourceOffsetSuite.scala index c8326ffcc7..22668fd6fa 100644 --- a/external/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaSourceOffsetSuite.scala +++ b/external/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaSourceOffsetSuite.scala @@ -98,7 +98,8 @@ class KafkaSourceOffsetSuite extends OffsetSuite with SharedSQLContext { private def readFromResource(file: String): SerializedOffset = { import scala.io.Source - val str = Source.fromFile(getClass.getResource(s"/structured-streaming/$file").toURI).mkString + val input = getClass.getResource(s"/$file").toURI + val str = Source.fromFile(input).mkString SerializedOffset(str) } } diff --git a/sql/core/src/test/resources/structured-streaming/kafka-source-offset-version-2.1.0.txt b/sql/core/src/test/resources/structured-streaming/kafka-source-offset-version-2.1.0.txt deleted file mode 100644 index 6410031743..0000000000 --- a/sql/core/src/test/resources/structured-streaming/kafka-source-offset-version-2.1.0.txt +++ /dev/null @@ -1 +0,0 @@ -{"topic1":{"0":456,"1":789},"topic2":{"0":0}} -- cgit v1.2.3