Skip to content

KAFKA-9589: Fixed bug in V2 log validator tests #8533

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

Merged
ijuma merged 1 commit into from
May 3, 2020
Merged

KAFKA-9589: Fixed bug in V2 log validator tests #8533

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
14 changes: 9 additions & 5 deletions core/src/test/scala/unit/kafka/log/LogValidatorTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ class LogValidatorTest {
checkLogAppendTimeNonCompressed(RecordBatch.MAGIC_VALUE_V1)
}

@Test
def testLogAppendTimeNonCompressedV2(): Unit = {
checkLogAppendTimeNonCompressed(RecordBatch.MAGIC_VALUE_V2)
}

private def checkLogAppendTimeNonCompressed(magic: Byte): Unit = {
val now = System.currentTimeMillis()
// The timestamps should be overwritten
Expand All @@ -135,17 +140,16 @@ class LogValidatorTest {
assertEquals("message set size should not change", records.records.asScala.size, validatedRecords.records.asScala.size)
validatedRecords.batches.asScala.foreach(batch => validateLogAppendTime(now, 1234L, batch))
assertEquals(s"Max timestamp should be $now", now, validatedResults.maxTimestamp)
assertEquals(s"The offset of max timestamp should be 0", 0, validatedResults.shallowOffsetOfMaxTimestamp)
assertFalse("Message size should not have been changed", validatedResults.messageSizeMaybeChanged)

// we index from last offset in version 2 instead of base offset
val expectedMaxTimestampOffset = if (magic >= RecordBatch.MAGIC_VALUE_V2) 2 else 0
assertEquals(s"The offset of max timestamp should be $expectedMaxTimestampOffset",
expectedMaxTimestampOffset, validatedResults.shallowOffsetOfMaxTimestamp)
verifyRecordConversionStats(validatedResults.recordConversionStats, numConvertedRecords = 0, records,
compressed = false)
}

def testLogAppendTimeNonCompressedV2(): Unit = {
checkLogAppendTimeNonCompressed(RecordBatch.MAGIC_VALUE_V2)
}

@Test
def testLogAppendTimeWithRecompressionV1(): Unit = {
checkLogAppendTimeWithRecompression(RecordBatch.MAGIC_VALUE_V1)
Expand Down