ptupitsyn commented on code in PR #6950:
URL: https://github.com/apache/ignite-3/pull/6950#discussion_r2518907688
##########
modules/core/src/main/java/org/apache/ignite/internal/sql/SyncResultSetAdapter.java:
##########
@@ -107,39 +106,32 @@ public T next() {
private static class IteratorImpl<T> implements Iterator<T> {
private AsyncResultSet<T> curRes;
- private CompletionStage<? extends AsyncResultSet<T>> nextPageStage;
-
private Iterator<T> curPage;
IteratorImpl(AsyncResultSet<T> ars) {
curRes = ars;
-
- advance();
+ curPage = ars.currentPage().iterator();
}
@Override
public boolean hasNext() {
- if (curPage.hasNext()) {
+ if (curPage != null && curPage.hasNext()) {
return true;
- } else if (nextPageStage != null) {
- curRes = sync(nextPageStage.toCompletableFuture());
+ }
+
+ if (curRes == null || !curRes.hasMorePages()) {
+ return false;
+ }
- advance();
+ curRes = sync(curRes.fetchNextPage().toCompletableFuture());
- return curPage.hasNext();
- } else {
+ if (curRes == null) {
return false;
}
- }
- private void advance() {
curPage = curRes.currentPage().iterator();
- if (curRes.hasMorePages()) {
- nextPageStage = curRes.fetchNextPage();
- } else {
- nextPageStage = null;
- }
+ return curPage.hasNext();
Review Comment:
Good catch, removed the null check on line 118
--
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]
