Skip to content

Skip verification when checksum query fails to compile #13853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbasmanova merged 1 commit into from
Dec 12, 2019
Merged

Skip verification when checksum query fails to compile #13853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ...o-verifier/src/main/java/com/facebook/presto/verifier/framework/AbstractVerification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@
import java.util.List;
import java.util.Optional;

import static com.facebook.presto.spi.StandardErrorCode.COMPILER_ERROR;
import static com.facebook.presto.spi.StandardErrorCode.EXCEEDED_TIME_LIMIT;
import static com.facebook.presto.verifier.event.VerifierQueryEvent.EventStatus.FAILED;
import static com.facebook.presto.verifier.event.VerifierQueryEvent.EventStatus.FAILED_RESOLVED;
import static com.facebook.presto.verifier.event.VerifierQueryEvent.EventStatus.SKIPPED;
import static com.facebook.presto.verifier.event.VerifierQueryEvent.EventStatus.SUCCEEDED;
import static com.facebook.presto.verifier.framework.ClusterType.CONTROL;
import static com.facebook.presto.verifier.framework.ClusterType.TEST;
import static com.facebook.presto.verifier.framework.QueryStage.CHECKSUM;
import static com.facebook.presto.verifier.framework.QueryStage.CONTROL_MAIN;
import static com.facebook.presto.verifier.framework.QueryStage.DETERMINISM_ANALYSIS;
import static com.facebook.presto.verifier.framework.QueryStage.TEST_MAIN;
Expand All @@ -51,6 +53,7 @@
import static com.facebook.presto.verifier.framework.SkippedReason.CONTROL_SETUP_QUERY_FAILED;
import static com.facebook.presto.verifier.framework.SkippedReason.FAILED_BEFORE_CONTROL_QUERY;
import static com.facebook.presto.verifier.framework.SkippedReason.NON_DETERMINISTIC;
import static com.facebook.presto.verifier.framework.SkippedReason.VERIFIER_LIMITATION;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Throwables.getStackTraceAsString;
import static com.google.common.collect.ImmutableList.toImmutableList;
Expand Down Expand Up @@ -239,7 +242,7 @@ private VerifierQueryEvent buildEvent(
}

EventStatus status;
Optional<SkippedReason> skippedReason = getSkippedReason(controlState, determinismAnalysis);
Optional<SkippedReason> skippedReason = getSkippedReason(controlState, determinismAnalysis, queryException);
Optional<String> resolveMessage = Optional.empty();
if (succeeded) {
status = SUCCEEDED;
Expand Down Expand Up @@ -336,7 +339,10 @@ protected static List<String> formatSqls(List<Statement> statements)
.collect(toImmutableList());
}

private static Optional<SkippedReason> getSkippedReason(QueryState controlState, Optional<DeterminismAnalysis> determinismAnalysis)
private static Optional<SkippedReason> getSkippedReason(
QueryState controlState,
Optional<DeterminismAnalysis> determinismAnalysis,
Optional<QueryException> queryException)
{
switch (controlState) {
case FAILED:
Expand All @@ -351,6 +357,12 @@ private static Optional<SkippedReason> getSkippedReason(QueryState controlState,
if (determinismAnalysis.isPresent() && determinismAnalysis.get().isNonDeterministic()) {
return Optional.of(NON_DETERMINISTIC);
}
if (queryException.isPresent() &&
queryException.get().getQueryStage().equals(CHECKSUM) &&
queryException.get().getPrestoErrorCode().isPresent() &&
queryException.get().getPrestoErrorCode().get().equals(COMPILER_ERROR)) {
return Optional.of(VERIFIER_LIMITATION);
}
return Optional.empty();
}

Expand Down
4 changes: 3 additions & 1 deletion presto-verifier/src/main/java/com/facebook/presto/verifier/framework/SkippedReason.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@ public enum SkippedReason
CONTROL_SETUP_QUERY_FAILED,
CONTROL_QUERY_TIMED_OUT,
FAILED_BEFORE_CONTROL_QUERY,
NON_DETERMINISTIC
NON_DETERMINISTIC,

VERIFIER_LIMITATION,
}
4 changes: 3 additions & 1 deletion ...o-verifier/src/test/java/com/facebook/presto/verifier/framework/TestDataVerification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import static com.facebook.presto.verifier.framework.SkippedReason.CONTROL_SETUP_QUERY_FAILED;
import static com.facebook.presto.verifier.framework.SkippedReason.FAILED_BEFORE_CONTROL_QUERY;
import static com.facebook.presto.verifier.framework.SkippedReason.NON_DETERMINISTIC;
import static com.facebook.presto.verifier.framework.SkippedReason.VERIFIER_LIMITATION;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static java.lang.String.format;
import static java.util.regex.Pattern.DOTALL;
Expand Down Expand Up @@ -280,7 +281,8 @@ public void testChecksumQueryFailed()
Optional<VerifierQueryEvent> event = createVerification(query, query).run();

assertTrue(event.isPresent());
assertEquals(event.get().getStatus(), FAILED.name());
assertEquals(event.get().getStatus(), SKIPPED.name());
assertEquals(event.get().getSkippedReason(), VERIFIER_LIMITATION.name());
assertEquals(event.get().getErrorCode(), "PRESTO(COMPILER_ERROR)");
assertNotNull(event.get().getControlQueryInfo().getChecksumQuery());
assertNotNull(event.get().getControlQueryInfo().getChecksumQueryId());
Expand Down