Github user zsxwing commented on a diff in the pull request:
https://github.com/apache/spark/pull/17216#discussion_r106709791
--- Diff:
sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/OffsetSeqLogSuite.scala
---
@@ -29,12 +30,32 @@ class OffsetSeqLogSuite extends SparkFunSuite with
SharedSQLContext {
case class StringOffset(override val json: String) extends Offset
test("OffsetSeqMetadata - deserialization") {
- assert(OffsetSeqMetadata(0, 0) === OffsetSeqMetadata("""{}"""))
- assert(OffsetSeqMetadata(1, 0) ===
OffsetSeqMetadata("""{"batchWatermarkMs":1}"""))
- assert(OffsetSeqMetadata(0, 2) ===
OffsetSeqMetadata("""{"batchTimestampMs":2}"""))
- assert(
- OffsetSeqMetadata(1, 2) ===
-
OffsetSeqMetadata("""{"batchWatermarkMs":1,"batchTimestampMs":2}"""))
+ val key = SQLConf.SHUFFLE_PARTITIONS.key
+
+ def getConfWith(shufflePartitions: Int): Map[String, String] = {
+ Map(key -> shufflePartitions.toString)
+ }
+
+ // None set
+ assert(OffsetSeqMetadata(0, 0, Map.empty) ===
OffsetSeqMetadata("""{}"""))
+
+ // One set
+ assert(OffsetSeqMetadata(1, 0, Map.empty) ===
OffsetSeqMetadata("""{"batchWatermarkMs":1}"""))
+ assert(OffsetSeqMetadata(0, 2, Map.empty) ===
OffsetSeqMetadata("""{"batchTimestampMs":2}"""))
+ assert(OffsetSeqMetadata(0, 0, getConfWith(shufflePartitions = 2)) ===
+ OffsetSeqMetadata(s"""{"conf": {"$key":2}}"""))
+
+ // Two set
+ assert(OffsetSeqMetadata(1, 2, Map.empty) ===
+ OffsetSeqMetadata("""{"batchWatermarkMs":1,"batchTimestampMs":2}"""))
+ assert(OffsetSeqMetadata(1, 0, getConfWith(shufflePartitions = 3)) ===
+ OffsetSeqMetadata(s"""{"batchWatermarkMs":1,"conf": {"$key":3}}"""))
+ assert(OffsetSeqMetadata(0, 2, getConfWith(shufflePartitions = 3)) ===
+ OffsetSeqMetadata(s"""{"batchTimestampMs":2,"conf": {"$key":3}}"""))
+
+ // All set
+ assert(OffsetSeqMetadata(1, 2, getConfWith(shufflePartitions = 3)) ===
+
OffsetSeqMetadata(s"""{"batchWatermarkMs":1,"batchTimestampMs":2,"conf":
{"$key":3}}"""))
--- End diff --
nit: could you add a test to verify that unknown fields don't break the
serialization? Such as
```Scala
assert(OffsetSeqMetadata(1, 2, getConfWith(shufflePartitions = 3)) ===
OffsetSeqMetadata(
s"""{"batchWatermarkMs":1,"batchTimestampMs":2,"conf":
{"$key":3}},"unknown":1"""))
```
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
