Github user zsxwing commented on a diff in the pull request:
https://github.com/apache/spark/pull/12592#discussion_r60793404
--- Diff:
sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSourceSuite.scala
---
@@ -205,165 +262,139 @@ class FileStreamSourceSuite extends
FileStreamSourceTest with SharedSQLContext {
}
test("read from text files") {
- val src = Utils.createTempDir(namePrefix = "streaming.src")
- val tmp = Utils.createTempDir(namePrefix = "streaming.tmp")
-
- val textSource = createFileStreamSource("text", src.getCanonicalPath)
- val filtered = textSource.toDF().filter($"value" contains "keep")
-
- testStream(filtered)(
- AddTextFileData(textSource, "drop1\nkeep2\nkeep3", src, tmp),
- CheckAnswer("keep2", "keep3"),
- StopStream,
- AddTextFileData(textSource, "drop4\nkeep5\nkeep6", src, tmp),
- StartStream,
- CheckAnswer("keep2", "keep3", "keep5", "keep6"),
- AddTextFileData(textSource, "drop7\nkeep8\nkeep9", src, tmp),
- CheckAnswer("keep2", "keep3", "keep5", "keep6", "keep8", "keep9")
- )
-
- Utils.deleteRecursively(src)
- Utils.deleteRecursively(tmp)
+ withTempDirs { case (src, tmp) =>
+ val textStream = createFileStream("text", src.getCanonicalPath)
+ val filtered = textStream.filter($"value" contains "keep")
+
+ testStream(filtered)(
+ AddTextFileData("drop1\nkeep2\nkeep3", src, tmp),
+ CheckAnswer("keep2", "keep3"),
+ StopStream,
+ AddTextFileData("drop4\nkeep5\nkeep6", src, tmp),
+ StartStream,
+ CheckAnswer("keep2", "keep3", "keep5", "keep6"),
+ AddTextFileData("drop7\nkeep8\nkeep9", src, tmp),
+ CheckAnswer("keep2", "keep3", "keep5", "keep6", "keep8", "keep9")
+ )
+ }
}
test("read from json files") {
- val src = Utils.createTempDir(namePrefix = "streaming.src")
- val tmp = Utils.createTempDir(namePrefix = "streaming.tmp")
-
- val textSource = createFileStreamSource("json", src.getCanonicalPath,
Some(valueSchema))
- val filtered = textSource.toDF().filter($"value" contains "keep")
-
- testStream(filtered)(
- AddTextFileData(
- textSource,
- "{'value': 'drop1'}\n{'value': 'keep2'}\n{'value': 'keep3'}",
- src,
- tmp),
- CheckAnswer("keep2", "keep3"),
- StopStream,
- AddTextFileData(
- textSource,
- "{'value': 'drop4'}\n{'value': 'keep5'}\n{'value': 'keep6'}",
- src,
- tmp),
- StartStream,
- CheckAnswer("keep2", "keep3", "keep5", "keep6"),
- AddTextFileData(
- textSource,
- "{'value': 'drop7'}\n{'value': 'keep8'}\n{'value': 'keep9'}",
- src,
- tmp),
- CheckAnswer("keep2", "keep3", "keep5", "keep6", "keep8", "keep9")
- )
-
- Utils.deleteRecursively(src)
- Utils.deleteRecursively(tmp)
+ withTempDirs { case (src, tmp) =>
+ val fileStream = createFileStream("json", src.getCanonicalPath,
Some(valueSchema))
+ val filtered = fileStream.filter($"value" contains "keep")
+
+ testStream(filtered)(
+ AddTextFileData(
+ "{'value': 'drop1'}\n{'value': 'keep2'}\n{'value': 'keep3'}",
+ src,
+ tmp),
+ CheckAnswer("keep2", "keep3"),
+ StopStream,
+ AddTextFileData(
+ "{'value': 'drop4'}\n{'value': 'keep5'}\n{'value': 'keep6'}",
+ src,
+ tmp),
+ StartStream,
+ CheckAnswer("keep2", "keep3", "keep5", "keep6"),
+ AddTextFileData(
+ "{'value': 'drop7'}\n{'value': 'keep8'}\n{'value': 'keep9'}",
+ src,
+ tmp),
+ CheckAnswer("keep2", "keep3", "keep5", "keep6", "keep8", "keep9")
+ )
+ }
}
test("read from json files with inferring schema") {
- val src = Utils.createTempDir(namePrefix = "streaming.src")
- val tmp = Utils.createTempDir(namePrefix = "streaming.tmp")
-
- // Add a file so that we can infer its schema
- stringToFile(new File(src, "existing"), "{'c': 'drop1'}\n{'c':
'keep2'}\n{'c': 'keep3'}")
+ withTempDirs { case (src, tmp) =>
- val textSource = createFileStreamSource("json", src.getCanonicalPath)
+ // Add a file so that we can infer its schema
+ stringToFile(new File(src, "existing"), "{'c': 'drop1'}\n{'c':
'keep2'}\n{'c': 'keep3'}")
- // FileStreamSource should infer the column "c"
- val filtered = textSource.toDF().filter($"c" contains "keep")
+ val fileStream = createFileStream("json", src.getCanonicalPath)
+ require(fileStream.schema === StructType(Seq(StructField("c",
StringType))))
--- End diff --
nit: require -> assert
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
