This is an automated email from the ASF dual-hosted git repository.
etudenhoefner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new 674214cb6b Build: Update baseline gradle plugin to 5.58.0 (#10788)
674214cb6b is described below
commit 674214cb6bbc8f6e739245293ba31f9a3d36114e
Author: Piotr Findeisen <[email protected]>
AuthorDate: Fri Aug 2 15:44:46 2024 +0200
Build: Update baseline gradle plugin to 5.58.0 (#10788)
---
baseline.gradle | 10 ++++++++++
build.gradle | 7 +------
core/src/main/java/org/apache/iceberg/StaticDataTask.java | 6 +++++-
.../org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java | 6 +++++-
.../org/apache/iceberg/flink/sink/shuffle/MapAssignment.java | 2 ++
.../org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java | 6 +++++-
.../org/apache/iceberg/flink/sink/shuffle/MapAssignment.java | 2 ++
.../org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java | 6 +++++-
.../org/apache/iceberg/flink/sink/shuffle/MapAssignment.java | 2 ++
9 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/baseline.gradle b/baseline.gradle
index f97b872e93..e3fe602e91 100644
--- a/baseline.gradle
+++ b/baseline.gradle
@@ -91,11 +91,17 @@ subprojects {
'-Xep:CollectionUndefinedEquality:ERROR',
// specific to Palantir - Uses name `log` but we use name `LOG`
'-Xep:ConsistentLoggerName:OFF',
+ // TODO (https://github.com/apache/iceberg/issues/10853) this is a
recently added check. Figure out whether we adjust the code or suppress for good
+ '-Xep:DangerousJavaDeserialization:WARN',
'-Xep:DangerousThreadPoolExecutorUsage:OFF',
// subclasses are not equal
'-Xep:EqualsGetClass:OFF',
// specific to Palantir
'-Xep:FinalClass:OFF',
+ // TODO (https://github.com/apache/iceberg/issues/10854) this is a
recently added check. Figure out whether we adjust the code or suppress for good
+ '-Xep:FormatStringAnnotation:WARN',
+ // TODO (https://github.com/apache/iceberg/issues/10855) this is a
recently added check. Figure out whether we adjust the code or suppress for good
+ '-Xep:ImmutablesReferenceEquality:WARN',
'-Xep:IntLongMath:ERROR',
// prefer method references over lambdas
'-Xep:LambdaMethodReference:ERROR',
@@ -108,6 +114,8 @@ subprojects {
'-Xep:MissingSummary:ERROR',
// Enforce hashCode over hash
'-Xep:ObjectsHashCodeUnnecessaryVarargs:ERROR',
+ // Triggers false-positives whenever relocated @VisibleForTesting is
used
+ '-Xep:PreferCommonAnnotations:OFF',
// specific to Palantir
'-Xep:PreferSafeLoggableExceptions:OFF',
'-Xep:PreferSafeLogger:OFF',
@@ -125,6 +133,8 @@ subprojects {
'-Xep:StringSplitter:ERROR',
'-Xep:TypeParameterShadowing:OFF',
'-Xep:TypeParameterUnusedInFormals:OFF',
+ // Palantir's UnnecessarilyQualified may throw during analysis
+ '-Xep:UnnecessarilyQualified:OFF',
)
}
}
diff --git a/build.gradle b/build.gradle
index a1aef9b37f..60fb5e7830 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,12 +27,7 @@ buildscript {
}
dependencies {
classpath 'io.github.goooler.shadow:shadow-gradle-plugin:8.1.8'
- classpath 'com.palantir.baseline:gradle-baseline-java:4.42.0'
- // com.palantir.baseline:gradle-baseline-java:4.42.0 (the last version
supporting Java 8) pulls
- // in an old version of the errorprone, which doesn't work w/ Gradle 8, so
bump errorpone as
- // well.
- classpath "net.ltgt.gradle:gradle-errorprone-plugin:3.1.0"
-
+ classpath 'com.palantir.baseline:gradle-baseline-java:5.58.0'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.13.0'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
classpath 'me.champeau.jmh:jmh-gradle-plugin:0.7.2'
diff --git a/core/src/main/java/org/apache/iceberg/StaticDataTask.java
b/core/src/main/java/org/apache/iceberg/StaticDataTask.java
index f25ebd49c9..1a396f0bfc 100644
--- a/core/src/main/java/org/apache/iceberg/StaticDataTask.java
+++ b/core/src/main/java/org/apache/iceberg/StaticDataTask.java
@@ -127,7 +127,11 @@ class StaticDataTask implements DataTask {
return metadataFile;
}
- /** @return the table rows before projection */
+ /**
+ * Returns the table rows before projection.
+ *
+ * @return the table rows before projection
+ */
StructLike[] tableRows() {
return rows;
}
diff --git
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
b/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
index a164d83ac3..781bcc6460 100644
---
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
+++
b/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
@@ -98,7 +98,11 @@ class KeyAssignment {
return subtaskWeightsExcludingCloseCost;
}
- /** @return subtask id */
+ /**
+ * Select a subtask for the key.
+ *
+ * @return subtask id
+ */
int select() {
if (assignedSubtasks.size() == 1) {
// only choice. no need to run random number generator.
diff --git
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
b/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
index 0abb030c22..9d8167460a 100644
---
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
+++
b/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
@@ -93,6 +93,8 @@ class MapAssignment {
}
/**
+ * Returns assignment summary for every subtask.
+ *
* @return assignment summary for every subtask. Key is subtaskId. Value
pair is (weight assigned
* to the subtask, number of keys assigned to the subtask)
*/
diff --git
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
index a164d83ac3..781bcc6460 100644
---
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
+++
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
@@ -98,7 +98,11 @@ class KeyAssignment {
return subtaskWeightsExcludingCloseCost;
}
- /** @return subtask id */
+ /**
+ * Select a subtask for the key.
+ *
+ * @return subtask id
+ */
int select() {
if (assignedSubtasks.size() == 1) {
// only choice. no need to run random number generator.
diff --git
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
index 0abb030c22..9d8167460a 100644
---
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
+++
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
@@ -93,6 +93,8 @@ class MapAssignment {
}
/**
+ * Returns assignment summary for every subtask.
+ *
* @return assignment summary for every subtask. Key is subtaskId. Value
pair is (weight assigned
* to the subtask, number of keys assigned to the subtask)
*/
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
index a164d83ac3..781bcc6460 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/KeyAssignment.java
@@ -98,7 +98,11 @@ class KeyAssignment {
return subtaskWeightsExcludingCloseCost;
}
- /** @return subtask id */
+ /**
+ * Select a subtask for the key.
+ *
+ * @return subtask id
+ */
int select() {
if (assignedSubtasks.size() == 1) {
// only choice. no need to run random number generator.
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
index 0abb030c22..9d8167460a 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapAssignment.java
@@ -93,6 +93,8 @@ class MapAssignment {
}
/**
+ * Returns assignment summary for every subtask.
+ *
* @return assignment summary for every subtask. Key is subtaskId. Value
pair is (weight assigned
* to the subtask, number of keys assigned to the subtask)
*/
