Skip to content

[SPARK-32845][SS][TESTS] Add sinkParameter to check sink options robustly in DataStreamReaderWriterSuite #29730

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
dongjoon-hyun wants to merge 1 commit into from
Closed

[SPARK-32845][SS][TESTS] Add sinkParameter to check sink options robustly in DataStreamReaderWriterSuite #29730

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
29 changes: 15 additions & 14 deletions ...core/src/test/scala/org/apache/spark/sql/streaming/test/DataStreamReaderWriterSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ object LastOptions {
var mockStreamSourceProvider = mock(classOf[StreamSourceProvider])
var mockStreamSinkProvider = mock(classOf[StreamSinkProvider])
var parameters: Map[String, String] = null
Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Sep 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I keep this name for the other cases in order to reduce the patch size.

Copy link
Member

@viirya viirya Sep 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about add a comment?

var sinkParameters: Map[String, String] = null
var schema: Option[StructType] = null
var partitionColumns: Seq[String] = Nil

def clear(): Unit = {
parameters = null
sinkParameters = null
schema = null
partitionColumns = null
reset(mockStreamSourceProvider)
Expand Down Expand Up @@ -101,7 +103,7 @@ class DefaultSource extends StreamSourceProvider with StreamSinkProvider {
parameters: Map[String, String],
partitionColumns: Seq[String],
outputMode: OutputMode): Sink = {
LastOptions.parameters = parameters
LastOptions.sinkParameters = parameters
LastOptions.partitionColumns = partitionColumns
LastOptions.mockStreamSinkProvider.createSink(spark, parameters, partitionColumns, outputMode)
(_: Long, _: DataFrame) => {}
Expand Down Expand Up @@ -170,20 +172,19 @@ class DataStreamReaderWriterSuite extends StreamTest with BeforeAndAfter {

LastOptions.clear()

val query = df.writeStream
df.writeStream
.format("org.apache.spark.sql.streaming.test")
.option("opt1", "5")
.options(Map("opt2" -> "4"))
.options(map)
.option("checkpointLocation", newMetadataDir)
.start()
.stop()

assert(LastOptions.parameters("opt1") == "5")
assert(LastOptions.parameters("opt2") == "4")
assert(LastOptions.parameters("opt3") == "3")
assert(LastOptions.parameters.contains("checkpointLocation"))

query.stop()
assert(LastOptions.sinkParameters("opt1") == "5")
assert(LastOptions.sinkParameters("opt2") == "4")
assert(LastOptions.sinkParameters("opt3") == "3")
assert(LastOptions.sinkParameters.contains("checkpointLocation"))
}

test("SPARK-32832: later option should override earlier options for load()") {
Expand All @@ -204,7 +205,7 @@ class DataStreamReaderWriterSuite extends StreamTest with BeforeAndAfter {
.load()
assert(LastOptions.parameters.isEmpty)

val query = ds.writeStream
ds.writeStream
.format("org.apache.spark.sql.streaming.test")
.option("checkpointLocation", newMetadataDir)
.option("paTh", "1")
Expand All @@ -213,8 +214,8 @@ class DataStreamReaderWriterSuite extends StreamTest with BeforeAndAfter {
.option("patH", "4")
.option("path", "5")
.start()
assert(LastOptions.parameters("path") == "5")
query.stop()
.stop()
assert(LastOptions.sinkParameters("path") == "5")
}

test("partitioning") {
Expand Down Expand Up @@ -787,13 +788,13 @@ class DataStreamReaderWriterSuite extends StreamTest with BeforeAndAfter {
withTempDir { checkpointPath =>
withSQLConf(SQLConf.LEGACY_PATH_OPTION_BEHAVIOR.key -> "true",
SQLConf.CHECKPOINT_LOCATION.key -> checkpointPath.getAbsolutePath) {
val query = df.writeStream
df.writeStream
.format("org.apache.spark.sql.streaming.test")
.option("path", "tmp4")
.start("tmp5")
.stop()
// The legacy behavior overwrites the path option.
assert(LastOptions.parameters("path") == "tmp5")
query.stop()
assert(LastOptions.sinkParameters("path") == "tmp5")
}
}
}
Expand Down