Fix LastOffset bug in PQ

FloatingCrowbar · FloatingCrowbar · commit 33c49e97982f · 2025-11-11T19:19:58.000Z
diff --git a/ydb/core/persqueue/pqtablet/partition/partition_read.cpp b/ydb/core/persqueue/pqtablet/partition/partition_read.cpp
@@ -508,6 +508,10 @@ TMaybe<TReadAnswer> TReadInfo::AddBlobsFromBody(const TVector<NPQ::TRequestedBlo
                 if (res.IsLastPart()) {
                     PartNo = 0;
                     ++Offset;
+		    if (LastOffset && Offset >= LastOffset) {
+                        needStop = true;
+                        break;
+                    }
                 } else {
                     ++PartNo;
                 }
@@ -644,6 +648,9 @@ TReadAnswer TReadInfo::FormAnswer(
             if (updateUsage(writeBlob)) {
                 break;
             }
+	    if (LastOffset && Offset >= LastOffset) {
+                break;
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -508,6 +508,10 @@ TMaybe<TReadAnswer> TReadInfo::AddBlobsFromBody(const TVector<NPQ::TRequestedBlo`
`508`	`508`	`if (res.IsLastPart()) {`
`509`	`509`	`PartNo = 0;`
`510`	`510`	`++Offset;`
	`511`	`+ if (LastOffset && Offset >= LastOffset) {`
	`512`	`+ needStop = true;`
	`513`	`+ break;`
	`514`	`+ }`
`511`	`515`	`} else {`
`512`	`516`	`++PartNo;`
`513`	`517`	`}`
`@@ -644,6 +648,9 @@ TReadAnswer TReadInfo::FormAnswer(`
`644`	`648`	`if (updateUsage(writeBlob)) {`
`645`	`649`	`break;`
`646`	`650`	`}`
	`651`	`+ if (LastOffset && Offset >= LastOffset) {`
	`652`	`+ break;`
	`653`	`+ }`
`647`	`654`	`}`
`648`	`655`	`}`
`649`	`656`