Fix LastOffset bug in PQ

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

Original file line number	Diff line number	Diff line change
`@@ -504,6 +504,10 @@ TMaybe<TReadAnswer> TReadInfo::AddBlobsFromBody(const TVector<NPQ::TRequestedBlo`
`504`	`504`	`if (res.IsLastPart()) {`
`505`	`505`	`PartNo = 0;`
`506`	`506`	`++Offset;`
	`507`	`+ if (LastOffset && Offset >= LastOffset) {`
	`508`	`+ needStop = true;`
	`509`	`+ break;`
	`510`	`+ }`
`507`	`511`	`} else {`
`508`	`512`	`++PartNo;`
`509`	`513`	`}`
`@@ -640,6 +644,9 @@ TReadAnswer TReadInfo::FormAnswer(`
`640`	`644`	`if (updateUsage(writeBlob)) {`
`641`	`645`	`break;`
`642`	`646`	`}`
	`647`	`+ if (LastOffset && Offset >= LastOffset) {`
	`648`	`+ break;`
	`649`	`+ }`
`643`	`650`	`}`
`644`	`651`	`}`
`645`	`652`