Skip to content

[SPARK-14741][SQL] Fixed error in reading json file stream inside a partitioned directory #12517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tdas wants to merge 1 commit into from
Closed

[SPARK-14741][SQL] Fixed error in reading json file stream inside a partitioned directory #12517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ case class DataSource(
userSpecifiedSchema = Some(dataSchema),
className = className,
options =
new CaseInsensitiveMap(options.filterKeys(_ != "path"))).resolveRelation()))
new CaseInsensitiveMap(
options.filterKeys(_ != "path") + ("basePath" -> path))).resolveRelation()))
}

new FileStreamSource(
Expand Down
24 changes: 24 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSourceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,30 @@ class FileStreamSourceSuite extends FileStreamSourceTest with SharedSQLContext {
Utils.deleteRecursively(tmp)
}


test("reading from json files inside partitioned directory") {
val src = {
val base = Utils.createTempDir(namePrefix = "streaming.src")
new File(base, "type=X")
}
val tmp = Utils.createTempDir(namePrefix = "streaming.tmp")
src.mkdirs()


// Add a file so that we can infer its schema
stringToFile(new File(src, "existing"), "{'c': 'drop1'}\n{'c': 'keep2'}\n{'c': 'keep3'}")

val textSource = createFileStreamSource("json", src.getCanonicalPath)

// FileStreamSource should infer the column "c"
val filtered = textSource.toDF().filter($"c" contains "keep")

testStream(filtered)(
AddTextFileData(textSource, "{'c': 'drop4'}\n{'c': 'keep5'}\n{'c': 'keep6'}", src, tmp),
CheckAnswer("keep2", "keep3", "keep5", "keep6")
)
}

test("read from parquet files") {
val src = Utils.createTempDir(namePrefix = "streaming.src")
val tmp = Utils.createTempDir(namePrefix = "streaming.tmp")
Expand Down