diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DistinctAggregationStrategyChooser.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DistinctAggregationStrategyChooser.java index 5f34790157b..bbf01ea7736 100644 --- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DistinctAggregationStrategyChooser.java +++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/DistinctAggregationStrategyChooser.java @@ -217,9 +217,9 @@ private static boolean isAdditionalReadOverheadTooExpensive(AggregationNode aggr double subqueriesTotalDataSize = additionalColumnsDataSize * subqueryCount + distinctInputDataSize; return isNaN(subqueriesTotalDataSize) || - isNaN(singleTableScanDataSize) || - // we would read more than 50% more data - subqueriesTotalDataSize / singleTableScanDataSize > 1.5; + isNaN(singleTableScanDataSize) || + // we would read more than 50% more data + subqueriesTotalDataSize / singleTableScanDataSize > 1.5; } private static boolean isSelective(FilterNode filterNode, StatsProvider statsProvider) diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/GatherPartialTopN.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/GatherPartialTopN.java index 29fad33512f..a6c19769397 100644 --- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/GatherPartialTopN.java +++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/GatherPartialTopN.java @@ -68,16 +68,16 @@ public class GatherPartialTopN private static boolean isGatherLocalExchange(PlanNode source) { return source instanceof ExchangeNode exchange - && exchange.getScope().equals(LOCAL) - && exchange.getType().equals(GATHER); + && exchange.getScope().equals(LOCAL) + && exchange.getType().equals(GATHER); } private static boolean isGatherRemoteExchange(ExchangeNode exchangeNode) { return exchangeNode.getScope().equals(REMOTE) - && exchangeNode.getType().equals(GATHER) - // non-empty orderingScheme means it's a merging exchange - && exchangeNode.getOrderingScheme().isEmpty(); + && exchangeNode.getType().equals(GATHER) + // non-empty orderingScheme means it's a merging exchange + && exchangeNode.getOrderingScheme().isEmpty(); } @Override diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java index a310cdf7ce5..54f68d00934 100644 --- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java +++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java @@ -72,8 +72,7 @@ public class MultipleDistinctAggregationToMarkDistinct public static boolean canUseMarkDistinct(AggregationNode aggregationNode) { - return hasNoDistinctWithFilterOrMask(aggregationNode) && - (hasMultipleDistincts(aggregationNode) || hasMixedDistinctAndNonDistincts(aggregationNode)); + return hasNoDistinctWithFilterOrMask(aggregationNode) && (hasMultipleDistincts(aggregationNode) || hasMixedDistinctAndNonDistincts(aggregationNode)); } private static boolean hasNoDistinctWithFilterOrMask(AggregationNode aggregationNode) diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/OptimizeMixedDistinctAggregations.java b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/OptimizeMixedDistinctAggregations.java index abfd1e0c381..42677a106d7 100644 --- a/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/OptimizeMixedDistinctAggregations.java +++ b/core/trino-main/src/main/java/io/trino/sql/planner/iterative/rule/OptimizeMixedDistinctAggregations.java @@ -88,11 +88,11 @@ public static boolean canUsePreAggregate(AggregationNode aggregationNode) { // single distinct can be supported in this rule, but it is already supported by SingleDistinctAggregationToGroupBy, which produces simpler plans (without group-id) return (hasMultipleDistincts(aggregationNode) || hasMixedDistinctAndNonDistincts(aggregationNode)) && - allDistinctAggregationsHaveSingleArgument(aggregationNode) && - noFilters(aggregationNode) && - noMasks(aggregationNode) && - !aggregationNode.hasOrderings() && - aggregationNode.getStep().equals(SINGLE); + allDistinctAggregationsHaveSingleArgument(aggregationNode) && + noFilters(aggregationNode) && + noMasks(aggregationNode) && + !aggregationNode.hasOrderings() && + aggregationNode.getStep().equals(SINGLE); } public static boolean hasMultipleDistincts(AggregationNode aggregationNode) diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/CatalogVersion.java b/core/trino-spi/src/main/java/io/trino/spi/connector/CatalogVersion.java index 934b53b7b9d..475f8f417fe 100644 --- a/core/trino-spi/src/main/java/io/trino/spi/connector/CatalogVersion.java +++ b/core/trino-spi/src/main/java/io/trino/spi/connector/CatalogVersion.java @@ -44,9 +44,9 @@ public record CatalogVersion(String version) private static boolean isAllowedCharacter(char c) { return ('0' <= c && c <= '9') || - ('a' <= c && c <= 'z') || - c == '_' || - c == '-'; + ('a' <= c && c <= 'z') || + c == '_' || + c == '-'; } @JsonValue diff --git a/core/trino-spi/src/main/java/io/trino/spi/security/PrivilegeInfo.java b/core/trino-spi/src/main/java/io/trino/spi/security/PrivilegeInfo.java index 87e71ec4ea9..911c9608554 100644 --- a/core/trino-spi/src/main/java/io/trino/spi/security/PrivilegeInfo.java +++ b/core/trino-spi/src/main/java/io/trino/spi/security/PrivilegeInfo.java @@ -53,6 +53,6 @@ public boolean equals(Object o) } PrivilegeInfo privilegeInfo = (PrivilegeInfo) o; return privilege == privilegeInfo.privilege && - grantOption == privilegeInfo.grantOption; + grantOption == privilegeInfo.grantOption; } } diff --git a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonSerializer.java b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonSerializer.java index 73b38b8da52..d811bbf12b8 100644 --- a/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonSerializer.java +++ b/lib/trino-hive-formats/src/main/java/io/trino/hive/formats/line/openxjson/OpenXJsonSerializer.java @@ -269,18 +269,18 @@ public static boolean isSupportedType(Type type) } return BOOLEAN.equals(type) || - BIGINT.equals(type) || - INTEGER.equals(type) || - SMALLINT.equals(type) || - TINYINT.equals(type) || - type instanceof DecimalType || - REAL.equals(type) || - DOUBLE.equals(type) || - DATE.equals(type) || - type instanceof TimestampType || - VARBINARY.equals(type) || - type instanceof VarcharType || - type instanceof CharType; + BIGINT.equals(type) || + INTEGER.equals(type) || + SMALLINT.equals(type) || + TINYINT.equals(type) || + type instanceof DecimalType || + REAL.equals(type) || + DOUBLE.equals(type) || + DATE.equals(type) || + type instanceof TimestampType || + VARBINARY.equals(type) || + type instanceof VarcharType || + type instanceof CharType; } private static boolean isStructuralType(Type type) diff --git a/lib/trino-orc/src/main/java/io/trino/orc/DiskRange.java b/lib/trino-orc/src/main/java/io/trino/orc/DiskRange.java index 1717f47ec24..c50b136edac 100644 --- a/lib/trino-orc/src/main/java/io/trino/orc/DiskRange.java +++ b/lib/trino-orc/src/main/java/io/trino/orc/DiskRange.java @@ -84,7 +84,7 @@ public boolean equals(Object obj) } DiskRange other = (DiskRange) obj; return this.offset == other.offset && - this.length == other.length; + this.length == other.length; } @Override diff --git a/lib/trino-orc/src/test/java/io/trino/orc/OrcTester.java b/lib/trino-orc/src/test/java/io/trino/orc/OrcTester.java index ce70f975d77..56ce0e74aea 100644 --- a/lib/trino-orc/src/test/java/io/trino/orc/OrcTester.java +++ b/lib/trino-orc/src/test/java/io/trino/orc/OrcTester.java @@ -680,13 +680,13 @@ public static void writeOrcColumnTrino(File outputFile, CompressionKind compress } if (TIME_MICROS.equals(mappedType)) { return Optional.of(new OrcType( - LONG, - ImmutableList.of(), - ImmutableList.of(), - Optional.empty(), - Optional.empty(), - Optional.empty(), - ImmutableMap.of(ICEBERG_LONG_TYPE, "TIME"))); + LONG, + ImmutableList.of(), + ImmutableList.of(), + Optional.empty(), + Optional.empty(), + Optional.empty(), + ImmutableMap.of(ICEBERG_LONG_TYPE, "TIME"))); } return Optional.empty(); })); diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/ChunkKey.java b/lib/trino-parquet/src/main/java/io/trino/parquet/ChunkKey.java index 473ec7ee6a0..597dd398fbb 100644 --- a/lib/trino-parquet/src/main/java/io/trino/parquet/ChunkKey.java +++ b/lib/trino-parquet/src/main/java/io/trino/parquet/ChunkKey.java @@ -45,7 +45,7 @@ public boolean equals(Object obj) } ChunkKey other = (ChunkKey) obj; return this.column == other.column && - this.rowGroup == other.rowGroup; + this.rowGroup == other.rowGroup; } @Override diff --git a/lib/trino-parquet/src/main/java/io/trino/parquet/DiskRange.java b/lib/trino-parquet/src/main/java/io/trino/parquet/DiskRange.java index 14ad2fcb7ad..d0bebae3686 100644 --- a/lib/trino-parquet/src/main/java/io/trino/parquet/DiskRange.java +++ b/lib/trino-parquet/src/main/java/io/trino/parquet/DiskRange.java @@ -84,7 +84,7 @@ public boolean equals(Object obj) } DiskRange other = (DiskRange) obj; return this.offset == other.offset && - this.length == other.length; + this.length == other.length; } @Override diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java index f83d2433a5b..c1db6b9d1f9 100644 --- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java +++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryMetadata.java @@ -377,8 +377,8 @@ private static boolean isBigLakeTable(TableDefinition tableDefinition) //BigLake tables are external with connectionId that don't have objectMetadata (ObjectTable discriminator) and their uri starts with gs:// (OMNI table discriminator) List sourceUris = externalTableDefinition.getSourceUris(); return !isNullOrEmpty(externalTableDefinition.getConnectionId()) && - isNullOrEmpty(externalTableDefinition.getObjectMetadata()) && - (sourceUris != null && sourceUris.stream().allMatch(uri -> uri.startsWith("gs://"))); + isNullOrEmpty(externalTableDefinition.getObjectMetadata()) && + (sourceUris != null && sourceUris.stream().allMatch(uri -> uri.startsWith("gs://"))); } return false; } diff --git a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ExchangeS3Config.java b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ExchangeS3Config.java index 839506563b8..0d8b93bc288 100644 --- a/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ExchangeS3Config.java +++ b/plugin/trino-exchange-filesystem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ExchangeS3Config.java @@ -310,6 +310,6 @@ public ExchangeS3Config setSseKmsKeyId(String sseKmsKeyId) public boolean isSseConfigValid() { return sseType == KMS && getSseKmsKeyId().isPresent() || - sseType != KMS && getSseKmsKeyId().isEmpty(); + sseType != KMS && getSseKmsKeyId().isEmpty(); } } diff --git a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSplit.java b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSplit.java index 55055a33aa6..7343a155b2a 100644 --- a/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSplit.java +++ b/plugin/trino-tpcds/src/main/java/io/trino/plugin/tpcds/TpcdsSplit.java @@ -106,8 +106,8 @@ public boolean equals(Object obj) } TpcdsSplit other = (TpcdsSplit) obj; return this.totalParts == other.totalParts && - this.partNumber == other.partNumber && - this.noSexism == other.noSexism; + this.partNumber == other.partNumber && + this.noSexism == other.noSexism; } @Override diff --git a/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchSplit.java b/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchSplit.java index bb97b2967b5..40e644fa023 100644 --- a/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchSplit.java +++ b/plugin/trino-tpch/src/main/java/io/trino/plugin/tpch/TpchSplit.java @@ -89,7 +89,7 @@ public boolean equals(Object obj) } TpchSplit other = (TpchSplit) obj; return this.totalParts == other.totalParts && - this.partNumber == other.partNumber; + this.partNumber == other.partNumber; } @Override diff --git a/pom.xml b/pom.xml index acb5bc43541..ef2afbceae3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.airlift airbase - 306 + 307 io.trino @@ -188,7 +188,6 @@ 1.12.0 1.12.791 4.17.0 - 10.23.1 7.8.0 119 1.24 @@ -209,7 +208,7 @@ ${dep.plugin.surefire.version} 3.25.8 3.26.1 - 2.2.37 + 2.2.38 2.3.2 2.0.74.Final 202 @@ -301,7 +300,7 @@ software.amazon.awssdk bom - 2.34.5 + 2.34.6 pom import diff --git a/testing/trino-testing/src/main/java/io/trino/testing/tpch/TpchScaledTable.java b/testing/trino-testing/src/main/java/io/trino/testing/tpch/TpchScaledTable.java index bce141daeb7..1b588042b78 100644 --- a/testing/trino-testing/src/main/java/io/trino/testing/tpch/TpchScaledTable.java +++ b/testing/trino-testing/src/main/java/io/trino/testing/tpch/TpchScaledTable.java @@ -55,6 +55,6 @@ public boolean equals(Object obj) } TpchScaledTable other = (TpchScaledTable) obj; return Objects.equals(this.tableName, other.tableName) && - this.scaleFactor == other.scaleFactor; + this.scaleFactor == other.scaleFactor; } }