fix up aggregate-index-tests-count-empty.yamsql to work better in mixed-mode tests

Author: alecgrieser

yaml-tests/src/main/java/com/apple/foundationdb/relational/yamltests/command/QueryExecutor.java

@@ -26,9 +26,11 @@
 import com.apple.foundationdb.relational.api.RelationalResultSetMetaData;
 import com.apple.foundationdb.relational.api.exceptions.RelationalException;
 import com.apple.foundationdb.relational.api.metrics.RelationalMetric;
+import com.apple.foundationdb.relational.recordlayer.ContinuationImpl;
 import com.apple.foundationdb.relational.yamltests.AggregateResultSet;
 import com.apple.foundationdb.relational.yamltests.YamlConnection;
 import com.apple.foundationdb.relational.yamltests.command.parameterinjection.Parameter;
+import com.apple.foundationdb.relational.yamltests.server.SemanticVersion;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.Assertions;
@@ -52,6 +54,7 @@ public class QueryExecutor {
     private static final Logger logger = LogManager.getLogger(QueryExecutor.class);
     private static final int FORCED_MAX_ROWS = 1; // The maxRows number to use when we are forcing it on the test
     private static final int MAX_CONTINUATIONS_ALLOWED = 100;
+    private static final SemanticVersion STRICT_ASSERTIONS_CUTOFF = SemanticVersion.parse("4.1.4.0");
 
     @Nonnull
     private final String query;
@@ -106,8 +109,10 @@ public Continuation execute(@Nonnull YamlConnection connection, @Nullable Contin
             return executeQuery(connection, config, currentQuery, checkCache, maxRows);
         } else if (continuation.atBeginning()) {
             // Continuation cannot be at beginning if it was returned from a query
-            reportTestFailure("Received continuation shouldn't be at beginning");
-            return null;
+            if (STRICT_ASSERTIONS_CUTOFF.lesserVersions(connection.getVersions()).isEmpty()) {
+                reportTestFailure("Received continuation shouldn't be at beginning");
+            }
+            return ContinuationImpl.END;
         } else {
             // Have a continuation - continue
             return executeContinuation(connection, continuation, config, maxRows);
@@ -246,7 +251,11 @@ private Object executeStatementWithForcedContinuations(final @Nonnull Statement
             int count = 0;
             while (!continuation.atEnd()) {
                 if (continuation.atBeginning()) {
-                    reportTestFailure("Received continuation shouldn't be at beginning");
+                    if (STRICT_ASSERTIONS_CUTOFF.lesserVersions(connection.getVersions()).isEmpty()) {
+                        reportTestFailure("Received continuation shouldn't be at beginning");
+                    }
+                    continuation = ContinuationImpl.END;
+                    break;
                 }
                 try (var s2 = prepareContinuationStatement(connection, continuation, FORCED_MAX_ROWS)) {
                     resultSet = (RelationalResultSet)executeStatement(s2, null);
@@ -256,7 +265,9 @@ private Object executeStatementWithForcedContinuations(final @Nonnull Statement
                         results.add(resultSet);
                     } else {
                         // We assume that the last result is empty because of the maxRows:1
-                        Assertions.assertFalse(hasNext);
+                        if (STRICT_ASSERTIONS_CUTOFF.lesserVersions(connection.getVersions()).isEmpty()) {
+                            Assertions.assertFalse(hasNext, "End result should not have any associated value when maxRows is 1");
+                        }
                     }
                 }
                 count += 1; // PMD failure for ++

yaml-tests/src/test/resources/aggregate-index-tests-count-empty.yamsql

@@ -31,7 +31,6 @@ test_block:
   name: agg-index-tests-count-empty
   tests:
     -
-      # DONE: 4.1 Triage: [No Fix Necessary] failing when running against 4.0.559.6 (result mismatch)
       - query: select count(*) from t1
       - explain: "AISCAN(MV1 <,> BY_GROUP -> [_0: VALUE:[0]]) | MAP (_ AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
       - initialVersionLessThan: 4.0.561.0
@@ -43,8 +42,9 @@ test_block:
       - explain: "AISCAN(MV2 <,> BY_GROUP -> [_0: KEY:[0], _1: VALUE:[0]]) | MAP (_._1 AS _0)"
       - result: []
     -
-      # DONE: 4.1 Triage: failing when running against 4.0.559.6 (result mismatch)
       - query: select count(col1) from t1
+      # FORCE_CONTINUATIONS does not work with versions before 4.1.4.0 due to limits not enforced "ON EMPTY" prior to https://github.com/FoundationDB/fdb-record-layer/pull/3092
+      # Can remove once we no longer want to test versions prior to 4.1.4.0
       - explain: "AISCAN(MV3 <,> BY_GROUP -> [_0: VALUE:[0]]) | MAP (_ AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
       - initialVersionLessThan: 4.0.561.0
       - result: []
@@ -60,17 +60,15 @@ test_block:
     -
       - query: select count(*) from t2
       - explain: "ISCAN(MV5 <,>) | MAP (_ AS _0) | AGG (count_star(*) AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
-      # 4.1 Triage: failing when running against 4.0.559.6 (Received continuation shouldn't be at beginning)
-      # - result: [{0}]
+      - result: [{0}]
     -
       - query: select count(*) from t2 group by col2
       - explain: "ISCAN(MV5 <,>) | MAP (_ AS _0) | AGG (count_star(*) AS _0) GROUP BY (_._0.COL2 AS _0) | MAP (_._1._0 AS _0)"
       - result: []
     -
       - query: select count(col1) from t2
       - explain: "ISCAN(MV5 <,>) | MAP (_ AS _0) | AGG (count(_._0.COL1) AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
-      # 4.1 Triage: failing when running against 4.0.559.6 (Received continuation shouldn't be at beginning)
-      # - result: [{0}]
+      - result: [{0}]
     -
       - query: select count(col1) from t2 group by col2
       - explain: "ISCAN(MV5 <,>) | MAP (_ AS _0) | AGG (count(_._0.COL1) AS _0) GROUP BY (_._0.COL2 AS _0) | MAP (_._1._0 AS _0)"