(phoenix) branch master updated: PHOENIX-7387 SnapshotScanner's next method is ignoring the boolean value from hbase's nextRaw method (#1971)

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new e418d15faa PHOENIX-7387 SnapshotScanner's next method is ignoring the boolean value from hbase's nextRaw method (#1971)
e418d15faa is described below

commit e418d15faa11f49dad63b8d8fd383bfbf7fd7cc9
Author: Abhradeep Kundu <ab...@gmail.com>
AuthorDate: Wed Sep 4 16:53:07 2024 +0530

    PHOENIX-7387 SnapshotScanner's next method is ignoring the boolean value from hbase's nextRaw method (#1971)
    
    Co-authored-by: abhradeep.kundu <ab...@cloudera.com>
---
 .../src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phoenix-core-server/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java b/phoenix-core-server/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java
index 1a98515ba0..992ee46a7d 100644
--- a/phoenix-core-server/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java
+++ b/phoenix-core-server/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java
@@ -160,14 +160,14 @@ public class SnapshotScanner extends AbstractClientScanner {
   @Override
   public Result next() throws IOException {
     values.clear();
-    scanner.nextRaw(values);
+    boolean hasMore = scanner.nextRaw(values);
     statisticsCollector.collectStatistics(values);
-    if (values.isEmpty()) {
+    if (hasMore || !values.isEmpty()) {
+      return Result.create(values);
+    } else {
       //we are done
       return null;
     }
-
-    return Result.create(values);
   }
 
   @Override