This is an automated email from the ASF dual-hosted git repository.
blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new b8a637c61a Core, Spark: Fix raw generics usage of ManifestWriter
(#6059)
b8a637c61a is described below
commit b8a637c61a5cd022ffa7d82b7d90965aa635e862
Author: Eduard Tudenhöfner <[email protected]>
AuthorDate: Wed Nov 2 17:03:56 2022 +0100
Core, Spark: Fix raw generics usage of ManifestWriter (#6059)
---
core/src/main/java/org/apache/iceberg/FastAppend.java | 2 +-
.../src/test/java/org/apache/iceberg/TestManifestFileSerialization.java | 2 +-
.../java/org/apache/iceberg/spark/source/TestForwardCompatibility.java | 2 +-
.../src/test/java/org/apache/iceberg/TestManifestFileSerialization.java | 2 +-
.../java/org/apache/iceberg/spark/source/TestForwardCompatibility.java | 2 +-
.../src/test/java/org/apache/iceberg/TestManifestFileSerialization.java | 2 +-
.../java/org/apache/iceberg/spark/source/TestForwardCompatibility.java | 2 +-
.../src/test/java/org/apache/iceberg/TestManifestFileSerialization.java | 2 +-
.../java/org/apache/iceberg/spark/source/TestForwardCompatibility.java | 2 +-
.../src/test/java/org/apache/iceberg/TestManifestFileSerialization.java | 2 +-
.../java/org/apache/iceberg/spark/source/TestForwardCompatibility.java | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/core/src/main/java/org/apache/iceberg/FastAppend.java
b/core/src/main/java/org/apache/iceberg/FastAppend.java
index f3955e15f6..1979f633f5 100644
--- a/core/src/main/java/org/apache/iceberg/FastAppend.java
+++ b/core/src/main/java/org/apache/iceberg/FastAppend.java
@@ -197,7 +197,7 @@ class FastAppend extends SnapshotProducer<AppendFiles>
implements AppendFiles {
}
if (newManifest == null && newFiles.size() > 0) {
- ManifestWriter writer = newManifestWriter(spec);
+ ManifestWriter<DataFile> writer = newManifestWriter(spec);
try {
writer.addAll(newFiles);
} finally {
diff --git
a/spark/v2.4/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
b/spark/v2.4/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
index a20b2d9f05..92a646d386 100644
---
a/spark/v2.4/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
+++
b/spark/v2.4/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
@@ -199,7 +199,7 @@ public class TestManifestFileSerialization {
Assert.assertTrue(manifestFile.delete());
OutputFile outputFile =
FILE_IO.newOutputFile(manifestFile.getCanonicalPath());
- ManifestWriter writer = ManifestFiles.write(SPEC, outputFile);
+ ManifestWriter<DataFile> writer = ManifestFiles.write(SPEC, outputFile);
try {
for (DataFile file : files) {
writer.add(file);
diff --git
a/spark/v2.4/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
b/spark/v2.4/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
index 0237e4d63b..da5677395f 100644
---
a/spark/v2.4/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
+++
b/spark/v2.4/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
@@ -193,7 +193,7 @@ public class TestForwardCompatibility {
.build();
OutputFile manifestFile =
localOutput(FileFormat.AVRO.addExtension(temp.newFile().toString()));
- ManifestWriter manifestWriter = ManifestFiles.write(FAKE_SPEC,
manifestFile);
+ ManifestWriter<DataFile> manifestWriter = ManifestFiles.write(FAKE_SPEC,
manifestFile);
try {
manifestWriter.add(file);
} finally {
diff --git
a/spark/v3.0/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
b/spark/v3.0/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
index a20b2d9f05..92a646d386 100644
---
a/spark/v3.0/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
+++
b/spark/v3.0/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
@@ -199,7 +199,7 @@ public class TestManifestFileSerialization {
Assert.assertTrue(manifestFile.delete());
OutputFile outputFile =
FILE_IO.newOutputFile(manifestFile.getCanonicalPath());
- ManifestWriter writer = ManifestFiles.write(SPEC, outputFile);
+ ManifestWriter<DataFile> writer = ManifestFiles.write(SPEC, outputFile);
try {
for (DataFile file : files) {
writer.add(file);
diff --git
a/spark/v3.0/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
b/spark/v3.0/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
index 585cfc44a2..9ca073ecf3 100644
---
a/spark/v3.0/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
+++
b/spark/v3.0/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
@@ -195,7 +195,7 @@ public class TestForwardCompatibility {
.build();
OutputFile manifestFile =
localOutput(FileFormat.AVRO.addExtension(temp.newFile().toString()));
- ManifestWriter manifestWriter = ManifestFiles.write(FAKE_SPEC,
manifestFile);
+ ManifestWriter<DataFile> manifestWriter = ManifestFiles.write(FAKE_SPEC,
manifestFile);
try {
manifestWriter.add(file);
} finally {
diff --git
a/spark/v3.1/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
b/spark/v3.1/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
index a20b2d9f05..92a646d386 100644
---
a/spark/v3.1/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
+++
b/spark/v3.1/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
@@ -199,7 +199,7 @@ public class TestManifestFileSerialization {
Assert.assertTrue(manifestFile.delete());
OutputFile outputFile =
FILE_IO.newOutputFile(manifestFile.getCanonicalPath());
- ManifestWriter writer = ManifestFiles.write(SPEC, outputFile);
+ ManifestWriter<DataFile> writer = ManifestFiles.write(SPEC, outputFile);
try {
for (DataFile file : files) {
writer.add(file);
diff --git
a/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
b/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
index 585cfc44a2..9ca073ecf3 100644
---
a/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
+++
b/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
@@ -195,7 +195,7 @@ public class TestForwardCompatibility {
.build();
OutputFile manifestFile =
localOutput(FileFormat.AVRO.addExtension(temp.newFile().toString()));
- ManifestWriter manifestWriter = ManifestFiles.write(FAKE_SPEC,
manifestFile);
+ ManifestWriter<DataFile> manifestWriter = ManifestFiles.write(FAKE_SPEC,
manifestFile);
try {
manifestWriter.add(file);
} finally {
diff --git
a/spark/v3.2/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
b/spark/v3.2/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
index a20b2d9f05..92a646d386 100644
---
a/spark/v3.2/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
+++
b/spark/v3.2/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
@@ -199,7 +199,7 @@ public class TestManifestFileSerialization {
Assert.assertTrue(manifestFile.delete());
OutputFile outputFile =
FILE_IO.newOutputFile(manifestFile.getCanonicalPath());
- ManifestWriter writer = ManifestFiles.write(SPEC, outputFile);
+ ManifestWriter<DataFile> writer = ManifestFiles.write(SPEC, outputFile);
try {
for (DataFile file : files) {
writer.add(file);
diff --git
a/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
b/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
index 42d9ac6a79..fe44023590 100644
---
a/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
+++
b/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
@@ -195,7 +195,7 @@ public class TestForwardCompatibility {
.build();
OutputFile manifestFile =
localOutput(FileFormat.AVRO.addExtension(temp.newFile().toString()));
- ManifestWriter manifestWriter = ManifestFiles.write(FAKE_SPEC,
manifestFile);
+ ManifestWriter<DataFile> manifestWriter = ManifestFiles.write(FAKE_SPEC,
manifestFile);
try {
manifestWriter.add(file);
} finally {
diff --git
a/spark/v3.3/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
b/spark/v3.3/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
index a20b2d9f05..92a646d386 100644
---
a/spark/v3.3/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
+++
b/spark/v3.3/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java
@@ -199,7 +199,7 @@ public class TestManifestFileSerialization {
Assert.assertTrue(manifestFile.delete());
OutputFile outputFile =
FILE_IO.newOutputFile(manifestFile.getCanonicalPath());
- ManifestWriter writer = ManifestFiles.write(SPEC, outputFile);
+ ManifestWriter<DataFile> writer = ManifestFiles.write(SPEC, outputFile);
try {
for (DataFile file : files) {
writer.add(file);
diff --git
a/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
b/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
index 42d9ac6a79..fe44023590 100644
---
a/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
+++
b/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java
@@ -195,7 +195,7 @@ public class TestForwardCompatibility {
.build();
OutputFile manifestFile =
localOutput(FileFormat.AVRO.addExtension(temp.newFile().toString()));
- ManifestWriter manifestWriter = ManifestFiles.write(FAKE_SPEC,
manifestFile);
+ ManifestWriter<DataFile> manifestWriter = ManifestFiles.write(FAKE_SPEC,
manifestFile);
try {
manifestWriter.add(file);
} finally {
