HIVE-29239: Upgrade checkstyle to 11.1.0 (#6111)
diff --git a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java
index 6dc92ff..c6e8062 100644
--- a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java
+++ b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java
@@ -1414,12 +1414,11 @@ public List<FieldSchema> acidSelectColumns(org.apache.hadoop.hive.ql.metadata.Ta
case DELETE ->
// TODO: make it configurable whether we want to include the table columns in the select query.
// It might make delete writes faster if we don't have to write out the row object
- ListUtils.union(ACID_VIRTUAL_COLS_AS_FIELD_SCHEMA, table.getCols());
+ ListUtils.union(ACID_VIRTUAL_COLS_AS_FIELD_SCHEMA, table.getCols());
case UPDATE -> shouldOverwrite(table, operation) ?
- ACID_VIRTUAL_COLS_AS_FIELD_SCHEMA :
- ListUtils.union(ACID_VIRTUAL_COLS_AS_FIELD_SCHEMA, table.getCols());
- case MERGE ->
- ACID_VIRTUAL_COLS_AS_FIELD_SCHEMA;
+ ACID_VIRTUAL_COLS_AS_FIELD_SCHEMA :
+ ListUtils.union(ACID_VIRTUAL_COLS_AS_FIELD_SCHEMA, table.getCols());
+ case MERGE -> ACID_VIRTUAL_COLS_AS_FIELD_SCHEMA;
default -> ImmutableList.of();
};
}
@@ -1435,12 +1434,10 @@ public List<FieldSchema> acidSortColumns(org.apache.hadoop.hive.ql.metadata.Tabl
return switch (operation) {
case DELETE -> IcebergTableUtil.isFanoutEnabled(table.getParameters()) ?
EMPTY_ORDERING : POSITION_DELETE_ORDERING;
- case MERGE ->
- POSITION_DELETE_ORDERING;
- default ->
- // For update operations we use the same sort order defined by
- // {@link #createDPContext(HiveConf, org.apache.hadoop.hive.ql.metadata.Table)}
- EMPTY_ORDERING;
+ case MERGE -> POSITION_DELETE_ORDERING;
+ // For update operations we use the same sort order defined by
+ // {@link #createDPContext(HiveConf, org.apache.hadoop.hive.ql.metadata.Table)}
+ default -> EMPTY_ORDERING;
};
}
diff --git a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/IcebergTableUtil.java b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/IcebergTableUtil.java
index 0ce4e25..e0f70b8 100644
--- a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/IcebergTableUtil.java
+++ b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/IcebergTableUtil.java
@@ -544,7 +544,7 @@ public static List<String> getPartitionNames(Table table, Map<String, String> pa
expression, false);
return e.getValue().isPartitioned() &&
resEval.residualFor(e.getKey()).isEquivalentTo(Expressions.alwaysTrue()) &&
- (e.getValue().specId() == table.spec().specId() || !latestSpecOnly);
+ (e.getValue().specId() == table.spec().specId() || !latestSpecOnly);
}).transform(e -> e.getValue().partitionToPath(e.getKey())).toSortedList(
Comparator.naturalOrder());
diff --git a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/compaction/evaluator/amoro/TableIdentifier.java b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/compaction/evaluator/amoro/TableIdentifier.java
index 6bcdcec..4cf216e 100644
--- a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/compaction/evaluator/amoro/TableIdentifier.java
+++ b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/compaction/evaluator/amoro/TableIdentifier.java
@@ -353,15 +353,15 @@ public boolean equals(TableIdentifier that) {
public int hashCode() {
int hashCode = 1;
- hashCode = hashCode * 8191 + ((isSetCatalog()) ? 131071 : 524287);
+ hashCode = hashCode * 8191 + (isSetCatalog() ? 131071 : 524287);
if (isSetCatalog())
hashCode = hashCode * 8191 + catalog.hashCode();
- hashCode = hashCode * 8191 + ((isSetDatabase()) ? 131071 : 524287);
+ hashCode = hashCode * 8191 + (isSetDatabase() ? 131071 : 524287);
if (isSetDatabase())
hashCode = hashCode * 8191 + database.hashCode();
- hashCode = hashCode * 8191 + ((isSetTableName()) ? 131071 : 524287);
+ hashCode = hashCode * 8191 + (isSetTableName() ? 131071 : 524287);
if (isSetTableName())
hashCode = hashCode * 8191 + tableName.hashCode();
diff --git a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/writer/HiveFileWriterFactory.java b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/writer/HiveFileWriterFactory.java
index 588a7b3..7f106f2 100644
--- a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/writer/HiveFileWriterFactory.java
+++ b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/writer/HiveFileWriterFactory.java
@@ -138,15 +138,15 @@ Builder positionDeleteRowSchema(Schema newPositionDeleteRowSchema) {
HiveFileWriterFactory build() {
return new HiveFileWriterFactory(
- table,
- dataFileFormat,
- dataSchema,
- null,
- deleteFileFormat,
- null,
- null,
- null,
- positionDeleteRowSchema);
+ table,
+ dataFileFormat,
+ dataSchema,
+ null,
+ deleteFileFormat,
+ null,
+ null,
+ null,
+ positionDeleteRowSchema);
}
}
}
diff --git a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/writer/HiveIcebergWriterBase.java b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/writer/HiveIcebergWriterBase.java
index e9e4bfd3..f797c37 100644
--- a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/writer/HiveIcebergWriterBase.java
+++ b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/writer/HiveIcebergWriterBase.java
@@ -129,11 +129,10 @@ static PartitioningWriter<PositionDelete<Record>, DeleteWriteResult> newDeleteWr
if (context.useDVs()) {
return new PartitioningDVWriter<>(files, previousDeleteLoader);
} else if (inputOrdered && rewritableDeletes == null) {
- return new ClusteredPositionDeleteWriter<>(
- writers, files, io, targetFileSize, deleteGranularity);
+ return new ClusteredPositionDeleteWriter<>(writers, files, io, targetFileSize, deleteGranularity);
} else {
return new FanoutPositionOnlyDeleteWriter<>(
- writers, files, io, targetFileSize, deleteGranularity, previousDeleteLoader);
+ writers, files, io, targetFileSize, deleteGranularity, previousDeleteLoader);
}
}
diff --git a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/mapreduce/AbstractIcebergRecordReader.java b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/mapreduce/AbstractIcebergRecordReader.java
index 4a9c898..3f57223 100644
--- a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/mapreduce/AbstractIcebergRecordReader.java
+++ b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/mapreduce/AbstractIcebergRecordReader.java
@@ -74,8 +74,8 @@ private static Schema readSchema(Configuration conf, Table table, boolean caseSe
readSchema = table.schema();
if (selectedColumns != null) {
- readSchema =
- caseSensitive ? readSchema.select(selectedColumns) : readSchema.caseInsensitiveSelect(selectedColumns);
+ readSchema = caseSensitive ?
+ readSchema.select(selectedColumns) : readSchema.caseInsensitiveSelect(selectedColumns);
}
if (InputFormatConfig.fetchVirtualColumns(conf)) {
diff --git a/pom.xml b/pom.xml
index 0b6e318..5b20fc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,7 @@
<datanucleus-core.version>6.0.10</datanucleus-core.version>
<datanucleus-jdo.version>3.2.0-release</datanucleus-jdo.version>
<datanucleus-rdbms.version>6.0.10</datanucleus-rdbms.version>
+ <checkstyle.version>11.1.0</checkstyle.version>
<commons-cli.version>1.5.0</commons-cli.version>
<commons-codec.version>1.15</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
@@ -1551,6 +1552,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven.checkstyle.plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checkstyle.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 7ae7e82..7264c2f 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -65,6 +65,7 @@
<!-- Dependency versions -->
<antlr.version>4.9.3</antlr.version>
<apache-directory-server.version>2.0.0-M24</apache-directory-server.version>
+ <checkstyle.version>11.1.0</checkstyle.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons-dbcp2.version>2.12.0</commons-dbcp2.version>
<datasketches.version>2.0.0</datasketches.version>
@@ -587,6 +588,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven.checkstyle.plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checkstyle.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/storage-api/pom.xml b/storage-api/pom.xml
index 1868ea4..376fff5 100644
--- a/storage-api/pom.xml
+++ b/storage-api/pom.xml
@@ -26,6 +26,7 @@
<name>Hive Storage API</name>
<inceptionYear>2008</inceptionYear>
<properties>
+ <checkstyle.version>11.1.0</checkstyle.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<guava.version>22.0</guava.version>
@@ -171,6 +172,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven.checkstyle.plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checkstyle.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
