You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2021/12/02 21:00:44 UTC
[iceberg] branch master updated: Build: Add missing @Override annotations (#3654)
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 d166f6d Build: Add missing @Override annotations (#3654)
d166f6d is described below
commit d166f6dcf9c29e8a2ca2376a687c30b2e90bf501
Author: Piotr Findeisen <pi...@gmail.com>
AuthorDate: Thu Dec 2 22:00:36 2021 +0100
Build: Add missing @Override annotations (#3654)
Just to reduce warnings output from the build.
---
api/src/main/java/org/apache/iceberg/io/FileIO.java | 1 +
.../test/java/org/apache/iceberg/TestIncrementalDataTableScan.java | 1 +
core/src/test/java/org/apache/iceberg/TestSplitPlanning.java | 1 +
data/src/test/java/org/apache/iceberg/io/TestAppenderFactory.java | 1 +
data/src/test/java/org/apache/iceberg/io/TestBaseTaskWriter.java | 1 +
.../src/test/java/org/apache/iceberg/io/TestFileWriterFactory.java | 1 +
.../org/apache/iceberg/io/TestGenericSortedPosDeleteWriter.java | 1 +
.../test/java/org/apache/iceberg/io/TestPartitioningWriters.java | 1 +
.../test/java/org/apache/iceberg/io/TestPositionDeltaWriters.java | 1 +
.../test/java/org/apache/iceberg/io/TestRollingFileWriters.java | 1 +
.../java/org/apache/iceberg/io/TestTaskEqualityDeltaWriter.java | 1 +
.../test/java/org/apache/iceberg/flink/TestFlinkCatalogTable.java | 1 +
.../org/apache/iceberg/flink/TestFlinkCatalogTablePartitions.java | 1 +
.../src/test/java/org/apache/iceberg/flink/TestFlinkTableSink.java | 2 ++
.../apache/iceberg/flink/actions/TestRewriteDataFilesAction.java | 2 ++
.../java/org/apache/iceberg/flink/sink/TestDeltaTaskWriter.java | 1 +
.../java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java | 1 +
.../org/apache/iceberg/flink/sink/TestIcebergFilesCommitter.java | 1 +
.../java/org/apache/iceberg/flink/source/TestStreamScanSql.java | 2 ++
mr/src/test/java/org/apache/iceberg/mr/hive/TestTables.java | 5 +++++
.../src/test/java/org/apache/iceberg/nessie/TestNessieTable.java | 2 ++
.../jmh/java/org/apache/iceberg/spark/source/WritersBenchmark.java | 1 +
.../spark/data/parquet/vectorized/TestParquetVectorizedReads.java | 7 +++++++
23 files changed, 37 insertions(+)
diff --git a/api/src/main/java/org/apache/iceberg/io/FileIO.java b/api/src/main/java/org/apache/iceberg/io/FileIO.java
index 70ef865..6bb84ba 100644
--- a/api/src/main/java/org/apache/iceberg/io/FileIO.java
+++ b/api/src/main/java/org/apache/iceberg/io/FileIO.java
@@ -74,6 +74,7 @@ public interface FileIO extends Serializable, Closeable {
* Calling this method is only required when this FileIO instance is no longer expected to be used,
* and the resources it holds need to be explicitly released to avoid resource leaks.
*/
+ @Override
default void close() {
}
}
diff --git a/core/src/test/java/org/apache/iceberg/TestIncrementalDataTableScan.java b/core/src/test/java/org/apache/iceberg/TestIncrementalDataTableScan.java
index 1f9b93f..48793a9 100644
--- a/core/src/test/java/org/apache/iceberg/TestIncrementalDataTableScan.java
+++ b/core/src/test/java/org/apache/iceberg/TestIncrementalDataTableScan.java
@@ -86,6 +86,7 @@ public class TestIncrementalDataTableScan extends TableTestBase {
IncrementalScanEvent lastEvent = null;
+ @Override
public void notify(IncrementalScanEvent event) {
this.lastEvent = event;
}
diff --git a/core/src/test/java/org/apache/iceberg/TestSplitPlanning.java b/core/src/test/java/org/apache/iceberg/TestSplitPlanning.java
index f211ac9..4985b3e 100644
--- a/core/src/test/java/org/apache/iceberg/TestSplitPlanning.java
+++ b/core/src/test/java/org/apache/iceberg/TestSplitPlanning.java
@@ -62,6 +62,7 @@ public class TestSplitPlanning extends TableTestBase {
super(formatVersion);
}
+ @Override
@Before
public void setupTable() throws IOException {
File tableDir = temp.newFolder();
diff --git a/data/src/test/java/org/apache/iceberg/io/TestAppenderFactory.java b/data/src/test/java/org/apache/iceberg/io/TestAppenderFactory.java
index 978f866..73fbcf2 100644
--- a/data/src/test/java/org/apache/iceberg/io/TestAppenderFactory.java
+++ b/data/src/test/java/org/apache/iceberg/io/TestAppenderFactory.java
@@ -83,6 +83,7 @@ public abstract class TestAppenderFactory<T> extends TableTestBase {
this.partitioned = partitioned;
}
+ @Override
@Before
public void setupTable() throws Exception {
this.tableDir = temp.newFolder();
diff --git a/data/src/test/java/org/apache/iceberg/io/TestBaseTaskWriter.java b/data/src/test/java/org/apache/iceberg/io/TestBaseTaskWriter.java
index 89356b2..39771fa 100644
--- a/data/src/test/java/org/apache/iceberg/io/TestBaseTaskWriter.java
+++ b/data/src/test/java/org/apache/iceberg/io/TestBaseTaskWriter.java
@@ -67,6 +67,7 @@ public class TestBaseTaskWriter extends TableTestBase {
this.format = FileFormat.valueOf(fileFormat.toUpperCase(Locale.ENGLISH));
}
+ @Override
@Before
public void setupTable() throws IOException {
this.tableDir = temp.newFolder();
diff --git a/data/src/test/java/org/apache/iceberg/io/TestFileWriterFactory.java b/data/src/test/java/org/apache/iceberg/io/TestFileWriterFactory.java
index 786b542..5577b4e 100644
--- a/data/src/test/java/org/apache/iceberg/io/TestFileWriterFactory.java
+++ b/data/src/test/java/org/apache/iceberg/io/TestFileWriterFactory.java
@@ -100,6 +100,7 @@ public abstract class TestFileWriterFactory<T> extends WriterTestBase<T> {
return fileFormat;
}
+ @Override
@Before
public void setupTable() throws Exception {
this.tableDir = temp.newFolder();
diff --git a/data/src/test/java/org/apache/iceberg/io/TestGenericSortedPosDeleteWriter.java b/data/src/test/java/org/apache/iceberg/io/TestGenericSortedPosDeleteWriter.java
index 1806ecc..8a9d383 100644
--- a/data/src/test/java/org/apache/iceberg/io/TestGenericSortedPosDeleteWriter.java
+++ b/data/src/test/java/org/apache/iceberg/io/TestGenericSortedPosDeleteWriter.java
@@ -74,6 +74,7 @@ public class TestGenericSortedPosDeleteWriter extends TableTestBase {
this.format = FileFormat.valueOf(fileFormat.toUpperCase(Locale.ENGLISH));
}
+ @Override
@Before
public void setupTable() throws IOException {
this.tableDir = temp.newFolder();
diff --git a/data/src/test/java/org/apache/iceberg/io/TestPartitioningWriters.java b/data/src/test/java/org/apache/iceberg/io/TestPartitioningWriters.java
index a72113c..ca9e603 100644
--- a/data/src/test/java/org/apache/iceberg/io/TestPartitioningWriters.java
+++ b/data/src/test/java/org/apache/iceberg/io/TestPartitioningWriters.java
@@ -67,6 +67,7 @@ public abstract class TestPartitioningWriters<T> extends WriterTestBase<T> {
return fileFormat;
}
+ @Override
@Before
public void setupTable() throws Exception {
this.tableDir = temp.newFolder();
diff --git a/data/src/test/java/org/apache/iceberg/io/TestPositionDeltaWriters.java b/data/src/test/java/org/apache/iceberg/io/TestPositionDeltaWriters.java
index 76e1b19..2485937 100644
--- a/data/src/test/java/org/apache/iceberg/io/TestPositionDeltaWriters.java
+++ b/data/src/test/java/org/apache/iceberg/io/TestPositionDeltaWriters.java
@@ -64,6 +64,7 @@ public abstract class TestPositionDeltaWriters<T> extends WriterTestBase<T> {
return fileFormat;
}
+ @Override
@Before
public void setupTable() throws Exception {
this.tableDir = temp.newFolder();
diff --git a/data/src/test/java/org/apache/iceberg/io/TestRollingFileWriters.java b/data/src/test/java/org/apache/iceberg/io/TestRollingFileWriters.java
index a62ac3e..efa756f 100644
--- a/data/src/test/java/org/apache/iceberg/io/TestRollingFileWriters.java
+++ b/data/src/test/java/org/apache/iceberg/io/TestRollingFileWriters.java
@@ -72,6 +72,7 @@ public abstract class TestRollingFileWriters<T> extends WriterTestBase<T> {
return fileFormat;
}
+ @Override
@Before
public void setupTable() throws Exception {
this.tableDir = temp.newFolder();
diff --git a/data/src/test/java/org/apache/iceberg/io/TestTaskEqualityDeltaWriter.java b/data/src/test/java/org/apache/iceberg/io/TestTaskEqualityDeltaWriter.java
index c928fbe..c59a757 100644
--- a/data/src/test/java/org/apache/iceberg/io/TestTaskEqualityDeltaWriter.java
+++ b/data/src/test/java/org/apache/iceberg/io/TestTaskEqualityDeltaWriter.java
@@ -83,6 +83,7 @@ public class TestTaskEqualityDeltaWriter extends TableTestBase {
this.format = FileFormat.valueOf(fileFormat.toUpperCase(Locale.ENGLISH));
}
+ @Override
@Before
public void setupTable() throws IOException {
this.tableDir = temp.newFolder();
diff --git a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTable.java b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTable.java
index 7b552fa..4ecfcb0 100644
--- a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTable.java
+++ b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTable.java
@@ -68,6 +68,7 @@ public class TestFlinkCatalogTable extends FlinkCatalogTestBase {
super(catalogName, baseNamepace);
}
+ @Override
@Before
public void before() {
super.before();
diff --git a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTablePartitions.java b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTablePartitions.java
index 0c11fea..b6c4812 100644
--- a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTablePartitions.java
+++ b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTablePartitions.java
@@ -65,6 +65,7 @@ public class TestFlinkCatalogTablePartitions extends FlinkCatalogTestBase {
config.put(CACHE_ENABLED, String.valueOf(cacheEnabled));
}
+ @Override
@Before
public void before() {
super.before();
diff --git a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkTableSink.java b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkTableSink.java
index eb37e30..9cce4a0 100644
--- a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkTableSink.java
+++ b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/TestFlinkTableSink.java
@@ -111,6 +111,7 @@ public class TestFlinkTableSink extends FlinkCatalogTestBase {
return tEnv;
}
+ @Override
@Before
public void before() {
super.before();
@@ -121,6 +122,7 @@ public class TestFlinkTableSink extends FlinkCatalogTestBase {
icebergTable = validationCatalog.loadTable(TableIdentifier.of(icebergNamespace, TABLE_NAME));
}
+ @Override
@After
public void clean() {
sql("DROP TABLE IF EXISTS %s.%s", flinkDatabase, TABLE_NAME);
diff --git a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/actions/TestRewriteDataFilesAction.java b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/actions/TestRewriteDataFilesAction.java
index b4fb243..397bd6e 100644
--- a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/actions/TestRewriteDataFilesAction.java
+++ b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/actions/TestRewriteDataFilesAction.java
@@ -99,6 +99,7 @@ public class TestRewriteDataFilesAction extends FlinkCatalogTestBase {
@Rule
public TemporaryFolder temp = new TemporaryFolder();
+ @Override
@Before
public void before() {
super.before();
@@ -117,6 +118,7 @@ public class TestRewriteDataFilesAction extends FlinkCatalogTestBase {
TABLE_NAME_PARTITIONED));
}
+ @Override
@After
public void clean() {
sql("DROP TABLE IF EXISTS %s.%s", flinkDatabase, TABLE_NAME_UNPARTITIONED);
diff --git a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestDeltaTaskWriter.java b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestDeltaTaskWriter.java
index e96e929..058058f 100644
--- a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestDeltaTaskWriter.java
+++ b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestDeltaTaskWriter.java
@@ -75,6 +75,7 @@ public class TestDeltaTaskWriter extends TableTestBase {
this.format = FileFormat.valueOf(fileFormat.toUpperCase(Locale.ENGLISH));
}
+ @Override
@Before
public void setupTable() throws IOException {
this.tableDir = temp.newFolder();
diff --git a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
index 9f5f1a6..90b1a6d 100644
--- a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
+++ b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
@@ -113,6 +113,7 @@ public class TestFlinkIcebergSinkV2 extends TableTestBase {
this.partitioned = partitioned;
}
+ @Override
@Before
public void setupTable() throws IOException {
this.tableDir = temp.newFolder();
diff --git a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergFilesCommitter.java b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergFilesCommitter.java
index 69e027d..135fa84 100644
--- a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergFilesCommitter.java
+++ b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergFilesCommitter.java
@@ -94,6 +94,7 @@ public class TestIcebergFilesCommitter extends TableTestBase {
this.format = FileFormat.valueOf(format.toUpperCase(Locale.ENGLISH));
}
+ @Override
@Before
public void setupTable() throws IOException {
flinkManifestFolder = temp.newFolder();
diff --git a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamScanSql.java b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamScanSql.java
index c0dbc10..e658442 100644
--- a/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamScanSql.java
+++ b/flink/v1.13/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamScanSql.java
@@ -85,6 +85,7 @@ public class TestStreamScanSql extends FlinkCatalogTestBase {
return tEnv;
}
+ @Override
@Before
public void before() {
super.before();
@@ -93,6 +94,7 @@ public class TestStreamScanSql extends FlinkCatalogTestBase {
sql("USE %s", DATABASE);
}
+ @Override
@After
public void clean() {
sql("DROP TABLE IF EXISTS %s.%s", flinkDatabase, TABLE);
diff --git a/mr/src/test/java/org/apache/iceberg/mr/hive/TestTables.java b/mr/src/test/java/org/apache/iceberg/mr/hive/TestTables.java
index 775ccf1..48a62e3 100644
--- a/mr/src/test/java/org/apache/iceberg/mr/hive/TestTables.java
+++ b/mr/src/test/java/org/apache/iceberg/mr/hive/TestTables.java
@@ -374,6 +374,7 @@ abstract class TestTables {
);
}
+ @Override
public String locationForCreateTableSQL(TableIdentifier identifier) {
return "LOCATION '" + warehouseLocation + TestTables.tablePath(identifier) + "' ";
}
@@ -455,23 +456,27 @@ abstract class TestTables {
enum TestTableType {
HADOOP_TABLE {
+ @Override
public TestTables instance(Configuration conf, TemporaryFolder temporaryFolder, String catalogName) {
return new HadoopTestTables(conf, temporaryFolder);
}
},
HADOOP_CATALOG {
+ @Override
public TestTables instance(Configuration conf, TemporaryFolder temporaryFolder, String catalogName)
throws IOException {
return new HadoopCatalogTestTables(conf, temporaryFolder, catalogName);
}
},
CUSTOM_CATALOG {
+ @Override
public TestTables instance(Configuration conf, TemporaryFolder temporaryFolder, String catalogName)
throws IOException {
return new CustomCatalogTestTables(conf, temporaryFolder, catalogName);
}
},
HIVE_CATALOG {
+ @Override
public TestTables instance(Configuration conf, TemporaryFolder temporaryFolder, String catalogName) {
return new HiveTestTables(conf, temporaryFolder, catalogName);
}
diff --git a/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java b/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java
index 1641bc0..01ad228 100644
--- a/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java
+++ b/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java
@@ -77,12 +77,14 @@ public class TestNessieTable extends BaseTestIceberg {
super(BRANCH);
}
+ @Override
@BeforeEach
public void beforeEach() throws IOException {
super.beforeEach();
this.tableLocation = new Path(catalog.createTable(TABLE_IDENTIFIER, schema).location());
}
+ @Override
@AfterEach
public void afterEach() throws Exception {
// drop the table data
diff --git a/spark/v3.2/spark/src/jmh/java/org/apache/iceberg/spark/source/WritersBenchmark.java b/spark/v3.2/spark/src/jmh/java/org/apache/iceberg/spark/source/WritersBenchmark.java
index a8521de..93ee557 100644
--- a/spark/v3.2/spark/src/jmh/java/org/apache/iceberg/spark/source/WritersBenchmark.java
+++ b/spark/v3.2/spark/src/jmh/java/org/apache/iceberg/spark/source/WritersBenchmark.java
@@ -80,6 +80,7 @@ public abstract class WritersBenchmark extends IcebergSourceBenchmark {
private PartitionSpec unpartitionedSpec;
private PartitionSpec partitionedSpec;
+ @Override
protected abstract FileFormat fileFormat();
@Setup
diff --git a/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/data/parquet/vectorized/TestParquetVectorizedReads.java b/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/data/parquet/vectorized/TestParquetVectorizedReads.java
index 48dcc94..19ffd02 100644
--- a/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/data/parquet/vectorized/TestParquetVectorizedReads.java
+++ b/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/data/parquet/vectorized/TestParquetVectorizedReads.java
@@ -147,36 +147,43 @@ public class TestParquetVectorizedReads extends AvroDataTest {
}
}
+ @Override
@Test
@Ignore
public void testArray() {
}
+ @Override
@Test
@Ignore
public void testArrayOfStructs() {
}
+ @Override
@Test
@Ignore
public void testMap() {
}
+ @Override
@Test
@Ignore
public void testNumericMapKey() {
}
+ @Override
@Test
@Ignore
public void testComplexMapKey() {
}
+ @Override
@Test
@Ignore
public void testMapOfStructs() {
}
+ @Override
@Test
@Ignore
public void testMixedTypes() {