diff --git a/pom.xml b/pom.xml index ea19425f3a7ec..78693f08ee477 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.facebook.airlift airbase - 109 + 108 com.facebook.presto diff --git a/presto-client/src/main/java/okhttp/internal/tls/DistinguishedNameParser.java b/presto-client/src/main/java/okhttp/internal/tls/DistinguishedNameParser.java index fc2df065cc0a0..4c5f22877da9e 100644 --- a/presto-client/src/main/java/okhttp/internal/tls/DistinguishedNameParser.java +++ b/presto-client/src/main/java/okhttp/internal/tls/DistinguishedNameParser.java @@ -415,8 +415,7 @@ public String findMostSpecific(String attributeType) } if (chars[pos] == ',' || chars[pos] == ';') { //Do nothing - } - else if (chars[pos] != '+') { + } else if (chars[pos] != '+') { throw new IllegalStateException("Malformed DN: " + dn); } pos++; diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java index 0b3ce0697fa3f..806e82e1e64d9 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java +++ b/presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/InternalResourceGroupManager.java @@ -159,8 +159,8 @@ public InternalResourceGroupManager( this.maxQueryAdmissionsPerSecond = queryManagerConfig.getMaxQueryAdmissionsPerSecond(); this.minRunningQueriesForPacing = queryManagerConfig.getMinRunningQueriesForPacing(); this.queryAdmissionIntervalNanos = (maxQueryAdmissionsPerSecond == Integer.MAX_VALUE) - ? 0L - : 1_000_000_000L / maxQueryAdmissionsPerSecond; + ? 0L + : 1_000_000_000L / maxQueryAdmissionsPerSecond; this.queryPacingContext = new QueryPacingContext() { @Override diff --git a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RatisServer.java b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RatisServer.java index ac12a825e583e..4380990db5928 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RatisServer.java +++ b/presto-main-base/src/main/java/com/facebook/presto/resourcemanager/RatisServer.java @@ -61,7 +61,7 @@ public RaftPeer[] getPeers() .map(resourceManager -> { RaftPeer.Builder builder = RaftPeer.newBuilder(); builder.setId(RaftPeerId.valueOf(resourceManager.getNodeIdentifier())) - .setAddress(resourceManager.getHost() + ":" + resourceManager.getRaftPort().getAsInt()); + .setAddress(resourceManager.getHost() + ":" + resourceManager.getRaftPort().getAsInt()); return builder.build(); }).toArray(RaftPeer[]::new); } diff --git a/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigestUtils.java b/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigestUtils.java index 7a0b5163826e3..acb63d373239a 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigestUtils.java +++ b/presto-main-base/src/main/java/com/facebook/presto/tdigest/TDigestUtils.java @@ -424,7 +424,7 @@ private static void swap(int[] order, int i, int j) order[j] = t; } - private static void swap(int i, int j, double[] key, double[]... values) + private static void swap(int i, int j, double[] key, double[]...values) { double t = key[i]; key[i] = key[j]; diff --git a/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/BenchmarkTransformValue.java b/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/BenchmarkTransformValue.java index b40a60c96430f..3c358a4e319ac 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/BenchmarkTransformValue.java +++ b/presto-main-base/src/test/java/com/facebook/presto/operator/scalar/BenchmarkTransformValue.java @@ -150,8 +150,8 @@ public void setup() call( GREATER_THAN.name(), greaterThan, BOOLEAN, ImmutableList.of( - new VariableReferenceExpression(Optional.empty(), "y", elementType), - constant(compareValue, elementType))))))); + new VariableReferenceExpression(Optional.empty(), "y", elementType), + constant(compareValue, elementType))))))); Block block = createChannel(POSITIONS, mapType, elementType); ImmutableList projections = projectionsBuilder.build(); diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestPullConstantsAboveGroupBy.java b/presto-main-base/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestPullConstantsAboveGroupBy.java index 34f031e450083..cc201466dd7a6 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestPullConstantsAboveGroupBy.java +++ b/presto-main-base/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestPullConstantsAboveGroupBy.java @@ -89,7 +89,7 @@ public void testRuleDisabledDoesNotFire() p.values(p.variable("COL")))) .addAggregation(p.variable("AVG", DOUBLE), p.rowExpression("avg(COL)")) .singleGroupingSet(p.variable("CONST_COL"), p.variable("COL")))) - .doesNotFire(); + .doesNotFire(); } @Test diff --git a/presto-main-base/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestRedundantLimitRemoval.java b/presto-main-base/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestRedundantLimitRemoval.java index bfac435b79f88..41e54f8e5cbb3 100644 --- a/presto-main-base/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestRedundantLimitRemoval.java +++ b/presto-main-base/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestRedundantLimitRemoval.java @@ -129,6 +129,6 @@ public void testFeatureDisabled() newTester.assertThat(ImmutableSet.of(new RemoveRedundantLimit()), logicalPropertiesProvider) .on("select totalprice from orders o inner join customer c on o.custkey = c.custkey where o.orderkey=10 limit 2") - .validates(plan -> assertNodePresentInPlan(plan, LimitNode.class)); + .validates(plan -> assertNodePresentInPlan(plan, LimitNode.class)); } } diff --git a/presto-main/src/test/java/com/facebook/presto/server/security/TestInternalAuthenticationFilter.java b/presto-main/src/test/java/com/facebook/presto/server/security/TestInternalAuthenticationFilter.java index 3dc7e6f01d3c8..0102cce8a1f95 100644 --- a/presto-main/src/test/java/com/facebook/presto/server/security/TestInternalAuthenticationFilter.java +++ b/presto-main/src/test/java/com/facebook/presto/server/security/TestInternalAuthenticationFilter.java @@ -151,8 +151,7 @@ public Method getResourceMethod() try { method = clazz.getMethod(methodName, parameterTypes); } - catch (NoSuchMethodException e) { - } + catch (NoSuchMethodException e) { } return method; } diff --git a/presto-native-execution/src/checkstyle/presto-checks.xml b/presto-native-execution/src/checkstyle/presto-checks.xml index 767a9bcb5910b..4b85729921537 100644 --- a/presto-native-execution/src/checkstyle/presto-checks.xml +++ b/presto-native-execution/src/checkstyle/presto-checks.xml @@ -169,8 +169,6 @@ - - diff --git a/presto-native-execution/src/test/java/com/facebook/presto/nativeworker/AbstractTestNativeGeneralQueries.java b/presto-native-execution/src/test/java/com/facebook/presto/nativeworker/AbstractTestNativeGeneralQueries.java index abb76fd9a6bbe..fa5c331b84727 100644 --- a/presto-native-execution/src/test/java/com/facebook/presto/nativeworker/AbstractTestNativeGeneralQueries.java +++ b/presto-native-execution/src/test/java/com/facebook/presto/nativeworker/AbstractTestNativeGeneralQueries.java @@ -1788,10 +1788,10 @@ public void testSelectFieldsWithCapitalLetters() ColumnMetadata.builder() .setName("col") .setType(RowType.from(ImmutableList.of( - new RowType.Field(Optional.of("NationKey"), BIGINT), - new RowType.Field(Optional.of("NAME"), VARCHAR), - new RowType.Field(Optional.of("ReGiOnKeY"), BIGINT), - new RowType.Field(Optional.of("commenT"), VARCHAR)))) + new RowType.Field(Optional.of("NationKey"), BIGINT), + new RowType.Field(Optional.of("NAME"), VARCHAR), + new RowType.Field(Optional.of("ReGiOnKeY"), BIGINT), + new RowType.Field(Optional.of("commenT"), VARCHAR)))) .build()), tableProperties); transaction(queryRunner.getTransactionManager(), queryRunner.getAccessControl()) diff --git a/presto-native-execution/src/test/java/com/facebook/presto/spark/PrestoSparkNativeQueryRunnerUtils.java b/presto-native-execution/src/test/java/com/facebook/presto/spark/PrestoSparkNativeQueryRunnerUtils.java index 772a060a53abb..4cb8fe15a1f52 100644 --- a/presto-native-execution/src/test/java/com/facebook/presto/spark/PrestoSparkNativeQueryRunnerUtils.java +++ b/presto-native-execution/src/test/java/com/facebook/presto/spark/PrestoSparkNativeQueryRunnerUtils.java @@ -125,7 +125,7 @@ public static PrestoSparkQueryRunner createHiveRunner( // Add connectors on the native side to make them available during execution. ImmutableMap.Builder> catalogBuilder = ImmutableMap.builder(); catalogBuilder.put("hive", ImmutableMap.of("connector.name", "hive")) - .putAll(additionalCatalogs); + .putAll(additionalCatalogs); PrestoSparkQueryRunner queryRunner = createRunner( "hive", new NativeExecutionModule(), diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotBrokerPageSource.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotBrokerPageSource.java index 42fd3011b700d..82f16ec9a184b 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotBrokerPageSource.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotBrokerPageSource.java @@ -263,9 +263,9 @@ protected void setRows(String query, List blockBuilders, List numServersResponded.asInt()) { throw new PinotException( - PINOT_INSUFFICIENT_SERVER_RESPONSE, - Optional.of(pinotQuery), - String.format("Only %s out of %s servers responded for query %s", numServersResponded.asInt(), numServersQueried.asInt(), pinotQuery)); + PINOT_INSUFFICIENT_SERVER_RESPONSE, + Optional.of(pinotQuery), + String.format("Only %s out of %s servers responded for query %s", numServersResponded.asInt(), numServersQueried.asInt(), pinotQuery)); } JsonNode exceptions = jsonBody.get("exceptions"); if (exceptions != null && exceptions.isArray() && exceptions.size() > 0) { if (exceptions.get(0).get("errorCode").asInt() == 180) { throw new PinotException( - PINOT_UNAUTHENTICATED_EXCEPTION, - Optional.empty(), - "Query authentication failed."); + PINOT_UNAUTHENTICATED_EXCEPTION, + Optional.empty(), + "Query authentication failed."); } // Pinot is known to return exceptions with benign errorcodes like 200 // so we treat any exception as an error throw new PinotException( - PINOT_EXCEPTION, - Optional.of(pinotQuery), - String.format("Query %s encountered exception %s", pinotQuery, exceptions.get(0))); + PINOT_EXCEPTION, + Optional.of(pinotQuery), + String.format("Query %s encountered exception %s", pinotQuery, exceptions.get(0))); } } @@ -389,9 +389,9 @@ public int populateFromQueryResults( JsonNode dataSchema = resultTable.get("dataSchema"); if (dataSchema == null) { throw new PinotException( - PINOT_UNEXPECTED_RESPONSE, - Optional.of(sql), - "Expected data schema in the response"); + PINOT_UNEXPECTED_RESPONSE, + Optional.of(sql), + "Expected data schema in the response"); } JsonNode columnDataTypes = dataSchema.get("columnDataTypes"); JsonNode columnNames = dataSchema.get("columnNames"); @@ -400,17 +400,17 @@ public int populateFromQueryResults( || !columnDataTypes.isArray() || columnDataTypes.size() < blockBuilders.size()) { throw new PinotException( - PINOT_UNEXPECTED_RESPONSE, - Optional.of(sql), - String.format("ColumnDataTypes and results expected for %s, expected %d columnDataTypes but got %d", sql, blockBuilders.size(), columnDataTypes == null ? 0 : columnDataTypes.size())); + PINOT_UNEXPECTED_RESPONSE, + Optional.of(sql), + String.format("ColumnDataTypes and results expected for %s, expected %d columnDataTypes but got %d", sql, blockBuilders.size(), columnDataTypes == null ? 0 : columnDataTypes.size())); } if (columnNames == null || !columnNames.isArray() || columnNames.size() < blockBuilders.size()) { throw new PinotException( - PINOT_UNEXPECTED_RESPONSE, - Optional.of(sql), - String.format("ColumnNames and results expected for %s, expected %d columnNames but got %d", sql, blockBuilders.size(), columnNames == null ? 0 : columnNames.size())); + PINOT_UNEXPECTED_RESPONSE, + Optional.of(sql), + String.format("ColumnNames and results expected for %s, expected %d columnNames but got %d", sql, blockBuilders.size(), columnNames == null ? 0 : columnNames.size())); } JsonNode rows = resultTable.get("rows"); diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPageSourceProvider.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPageSourceProvider.java index 00c8cc8258c42..310a5ec4c1967 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPageSourceProvider.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotPageSourceProvider.java @@ -88,21 +88,21 @@ public ConnectorPageSource createPageSource( switch (pinotSplit.getSplitType()) { case SEGMENT: return new PinotSegmentPageSource( - session, - pinotConfig, - pinotStreamingQueryClient, - pinotSplit, - handles); + session, + pinotConfig, + pinotStreamingQueryClient, + pinotSplit, + handles); case BROKER: return new PinotBrokerPageSource( - pinotConfig, - session, - pinotSplit.getBrokerPinotQuery().get(), - handles, - pinotSplit.getExpectedColumnHandles(), - clusterInfoFetcher, - objectMapper, - brokerAuthenticationProvider); + pinotConfig, + session, + pinotSplit.getBrokerPinotQuery().get(), + handles, + pinotSplit.getExpectedColumnHandles(), + clusterInfoFetcher, + objectMapper, + brokerAuthenticationProvider); default: throw new UnsupportedOperationException("Unknown Pinot split type: " + pinotSplit.getSplitType()); } diff --git a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSegmentPageSource.java b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSegmentPageSource.java index 40ea7598fcb39..863a7e92fe62d 100644 --- a/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSegmentPageSource.java +++ b/presto-pinot-toolkit/src/main/java/com/facebook/presto/pinot/PinotSegmentPageSource.java @@ -210,9 +210,10 @@ public Page getNextPage() } catch (IOException e) { throw new PinotException( - PINOT_DATA_FETCH_EXCEPTION, - split.getSegmentPinotQuery(), - String.format("Encountered Pinot exceptions when fetching data table from Split: < %s >", split), e); + PINOT_DATA_FETCH_EXCEPTION, + split.getSegmentPinotQuery(), + String.format("Encountered Pinot exceptions when fetching data table from Split: < %s >", split), + e); } break; case CommonConstants.Query.Response.ResponseType.METADATA: @@ -223,9 +224,9 @@ public Page getNextPage() return null; default: throw new PinotException( - PINOT_UNEXPECTED_RESPONSE, - split.getSegmentPinotQuery(), - String.format("Encountered Pinot exceptions, unknown response type - %s", responseType)); + PINOT_UNEXPECTED_RESPONSE, + split.getSegmentPinotQuery(), + String.format("Encountered Pinot exceptions, unknown response type - %s", responseType)); } } Page page = fillNextPage(); @@ -246,9 +247,9 @@ private Iterator queryPinot(PinotSplit split) int grpcPort = split.getGrpcPort().orElseThrow(() -> new PinotException(PINOT_INVALID_SEGMENT_QUERY_GENERATED, Optional.empty(), "Expected the segment split to contain the grpc port")); if (grpcPort <= 0) { throw new PinotException( - PINOT_INVALID_SEGMENT_QUERY_GENERATED, - Optional.empty(), - "Expected the grpc port > 0 always"); + PINOT_INVALID_SEGMENT_QUERY_GENERATED, + Optional.empty(), + "Expected the grpc port > 0 always"); } PinotProxyGrpcRequestBuilder grpcRequestBuilder = new PinotProxyGrpcRequestBuilder() .setSegments(split.getSegments()) diff --git a/presto-product-tests/conf/docker/files/presto-cli.sh b/presto-product-tests/conf/docker/files/presto-cli.sh index 21ebea00a7c07..c243126e63c9d 100755 --- a/presto-product-tests/conf/docker/files/presto-cli.sh +++ b/presto-product-tests/conf/docker/files/presto-cli.sh @@ -2,9 +2,4 @@ set -euxo pipefail -echo "java --version" -echo $(java --version) -export JAVA_HOME=/docker/volumes/overridejdk -echo "/docker/volumes/overridejdk/bin/java --version" -echo $(/docker/volumes/overridejdk/bin/java --version) -/docker/volumes/overridejdk/bin/java -jar /docker/volumes/presto-cli/presto-cli-executable.jar ${CLI_ARGUMENTS} "$@" +java -jar /docker/volumes/presto-cli/presto-cli-executable.jar ${CLI_ARGUMENTS} "$@" diff --git a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionConfigModule.java b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionConfigModule.java index 63c3478861615..35f133f00ea72 100644 --- a/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionConfigModule.java +++ b/presto-spark-base/src/main/java/com/facebook/presto/spark/execution/property/NativeExecutionConfigModule.java @@ -52,7 +52,7 @@ protected void configure() bind(new TypeLiteral>>() {}) .annotatedWith( Names.named(NativeExecutionCatalogConfig.NATIVE_EXECUTION_CATALOG_CONFIG)) - .toInstance(catalogConfigs); + .toInstance(catalogConfigs); bind(NativeExecutionSystemConfig.class).in(Scopes.SINGLETON); bind(NativeExecutionCatalogConfig.class).in(Scopes.SINGLETON); diff --git a/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java b/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java index fa31856c9b0f5..8b32d311d8970 100644 --- a/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java +++ b/presto-spark-base/src/test/java/com/facebook/presto/spark/PrestoSparkQueryRunner.java @@ -340,16 +340,16 @@ public PrestoSparkQueryRunner( // Sql-Standard Access Control Checker // needs us to specify our role .setIdentity( - new Identity( - "hive", - Optional.empty(), - ImmutableMap.of(defaultCatalog, - new SelectedRole(Type.ROLE, Optional.of("admin"))), - ImmutableMap.of(), - ImmutableMap.of(), - Optional.empty(), - Optional.empty())) - .build(); + new Identity( + "hive", + Optional.empty(), + ImmutableMap.of(defaultCatalog, + new SelectedRole(Type.ROLE, Optional.of("admin"))), + ImmutableMap.of(), + ImmutableMap.of(), + Optional.empty(), + Optional.empty())) + .build(); transactionManager = injector.getInstance(TransactionManager.class); metadata = injector.getInstance(Metadata.class); diff --git a/src/checkstyle/presto-checks.xml b/src/checkstyle/presto-checks.xml index cb4b6248a22cc..30d4993f631d3 100644 --- a/src/checkstyle/presto-checks.xml +++ b/src/checkstyle/presto-checks.xml @@ -169,8 +169,6 @@ - -