Skip to content

Commit d3da6ce

Browse files
committed
refactor
1 parent 9b3b5c3 commit d3da6ce

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,9 @@ public void shouldUpdateOffsetForLeaderEpochsWhenDeletingSegments() throws IOExc
192192

193193
@Test
194194
public void shouldTruncateLeaderEpochCheckpointFileWhenTruncatingLog() throws IOException {
195+
Supplier<MemoryRecords> records = () -> TestUtils.records(List.of(new SimpleRecord("value".getBytes())), 0, 0);
195196
LogConfig config = new LogTestUtils.LogConfigBuilder()
196-
.withSegmentBytes(10 * createRecords(0, 0).sizeInBytes())
197+
.withSegmentBytes(10 * records.get().sizeInBytes())
197198
.build();
198199
log = createLog(logDir, config);
199200
LeaderEpochFileCache cache = epochCache(log);
@@ -587,7 +588,7 @@ public void testFirstUnstableOffsetWithTransactionalData() throws IOException {
587588
assertEquals(Optional.of(firstAppendInfo.firstOffset()), log.firstUnstableOffset());
588589

589590
// now transaction is committed
590-
LogAppendInfo commitAppendInfo = LogTestUtils.appendEndTxnMarkerAsLeader(log, pid, epoch, ControlRecordType.COMMIT, mockTime.milliseconds(), 0, 0);
591+
LogAppendInfo commitAppendInfo = appendEndTxnMarkerAsLeader(log, pid, epoch, ControlRecordType.COMMIT, mockTime.milliseconds());
591592

592593
// first unstable offset is not updated until the high watermark is advanced
593594
assertEquals(Optional.of(firstAppendInfo.firstOffset()), log.firstUnstableOffset());
@@ -598,20 +599,17 @@ public void testFirstUnstableOffsetWithTransactionalData() throws IOException {
598599
}
599600

600601
private void append(int epoch, long startOffset, int count) {
602+
Function<Integer, MemoryRecords> records = i ->
603+
TestUtils.records(List.of(new SimpleRecord("value".getBytes())), startOffset + i, epoch);
601604
for (int i = 0; i < count; i++) {
602-
log.appendAsFollower(createRecords(startOffset + i, epoch), epoch);
605+
log.appendAsFollower(records.apply(i), epoch);
603606
}
604607
}
605608

606609
private LeaderEpochFileCache epochCache(UnifiedLog log) {
607610
return log.leaderEpochCache();
608611
}
609612

610-
private void appendAsFollower(UnifiedLog log, MemoryRecords records, int leaderEpoch) {
611-
records.batches().forEach(batch -> batch.setPartitionLeaderEpoch(leaderEpoch));
612-
log.appendAsFollower(records, leaderEpoch);
613-
}
614-
615613
private LogAppendInfo appendEndTxnMarkerAsLeader(UnifiedLog log, long producerId, short producerEpoch, ControlRecordType controlType, long timestamp) throws IOException {
616614
MemoryRecords records = MemoryRecords.withEndTransactionMarker(producerId, producerEpoch, new EndTransactionMarker(controlType, 0));
617615
return log.appendAsLeader(records, 0);
@@ -644,9 +642,4 @@ private UnifiedLog createLog(
644642
this.logsToClose.add(log);
645643
return log;
646644
}
647-
648-
// FIXME: remove
649-
private MemoryRecords createRecords(long startOffset, int epoch) {
650-
return TestUtils.records(List.of(new SimpleRecord("value".getBytes())), startOffset, epoch);
651-
}
652645
}

0 commit comments

Comments
 (0)