Add test method for empty pages

.github/workflows/tests@v1.yml

@@ -98,7 +98,7 @@ jobs:
       - name: Setup Python 3
         uses: actions/setup-python@v2
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Fetch Scylla and Cassandra versions
         id: fetch-versions
@@ -134,11 +134,11 @@ jobs:
       - name: Setup Python 3
         uses: actions/setup-python@v2
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Setup environment
         run: |
-          pip3 install https://github.com/scylladb/scylla-ccm/archive/master.zip
+          pip3 install https://github.com/scylladb/scylla-ccm/archive/a93125bc6ad7dd5c9694331e89dc1fb212431ffe.zip
       - name: Run integration tests on Cassandra (${{ matrix.cassandra-version }})
         run: mvn -B -e verify -Dccm.version=${{ matrix.cassandra-version }} -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
 
@@ -186,11 +186,11 @@ jobs:
       - name: Setup Python 3
         uses: actions/setup-python@v2
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Setup environment
         run: |
-          pip3 install https://github.com/scylladb/scylla-ccm/archive/master.zip
+          pip3 install https://github.com/scylladb/scylla-ccm/archive/a93125bc6ad7dd5c9694331e89dc1fb212431ffe.zip
           sudo sh -c "echo 2097152 > /proc/sys/fs/aio-max-nr"
       - name: Run integration tests on Scylla (${{ matrix.scylla-version }})
         run: mvn -B verify -Dccm.version=${{ matrix.scylla-version }} -Dccm.scylla=true -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
@@ -213,4 +213,4 @@ jobs:
         if: ${{ failure() }}
         with:
           name: ccm-logs-scylla-${{ matrix.scylla-version }}
-          path: /tmp/ccm*/ccm*/node*/logs/*
+          path: /tmp/ccm*/ccm*/node*/logs/*

core/src/main/java/com/datastax/oss/driver/internal/core/cql/MultiPageResultSet.java

@@ -93,7 +93,7 @@ protected Row computeNext() {
     }
 
     private void maybeMoveToNextPage() {
-      if (!currentRows.hasNext() && currentPage.hasMorePages()) {
+      while (!currentRows.hasNext() && currentPage.hasMorePages()) {
         BlockingOperation.checkNotDriverThread();
         AsyncResultSet nextPage =
             CompletableFutures.getUninterruptibly(currentPage.fetchNextPage());

integration-tests/src/test/java/com/datastax/oss/driver/core/cql/SimpleStatementCcmIT.java

@@ -367,4 +367,31 @@ public void should_use_page_size() {
     // Should have only fetched 10 (page size) rows.
     assertThat(result.remaining()).isEqualTo(10);
   }
+
+  @Test
+  public void should_not_fail_on_empty_pages() {
+    SESSION_RULE
+        .session()
+        .execute(
+            "CREATE KEYSPACE IF NOT EXISTS ks WITH REPLICATION = {'class': 'SimpleStrategy', 'replication_factor': 1}");
+
+    SESSION_RULE
+        .session()
+        .execute("CREATE TABLE IF NOT EXISTS ks.t (pk int, ck int, v int, PRIMARY KEY(pk, ck))");
+
+    for (int i = 0; i < 50; i++) {
+      SESSION_RULE.session().execute("INSERT INTO ks.t(pk, ck, v) VALUES (?, ?, ?)", i, i, 15);
+      SESSION_RULE.session().execute("INSERT INTO ks.t(pk, ck, v) VALUES (?, ?, ?)", i, i, 32);
+    }
+
+    SESSION_RULE.session().execute("INSERT INTO ks.t(pk, ck, v) VALUES (?, ?, ?)", 8, 8, 14);
+    SESSION_RULE.session().execute("INSERT INTO ks.t(pk, ck, v) VALUES (?, ?, ?)", 11, 11, 14);
+    SESSION_RULE.session().execute("INSERT INTO ks.t(pk, ck, v) VALUES (?, ?, ?)", 14, 14, 14);
+
+    SimpleStatement st =
+        SimpleStatement.newInstance("SELECT * FROM ks.t WHERE v = 14 ALLOW FILTERING");
+    st = st.setPageSize(1);
+    List<Row> allRows = SESSION_RULE.session().execute(st).all();
+    assertThat(allRows.size()).isEqualTo(3);
+  }
 }