This is an automated email from the ASF dual-hosted git repository.
amoghj 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 3825477b01 API, Flink, ORC: Fix implicit `long` casting issues (#10580)
3825477b01 is described below
commit 3825477b0175d0e24960c89815c217f1ff8d2563
Author: Robert Stupp <[email protected]>
AuthorDate: Thu Jul 4 01:36:49 2024 +0200
API, Flink, ORC: Fix implicit `long` casting issues (#10580)
---
.../java/org/apache/iceberg/metrics/TestFixedReservoirHistogram.java | 2 +-
.../main/java/org/apache/iceberg/flink/data/FlinkParquetReaders.java | 4 ++--
.../flink/source/assigner/TestWatermarkBasedSplitAssigner.java | 2 +-
.../main/java/org/apache/iceberg/orc/ExpressionToSearchArgument.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/api/src/test/java/org/apache/iceberg/metrics/TestFixedReservoirHistogram.java
b/api/src/test/java/org/apache/iceberg/metrics/TestFixedReservoirHistogram.java
index 018c2c3b58..f5f47648ec 100644
---
a/api/src/test/java/org/apache/iceberg/metrics/TestFixedReservoirHistogram.java
+++
b/api/src/test/java/org/apache/iceberg/metrics/TestFixedReservoirHistogram.java
@@ -113,7 +113,7 @@ public class TestFixedReservoirHistogram {
try {
barrier.await(30, SECONDS);
for (int i = 1; i <= 100; ++i) {
- histogram.update(threadIndex * samplesPerThread
+ i);
+ histogram.update((long) threadIndex *
samplesPerThread + i);
}
return threadIndex;
} catch (Exception e) {
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetReaders.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetReaders.java
index ad4310a6d1..d0a1974636 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetReaders.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetReaders.java
@@ -422,7 +422,7 @@ public class FlinkParquetReaders {
long value = readLong();
return TimestampData.fromLocalDateTime(
Instant.ofEpochSecond(
- Math.floorDiv(value, 1000_000), Math.floorMod(value,
1000_000) * 1000)
+ Math.floorDiv(value, 1000_000), Math.floorMod(value,
1000_000) * 1000L)
.atOffset(ZoneOffset.UTC)
.toLocalDateTime());
}
@@ -444,7 +444,7 @@ public class FlinkParquetReaders {
long value = readLong();
return TimestampData.fromInstant(
Instant.ofEpochSecond(
- Math.floorDiv(value, 1000_000), Math.floorMod(value, 1000_000) *
1000));
+ Math.floorDiv(value, 1000_000), Math.floorMod(value, 1000_000) *
1000L));
}
@Override
diff --git
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestWatermarkBasedSplitAssigner.java
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestWatermarkBasedSplitAssigner.java
index e1fc63fda9..6c0cbb7333 100644
---
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestWatermarkBasedSplitAssigner.java
+++
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestWatermarkBasedSplitAssigner.java
@@ -123,7 +123,7 @@ public class TestWatermarkBasedSplitAssigner extends
SplitAssignerTestBase {
.mapToObj(
fileNum ->
RandomGenericData.generate(
- SCHEMA, 2, splitNum * filesPerSplit +
fileNum))
+ SCHEMA, 2, (long) splitNum * filesPerSplit
+ fileNum))
.collect(Collectors.toList())))
.collect(Collectors.toList());
}
diff --git
a/orc/src/main/java/org/apache/iceberg/orc/ExpressionToSearchArgument.java
b/orc/src/main/java/org/apache/iceberg/orc/ExpressionToSearchArgument.java
index 2be64044e2..650292302e 100644
--- a/orc/src/main/java/org/apache/iceberg/orc/ExpressionToSearchArgument.java
+++ b/orc/src/main/java/org/apache/iceberg/orc/ExpressionToSearchArgument.java
@@ -332,7 +332,7 @@ class ExpressionToSearchArgument
return Timestamp.from(
Instant.ofEpochSecond(
Math.floorDiv(microsFromEpoch, 1_000_000),
- Math.floorMod(microsFromEpoch, 1_000_000) * 1_000));
+ Math.floorMod(microsFromEpoch, 1_000_000) * 1_000L));
case DECIMAL:
return new HiveDecimalWritable(HiveDecimal.create((BigDecimal)
icebergLiteral, false));
default:
