From 3750c6e9b580be0f2e25f691a1fd582f1b7e430a Mon Sep 17 00:00:00 2001
From: Tathagata Das <tathagata.das1565@gmail.com>
Date: Tue, 6 Dec 2016 21:51:38 -0800
Subject: [PATCH] [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 <tathagata.das1565@gmail.com>
Closes #16183 from tdas/SPARK-18671-1.
(cherry picked from commit 5c6bcdbda4dd23bbd112a7395cd9d1cfd04cf4bb)
Signed-off-by: Tathagata Das <tathagata.das1565@gmail.com>
---
.../src/test/resources}/kafka-source-offset-version-2.1.0.txt | 0
.../org/apache/spark/sql/kafka010/KafkaSourceOffsetSuite.scala | 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
rename {sql/core/src/test/resources/structured-streaming => external/kafka-0-10-sql/src/test/resources}/kafka-source-offset-version-2.1.0.txt (100%)
diff --git a/sql/core/src/test/resources/structured-streaming/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
similarity index 100%
rename from sql/core/src/test/resources/structured-streaming/kafka-source-offset-version-2.1.0.txt
rename to external/kafka-0-10-sql/src/test/resources/kafka-source-offset-version-2.1.0.txt
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)
}
}
--
GitLab