Skip to content

Update Presto to Trino in trino-verifier #12445

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
losipiuk merged 1 commit into from
May 18, 2022
Merged

Update Presto to Trino in trino-verifier #12445

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
2 changes: 1 addition & 1 deletion service/trino-verifier/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<properties>
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
<main-class>io.trino.verifier.PrestoVerifier</main-class>
<main-class>io.trino.verifier.TrinoVerifier</main-class>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions ...ava/io/trino/verifier/PrestoVerifier.java → ...java/io/trino/verifier/TrinoVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

import picocli.CommandLine;

public final class PrestoVerifier
public final class TrinoVerifier
{
private PrestoVerifier() {}
private TrinoVerifier() {}

public static void main(String[] args)
{
Expand Down
2 changes: 1 addition & 1 deletion .../trino/verifier/PrestoVerifierModule.java → ...o/trino/verifier/TrinoVerifierModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import static io.airlift.event.client.EventBinder.eventBinder;
import static io.airlift.json.JsonCodecBinder.jsonCodecBinder;

public class PrestoVerifierModule
public class TrinoVerifierModule
extends AbstractConfigurationAwareModule
{
@Override
Expand Down
4 changes: 2 additions & 2 deletions service/trino-verifier/src/main/java/io/trino/verifier/Validator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ private QueryResult executeQuery(String url, String username, String password, Q
(e.getCause() instanceof Exception)) {
exception = (Exception) e.getCause();
}
State state = isPrestoQueryInvalid(e) ? State.INVALID : State.FAILED;
State state = isTrinoQueryInvalid(e) ? State.INVALID : State.FAILED;
return new QueryResult(state, exception, nanosSince(start), queryCpuTime, queryId, ImmutableList.of(), ImmutableList.of());
}
catch (VerifierException e) {
Expand Down Expand Up @@ -578,7 +578,7 @@ private void trySetConnectionProperties(Query query, Connection connection)
}
}

private static boolean isPrestoQueryInvalid(SQLException e)
private static boolean isTrinoQueryInvalid(SQLException e)
{
for (Throwable t = e.getCause(); t != null; t = t.getCause()) {
if (t.toString().contains(".SemanticException:")) {
Expand Down
2 changes: 1 addition & 1 deletion service/trino-verifier/src/main/java/io/trino/verifier/VerifyCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void run()

ImmutableList.Builder<Module> builder = ImmutableList.<Module>builder()
.add(new JsonModule())
.add(new PrestoVerifierModule())
.add(new TrinoVerifierModule())
.add(new DataSourceModule(this))
.addAll(getAdditionalModules());

Expand Down