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 79620e1980 Core, Flink: Fix build warnings (#10899)
79620e1980 is described below
commit 79620e198009fa243c278c66fd442d107b46206a
Author: Naveen Kumar <[email protected]>
AuthorDate: Fri Aug 9 20:21:00 2024 +0530
Core, Flink: Fix build warnings (#10899)
---
core/src/main/java/org/apache/iceberg/BaseEntriesTable.java | 2 +-
.../main/java/org/apache/iceberg/actions/SizeBasedFileRewriter.java | 3 ++-
.../org/apache/iceberg/rest/ExponentialHttpRequestRetryStrategy.java | 2 +-
core/src/main/java/org/apache/iceberg/util/Pair.java | 5 -----
core/src/main/java/org/apache/iceberg/util/ParallelIterable.java | 1 +
core/src/main/java/org/apache/iceberg/util/Tasks.java | 4 +++-
core/src/main/java/org/apache/iceberg/view/BaseViewOperations.java | 1 +
.../iceberg/flink/sink/shuffle/MapRangePartitionerBenchmark.java | 3 ++-
8 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/core/src/main/java/org/apache/iceberg/BaseEntriesTable.java
b/core/src/main/java/org/apache/iceberg/BaseEntriesTable.java
index f4019d688c..526bb42ea6 100644
--- a/core/src/main/java/org/apache/iceberg/BaseEntriesTable.java
+++ b/core/src/main/java/org/apache/iceberg/BaseEntriesTable.java
@@ -262,7 +262,7 @@ abstract class BaseEntriesTable extends BaseMetadataTable {
return ref.fieldId() == DataFile.CONTENT.fieldId();
}
- private <T> boolean contentMatch(Integer fileContentId) {
+ private boolean contentMatch(Integer fileContentId) {
if (FileContent.DATA.id() == fileContentId) {
return ManifestContent.DATA.id() == manifestContentId;
} else if (FileContent.EQUALITY_DELETES.id() == fileContentId
diff --git
a/core/src/main/java/org/apache/iceberg/actions/SizeBasedFileRewriter.java
b/core/src/main/java/org/apache/iceberg/actions/SizeBasedFileRewriter.java
index fb3c27220c..cea7003c1a 100644
--- a/core/src/main/java/org/apache/iceberg/actions/SizeBasedFileRewriter.java
+++ b/core/src/main/java/org/apache/iceberg/actions/SizeBasedFileRewriter.java
@@ -229,7 +229,8 @@ public abstract class SizeBasedFileRewriter<T extends
ContentScanTask<F>, F exte
// the remainder file is of a valid size for this rewrite so keep it
return numFilesWithRemainder;
- } else if (avgFileSizeWithoutRemainder < Math.min(1.1 * targetFileSize,
writeMaxFileSize())) {
+ } else if (avgFileSizeWithoutRemainder
+ < Math.min(1.1 * targetFileSize, (double) writeMaxFileSize())) {
// if the reminder is distributed amongst other files,
// the average file size will be no more than 10% bigger than the target
file size
// so round down and distribute remainder amongst other files
diff --git
a/core/src/main/java/org/apache/iceberg/rest/ExponentialHttpRequestRetryStrategy.java
b/core/src/main/java/org/apache/iceberg/rest/ExponentialHttpRequestRetryStrategy.java
index aadb97bc71..263b3c305a 100644
---
a/core/src/main/java/org/apache/iceberg/rest/ExponentialHttpRequestRetryStrategy.java
+++
b/core/src/main/java/org/apache/iceberg/rest/ExponentialHttpRequestRetryStrategy.java
@@ -149,7 +149,7 @@ class ExponentialHttpRequestRetryStrategy implements
HttpRequestRetryStrategy {
}
}
- int delayMillis = 1000 * (int) Math.min(Math.pow(2.0, (long) execCount -
1), 64.0);
+ int delayMillis = 1000 * (int) Math.min(Math.pow(2.0, (long) execCount -
1.0), 64.0);
int jitter = ThreadLocalRandom.current().nextInt(Math.max(1, (int)
(delayMillis * 0.1)));
return TimeValue.ofMilliseconds(delayMillis + jitter);
diff --git a/core/src/main/java/org/apache/iceberg/util/Pair.java
b/core/src/main/java/org/apache/iceberg/util/Pair.java
index bd3a934f6f..e36321c8e2 100644
--- a/core/src/main/java/org/apache/iceberg/util/Pair.java
+++ b/core/src/main/java/org/apache/iceberg/util/Pair.java
@@ -58,11 +58,6 @@ public class Pair<X, Y> implements IndexedRecord,
SpecificData.SchemaConstructab
private X first;
private Y second;
- /** Constructor used by Avro */
- private Pair(Schema schema) {
- this.schema = schema;
- }
-
private Pair(X first, Y second) {
this.first = first;
this.second = second;
diff --git a/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java
b/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java
index 16fa6f3d85..27cd96a397 100644
--- a/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java
+++ b/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java
@@ -101,6 +101,7 @@ public class ParallelIterable<T> extends CloseableGroup
implements CloseableIter
}
@Override
+ @SuppressWarnings("FutureReturnValueIgnored")
public void close() {
// close first, avoid new task submit
this.closed.set(true);
diff --git a/core/src/main/java/org/apache/iceberg/util/Tasks.java
b/core/src/main/java/org/apache/iceberg/util/Tasks.java
index 02d2b83431..14804e0407 100644
--- a/core/src/main/java/org/apache/iceberg/util/Tasks.java
+++ b/core/src/main/java/org/apache/iceberg/util/Tasks.java
@@ -450,7 +450,9 @@ public class Tasks {
}
int delayMs =
- (int) Math.min(minSleepTimeMs * Math.pow(scaleFactor, attempt -
1), maxSleepTimeMs);
+ (int)
+ Math.min(
+ minSleepTimeMs * Math.pow(scaleFactor, attempt - 1),
(double) maxSleepTimeMs);
int jitter = ThreadLocalRandom.current().nextInt(Math.max(1, (int)
(delayMs * 0.1)));
LOG.warn("Retrying task after failure: {}", e.getMessage(), e);
diff --git a/core/src/main/java/org/apache/iceberg/view/BaseViewOperations.java
b/core/src/main/java/org/apache/iceberg/view/BaseViewOperations.java
index 18b452f983..df96b90eb7 100644
--- a/core/src/main/java/org/apache/iceberg/view/BaseViewOperations.java
+++ b/core/src/main/java/org/apache/iceberg/view/BaseViewOperations.java
@@ -102,6 +102,7 @@ public abstract class BaseViewOperations extends
BaseMetastoreOperations impleme
}
@Override
+ @SuppressWarnings("ImmutablesReferenceEquality")
public void commit(ViewMetadata base, ViewMetadata metadata) {
// if the metadata is already out of date, reject it
if (base != current()) {
diff --git
a/flink/v1.20/flink/src/jmh/java/org/apache/iceberg/flink/sink/shuffle/MapRangePartitionerBenchmark.java
b/flink/v1.20/flink/src/jmh/java/org/apache/iceberg/flink/sink/shuffle/MapRangePartitionerBenchmark.java
index 007b423e59..592e7ff162 100644
---
a/flink/v1.20/flink/src/jmh/java/org/apache/iceberg/flink/sink/shuffle/MapRangePartitionerBenchmark.java
+++
b/flink/v1.20/flink/src/jmh/java/org/apache/iceberg/flink/sink/shuffle/MapRangePartitionerBenchmark.java
@@ -18,6 +18,7 @@
*/
package org.apache.iceberg.flink.sink.shuffle;
+import java.nio.charset.StandardCharsets;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
@@ -139,7 +140,7 @@ public class MapRangePartitionerBenchmark {
buffer[i] = (byte)
CHARS.charAt(ThreadLocalRandom.current().nextInt(CHARS.length()));
}
- return prefix + new String(buffer);
+ return prefix + new String(buffer, StandardCharsets.UTF_8);
}
/** find the index where weightsUDF[index] < weight && weightsUDF[index+1]
>= weight */
