Make determinism analysis run count configurable

prestodb · Dec 4, 2019 · 5de945e · 5de945e
1 parent bba5aa2
commit 5de945e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/presto-docs/src/main/sphinx/installation/verifier.rst b/presto-docs/src/main/sphinx/installation/verifier.rst
@@ -79,4 +79,6 @@ Name                              Description
                                   test clusters combined.
 ``relative-error-margin``         Specified the maximum tolerable relative error between control and test
                                   queries for floating point columns.
+``max-determinism-analysis-runs`` Maximum number of reruns of the control queries in case of a result
+                                  mismatch to determine whether the query is deterministic.
 ================================= =======================================================================
diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/DataVerification.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/DataVerification.java
@@ -61,6 +61,8 @@ public class DataVerification
     private final ChecksumValidator checksumValidator;
     private final LimitQueryDeterminismAnalyzer limitQueryDeterminismAnalyzer;
 
+    private final int maxDeterminismAnalysisRuns;
+
     public DataVerification(
             VerificationResubmitter verificationResubmitter,
             PrestoAction prestoAction,
@@ -77,6 +79,7 @@ public DataVerification(
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
         this.checksumValidator = requireNonNull(checksumValidator, "checksumValidator is null");
         this.limitQueryDeterminismAnalyzer = requireNonNull(limitQueryDeterminismAnalyzer, "limitQueryDeterminismAnalyzer is null");
+        this.maxDeterminismAnalysisRuns = verifierConfig.getMaxDeterminismAnalysisRuns();
     }
 
     @Override
@@ -108,7 +111,7 @@ protected DeterminismAnalysis analyzeDeterminism(QueryBundle control, ChecksumRe
         List<QueryBundle> queryBundles = new ArrayList<>();
 
         try {
-            for (int i = 0; i < 2; i++) {
+            for (int i = 0; i < maxDeterminismAnalysisRuns; i++) {
                 QueryBundle queryBundle = getQueryRewriter().rewriteQuery(getSourceQuery().getControlQuery(), CONTROL);
                 queryBundles.add(queryBundle);
                 DeterminismAnalysisRun.Builder run = getVerificationContext().startDeterminismAnalysisRun().setTableName(queryBundle.getTableName().toString());

diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierConfig.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/VerifierConfig.java
@@ -45,6 +45,7 @@ public class VerifierConfig
     private double relativeErrorMargin = 1e-4;
     private double absoluteErrorMargin = 1e-12;
     private boolean runTearDownOnResultMismatch;
+    private int maxDeterminismAnalysisRuns = 2;
     private boolean enableLimitQueryDeterminismAnalyzer = true;
     private int verificationResubmissionLimit = 2;
 
@@ -232,6 +233,19 @@ public VerifierConfig setRunTearDownOnResultMismatch(boolean runTearDownOnResult
         return this;
     }
 
+    @Min(0)
+    public int getMaxDeterminismAnalysisRuns()
+    {
+        return maxDeterminismAnalysisRuns;
+    }
+
+    @Config("max-determinism-analysis-runs")
+    public VerifierConfig setMaxDeterminismAnalysisRuns(int maxDeterminismAnalysisRuns)
+    {
+        this.maxDeterminismAnalysisRuns = maxDeterminismAnalysisRuns;
+        return this;
+    }
+
     public boolean isEnableLimitQueryDeterminismAnalyzer()
     {
         return enableLimitQueryDeterminismAnalyzer;

diff --git a/...o-verifier/src/test/java/com/facebook/presto/verifier/framework/TestDataVerification.java b/...o-verifier/src/test/java/com/facebook/presto/verifier/framework/TestDataVerification.java
@@ -86,11 +86,15 @@ public void setupClass()
     }
 
     private DataVerification createVerification(String controlQuery, String testQuery)
+    {
+        return createVerification(controlQuery, testQuery, new VerifierConfig().setTestId(TEST_ID));
+    }
+
+    private DataVerification createVerification(String controlQuery, String testQuery, VerifierConfig verifierConfig)
     {
         QueryConfiguration configuration = new QueryConfiguration(CATALOG, SCHEMA, Optional.of("user"), Optional.empty(), Optional.empty());
         VerificationContext verificationContext = new VerificationContext();
         RetryConfig retryConfig = new RetryConfig();
-        VerifierConfig verifierConfig = new VerifierConfig().setTestId(TEST_ID);
         PrestoAction prestoAction = new JdbcPrestoAction(
                 new PrestoExceptionClassifier(ImmutableSet.of(), ImmutableSet.of()),
                 configuration,
@@ -241,7 +245,9 @@ public void testNonDeterministic()
     @Test
     public void testArrayOfRow()
     {
-        Optional<VerifierQueryEvent> event = createVerification("SELECT ARRAY[ROW(1, 'a'), ROW(2, null)]", "SELECT ARRAY[ROW(1, 'a'), ROW(2, null)]").run();
+        Optional<VerifierQueryEvent> event = createVerification(
+                "SELECT ARRAY[ROW(1, 'a'), ROW(2, null)]", "SELECT ARRAY[ROW(1, 'a'), ROW(2, null)]",
+                new VerifierConfig().setTestId(TEST_ID).setMaxDeterminismAnalysisRuns(3)).run();
         assertTrue(event.isPresent());
         assertEvent(event.get(), SUCCEEDED, Optional.empty(), Optional.empty(), Optional.empty());
 

diff --git a/presto-verifier/src/test/java/com/facebook/presto/verifier/framework/TestVerifierConfig.java b/presto-verifier/src/test/java/com/facebook/presto/verifier/framework/TestVerifierConfig.java
@@ -41,6 +41,7 @@ public void testDefault()
                 .setRelativeErrorMargin(1e-4)
                 .setAbsoluteErrorMargin(1e-12)
                 .setRunTearDownOnResultMismatch(false)
+                .setMaxDeterminismAnalysisRuns(2)
                 .setEnableLimitQueryDeterminismAnalyzer(true)
                 .setVerificationResubmissionLimit(2));
     }
@@ -62,6 +63,7 @@ public void testExplicitPropertyMappings()
                 .put("relative-error-margin", "2e-5")
                 .put("absolute-error-margin", "1e-14")
                 .put("run-teardown-on-result-mismatch", "true")
+                .put("max-determinism-analysis-runs", "3")
                 .put("enable-limit-query-determinism-analyzer", "false")
                 .put("verification-resubmission.limit", "1")
                 .build();
@@ -79,6 +81,7 @@ public void testExplicitPropertyMappings()
                 .setRelativeErrorMargin(2e-5)
                 .setAbsoluteErrorMargin(1e-14)
                 .setRunTearDownOnResultMismatch(true)
+                .setMaxDeterminismAnalysisRuns(3)
                 .setEnableLimitQueryDeterminismAnalyzer(false)
                 .setVerificationResubmissionLimit(1);