Skip to content

MINOR: revisit LogValidatorTest#checkRecompression #15948

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
chia7712 merged 3 commits into from
May 15, 2024
Merged

MINOR: revisit LogValidatorTest#checkRecompression #15948

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e53673d
MINOR: revisit LogValidatorTest#checkRecompression
chia7712 May 14, 2024
d64cade
Merge branch 'trunk' into MINOR-15948
chia7712 May 14, 2024
40cabe2
address comment
chia7712 May 14, 2024
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
11 changes: 7 additions & 4 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 @@ -452,12 +452,15 @@ class LogValidatorTest {
(RecordBatch.NO_PRODUCER_ID, RecordBatch.NO_PRODUCER_EPOCH, RecordBatch.NO_SEQUENCE, false,
RecordBatch.NO_PARTITION_LEADER_EPOCH)

val records = MemoryRecords.withRecords(magic, 0L, CompressionType.GZIP, TimestampType.CREATE_TIME, producerId,
val records = MemoryRecords.withRecords(magic, 0L, CompressionType.NONE, TimestampType.CREATE_TIME, producerId,
producerEpoch, baseSequence, partitionLeaderEpoch, isTransactional,
new SimpleRecord(timestampSeq(0), "hello".getBytes),
new SimpleRecord(timestampSeq(1), "there".getBytes),
new SimpleRecord(timestampSeq(2), "beautiful".getBytes))

// V2 has single batch, and other versions has many single-record batches
assertEquals(if (magic >= RecordBatch.MAGIC_VALUE_V2) 1 else 3, records.batches().asScala.size)

val validatingResults = new LogValidator(records,
topicPartition,
time,
Expand Down Expand Up @@ -497,9 +500,9 @@ class LogValidatorTest {
assertEquals(now + 1, validatingResults.maxTimestampMs,
s"Max timestamp should be ${now + 1}")

// Both V2 and V1 has single branch in the record when compression is enable, and hence their shallow OffsetOfMaxTimestamp
// is the last offset of the single branch
assertEquals(1, records.batches().asScala.size)
// Both V2 and V1 has single batch in the validated records when compression is enable, and hence their shallow
// OffsetOfMaxTimestamp is the last offset of the single batch
assertEquals(1, validatedRecords.batches().asScala.size)
assertEquals(2, validatingResults.shallowOffsetOfMaxTimestamp)
assertTrue(validatingResults.messageSizeMaybeChanged,
"Message size should have been changed")
Expand Down