Skip to content
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,18 @@ private[kafka010] class KafkaRecordToUnsafeRowConverter {

def toUnsafeRow(record: ConsumerRecord[Array[Byte], Array[Byte]]): UnsafeRow = {
rowWriter.reset()
rowWriter.zeroOutNullBytes()

if (record.key == null) {
rowWriter.setNullAt(0)
} else {
rowWriter.write(0, record.key)
}
rowWriter.write(1, record.value)
if (record.value == null) {
rowWriter.setNullAt(1)
} else {
rowWriter.write(1, record.value)
}
Comment thread
uncleGen marked this conversation as resolved.
rowWriter.write(2, UTF8String.fromString(record.topic))
Comment thread
uncleGen marked this conversation as resolved.
Outdated
rowWriter.write(3, record.partition)
rowWriter.write(4, record.offset)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,10 @@ class KafkaContinuousSourceSuite extends KafkaSourceSuiteBase with KafkaContinuo
}
}
}

test(s"SPARK-27494: read kafka record containing null key/values in continuous mode") {
Comment thread
uncleGen marked this conversation as resolved.
Outdated
testNullableKeyValue(ContinuousTrigger(100))
}
}

class KafkaContinuousSourceTopicDeletionSuite extends KafkaContinuousTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,10 @@ abstract class KafkaMicroBatchSourceSuiteBase extends KafkaSourceSuiteBase {
q.stop()
}
}

test(s"SPARK-27494: read kafka record containing null key/values in micro-batch mode") {
Comment thread
uncleGen marked this conversation as resolved.
Outdated
testNullableKeyValue(Trigger.ProcessingTime(100))
}
}


Expand Down Expand Up @@ -1511,6 +1515,54 @@ abstract class KafkaSourceSuiteBase extends KafkaSourceTest {
CheckAnswer(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17)
)
}

protected def testNullableKeyValue(trigger: Trigger): Unit = {
val table = "kafka_null_key_value_source_test"
withTable(table) {
val topic = newTopic()
testUtils.createTopic(topic)
testUtils.withProducer { producer =>
Comment thread
uncleGen marked this conversation as resolved.
Outdated
val df = spark
.readStream
.format("kafka")
.option("kafka.bootstrap.servers", testUtils.brokerAddress)
.option("startingOffsets", "earliest")
.option("subscribe", topic)
.load()
.selectExpr("CAST(key AS STRING)", "CAST(value AS STRING)")
.as[(String, String)]

val q = df
.writeStream
.format("memory")
.queryName(table)
.trigger(trigger)
.start()
try {
val expected1 = (1 to 5).map { _ =>
producer.send(new ProducerRecord[String, String](topic, null, null)).get()
(null, null)
}.asInstanceOf[Seq[(String, String)]]

val expected2 = (6 to 10).map { i =>
producer.send(new ProducerRecord[String, String](topic, i.toString, null)).get()
(i.toString, null)
}.asInstanceOf[Seq[(String, String)]]

val expected3 = (11 to 15).map { i =>
producer.send(new ProducerRecord[String, String](topic, null, i.toString)).get()
(null, i.toString)
}.asInstanceOf[Seq[(String, String)]]

eventually(timeout(streamingTimeout)) {
checkAnswer(spark.table(table), (expected1 ++ expected2 ++ expected3).toDF())
}
} finally {
q.stop()
}
}
}
}
}

object KafkaSourceSuite {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,17 @@ class KafkaTestUtils(withBrokerProps: Map[String, Object] = Map.empty) extends L
props
}

/** Call `f` with a `KafkaProducer`. */
def withProducer(f: KafkaProducer[String, String] => Unit): Unit = {
val props = producerConfiguration
val producer = new KafkaProducer[String, String](props)
try {
f(producer)
} finally {
producer.close()
}
}

/** Call `f` with a `KafkaProducer` that has initialized transactions. */
def withTranscationalProducer(f: KafkaProducer[String, String] => Unit): Unit = {
val props = producerConfiguration
Expand Down