virajjasani commented on code in PR #1736: URL: https://github.com/apache/phoenix/pull/1736#discussion_r1450814882
########## phoenix-core-client/src/main/java/org/apache/phoenix/iterate/OffsetResultIterator.java: ########## @@ -32,32 +34,49 @@ */ public class OffsetResultIterator extends DelegateResultIterator { private int rowCount; - private int offset; + private final int offset; + private Tuple lastScannedTuple; private long pageSizeMs = Long.MAX_VALUE; + private boolean isIncompatibleClient = false; public OffsetResultIterator(ResultIterator delegate, Integer offset) { super(delegate); this.offset = offset == null ? -1 : offset; + this.lastScannedTuple = null; } - public OffsetResultIterator(ResultIterator delegate, Integer offset, long pageSizeMs) { + public OffsetResultIterator(ResultIterator delegate, Integer offset, long pageSizeMs, + boolean isIncompatibleClient) { this(delegate, offset); this.pageSizeMs = pageSizeMs; + this.isIncompatibleClient = isIncompatibleClient; } + @Override public Tuple next() throws SQLException { + long startTime = EnvironmentEdgeManager.currentTimeMillis(); while (rowCount < offset) { Tuple tuple = super.next(); - if (tuple == null) { return null; } + if (tuple == null) { + return null; + } if (tuple.size() == 0 || isDummy(tuple)) { // while rowCount < offset absorb the dummy and call next on the underlying scanner continue; } rowCount++; - // no page timeout check at this level because we cannot correctly resume - // scans for OFFSET queries until the offset is reached + lastScannedTuple = tuple; + if (!isIncompatibleClient) { + if (EnvironmentEdgeManager.currentTimeMillis() - startTime >= pageSizeMs) { Review Comment: Hmm that's also good point, let me check what happens to `_RowOffset`, i think scan attributes are preserved because when scanner is reset, on the same scan object, start rowkey is changed so the scan attributes should remain the same but let me spend sometime to confirm this. -- 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: issues-unsubscr...@phoenix.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org