junrao commented on code in PR #23737:
URL: https://github.com/apache/kafka/pull/23737#discussion_r4264669020


##########
raft/src/main/java/org/apache/kafka/raft/internals/RecordsIterator.java:
##########
@@ -136,9 +136,11 @@ private MemoryRecords createMemoryRecords(FileRecords 
fileRecords) {
 
         MemoryRecords memoryRecords = readFileRecords(fileRecords, buffer);
 
-        // firstBatchSize() is always non-null because the minimum buffer is 
HEADER_SIZE_UP_TO_MAGIC.
-        int firstBatchSize = memoryRecords.firstBatchSize();
-        if (firstBatchSize <= buffer.remaining()) {
+        Integer firstBatchSize = memoryRecords.firstBatchSize();
+        int bytesAvailable = buffer.remaining() + (fileRecords.sizeInBytes() - 
bytesRead);
+        if (firstBatchSize == null || firstBatchSize <= buffer.remaining() ||
+            firstBatchSize > bytesAvailable

Review Comment:
   This change has a subtle side effect. It means that bytesRead may never 
reach records.sizeInBytes(), but nextBatches() depends on that to end the 
iteration. Currently, it doesn't seem to cause an issue, but it makes the code 
harder to understand.
   
   So, it seems that it's simpler to leave the code as 
   ```
   if (firstBatchSize == null || firstBatchSize <= buffer.remaining() ||
               bytesRead >= fileRecords.sizeInBytes()
   ```
   This way, the current convention of expecting bytesRead to reach 
records.sizeInBytes() will hold. This could lead to an unnecessary buffer grow, 
but it's rare and probably not worth optimizing. What do you think?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to