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 3d3e565a79 Core: Remove deprecated APIs scheduled for removal in 1.6.0
(#10501)
3d3e565a79 is described below
commit 3d3e565a793280f2925114ada9d853ea304d6b9b
Author: Piotr Findeisen <[email protected]>
AuthorDate: Mon Jun 17 08:40:04 2024 +0200
Core: Remove deprecated APIs scheduled for removal in 1.6.0 (#10501)
---
.palantir/revapi.yml | 32 ++++++++++++++++++++++
.../main/java/org/apache/iceberg/DataFiles.java | 6 ----
.../java/org/apache/iceberg/ReachableFileUtil.java | 19 -------------
.../encryption/PlaintextEncryptionManager.java | 4 +--
.../org/apache/iceberg/rest/auth/OAuth2Util.java | 18 ------------
.../iceberg/flink/source/reader/ReaderUtil.java | 2 +-
.../source/reader/TestIcebergSourceReader.java | 2 +-
.../source/reader/TestRowDataReaderFunction.java | 2 +-
.../iceberg/flink/source/reader/ReaderUtil.java | 2 +-
.../source/reader/TestIcebergSourceReader.java | 2 +-
.../source/reader/TestRowDataReaderFunction.java | 2 +-
.../iceberg/flink/source/reader/ReaderUtil.java | 2 +-
.../source/reader/TestIcebergSourceReader.java | 2 +-
.../source/reader/TestRowDataReaderFunction.java | 2 +-
.../apache/iceberg/nessie/NessieIcebergClient.java | 13 ---------
.../org/apache/iceberg/spark/SparkTableUtil.java | 12 --------
16 files changed, 42 insertions(+), 80 deletions(-)
diff --git a/.palantir/revapi.yml b/.palantir/revapi.yml
index 808a192990..3018840b45 100644
--- a/.palantir/revapi.yml
+++ b/.palantir/revapi.yml
@@ -1024,6 +1024,38 @@ acceptedBreaks:
old: "class org.apache.iceberg.types.Types.NestedField"
new: "class org.apache.iceberg.types.Types.NestedField"
justification: "new Constructor added"
+ org.apache.iceberg:iceberg-core:
+ - code: "java.method.visibilityReduced"
+ old: "method void
org.apache.iceberg.encryption.PlaintextEncryptionManager::<init>()"
+ new: "method void
org.apache.iceberg.encryption.PlaintextEncryptionManager::<init>()"
+ justification: "Deprecations for 1.6.0 release"
+ - code: "java.element.noLongerDeprecated"
+ old: "method void
org.apache.iceberg.encryption.PlaintextEncryptionManager::<init>()"
+ new: "method void
org.apache.iceberg.encryption.PlaintextEncryptionManager::<init>()"
+ justification: "Constructor became private as part of deprecations
cleanup for 1.6.0 release"
+ - code: "java.element.noLongerDeprecated"
+ old: "method void
org.apache.iceberg.rest.auth.OAuth2Util.AuthSession::<init>(java.util.Map<java.lang.String,\
+ \ java.lang.String>, java.lang.String, java.lang.String,
java.lang.String,\
+ \ java.lang.String)"
+ new: "method void
org.apache.iceberg.rest.auth.OAuth2Util.AuthSession::<init>(java.util.Map<java.lang.String,\
+ \ java.lang.String>, org.apache.iceberg.rest.auth.AuthConfig)"
+ justification: "This is actually a removal of a deprecated constructor
as part\
+ \ of deprecations for 1.6.0 release, apparently mis-reported by
rev-api"
+ - code: "java.method.numberOfParametersChanged"
+ old: "method void
org.apache.iceberg.rest.auth.OAuth2Util.AuthSession::<init>(java.util.Map<java.lang.String,\
+ \ java.lang.String>, java.lang.String, java.lang.String,
java.lang.String,\
+ \ java.lang.String)"
+ new: "method void
org.apache.iceberg.rest.auth.OAuth2Util.AuthSession::<init>(java.util.Map<java.lang.String,\
+ \ java.lang.String>, org.apache.iceberg.rest.auth.AuthConfig)"
+ justification: "This is actually a removal of a deprecated constructor
as part\
+ \ of deprecations for 1.6.0 release, apparently mis-reported by
rev-api"
+ - code: "java.method.removed"
+ old: "method java.util.List<java.lang.String>
org.apache.iceberg.ReachableFileUtil::statisticsFilesLocations(org.apache.iceberg.Table,\
+ \ java.util.function.Predicate<org.apache.iceberg.StatisticsFile>)"
+ justification: "Deprecations for 1.6.0 release"
+ - code: "java.method.removed"
+ old: "method org.apache.iceberg.DataFiles.Builder
org.apache.iceberg.DataFiles.Builder::withEqualityFieldIds(java.util.List<java.lang.Integer>)"
+ justification: "Deprecations for 1.6.0 release"
apache-iceberg-0.14.0:
org.apache.iceberg:iceberg-api:
- code: "java.class.defaultSerializationChanged"
diff --git a/core/src/main/java/org/apache/iceberg/DataFiles.java
b/core/src/main/java/org/apache/iceberg/DataFiles.java
index 34f830be4d..5c7c1a646c 100644
--- a/core/src/main/java/org/apache/iceberg/DataFiles.java
+++ b/core/src/main/java/org/apache/iceberg/DataFiles.java
@@ -299,12 +299,6 @@ public class DataFiles {
return this;
}
- /** @deprecated since 1.5.0, will be removed in 1.6.0; must not be set for
data files. */
- @Deprecated
- public Builder withEqualityFieldIds(List<Integer> equalityIds) {
- throw new UnsupportedOperationException("Equality field IDs must not be
set for data files");
- }
-
public Builder withEncryptionKeyMetadata(ByteBuffer newKeyMetadata) {
this.keyMetadata = newKeyMetadata;
return this;
diff --git a/core/src/main/java/org/apache/iceberg/ReachableFileUtil.java
b/core/src/main/java/org/apache/iceberg/ReachableFileUtil.java
index ee1ff28e03..fc53d6b795 100644
--- a/core/src/main/java/org/apache/iceberg/ReachableFileUtil.java
+++ b/core/src/main/java/org/apache/iceberg/ReachableFileUtil.java
@@ -21,7 +21,6 @@ package org.apache.iceberg;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
-import java.util.stream.Collectors;
import org.apache.hadoop.fs.Path;
import org.apache.iceberg.TableMetadata.MetadataLogEntry;
import org.apache.iceberg.hadoop.Util;
@@ -142,24 +141,6 @@ public class ReachableFileUtil {
return statisticsFilesLocationsForSnapshots(table, null);
}
- /**
- * Returns locations of statistics files for a table matching the given
predicate .
- *
- * @param table table for which statistics files needs to be listed
- * @param predicate predicate for filtering the statistics files
- * @return the location of statistics files
- * @deprecated since 1.5.0, will be removed in 1.6.0; use the {@code
- * statisticsFilesLocationsForSnapshots(table, snapshotIds)} instead.
- */
- @Deprecated
- public static List<String> statisticsFilesLocations(
- Table table, Predicate<StatisticsFile> predicate) {
- return table.statisticsFiles().stream()
- .filter(predicate)
- .map(StatisticsFile::path)
- .collect(Collectors.toList());
- }
-
/**
* Returns locations of all statistics files for a table matching the given
snapshot IDs.
*
diff --git
a/core/src/main/java/org/apache/iceberg/encryption/PlaintextEncryptionManager.java
b/core/src/main/java/org/apache/iceberg/encryption/PlaintextEncryptionManager.java
index 336ebe9c0a..6a5e1877e8 100644
---
a/core/src/main/java/org/apache/iceberg/encryption/PlaintextEncryptionManager.java
+++
b/core/src/main/java/org/apache/iceberg/encryption/PlaintextEncryptionManager.java
@@ -27,9 +27,7 @@ public class PlaintextEncryptionManager implements
EncryptionManager {
private static final EncryptionManager INSTANCE = new
PlaintextEncryptionManager();
private static final Logger LOG =
LoggerFactory.getLogger(PlaintextEncryptionManager.class);
- /** @deprecated will be removed in 1.6.0. use {@link #instance()} instead. */
- @Deprecated
- public PlaintextEncryptionManager() {}
+ private PlaintextEncryptionManager() {}
public static EncryptionManager instance() {
return INSTANCE;
diff --git a/core/src/main/java/org/apache/iceberg/rest/auth/OAuth2Util.java
b/core/src/main/java/org/apache/iceberg/rest/auth/OAuth2Util.java
index 2283aba7d0..76386027c6 100644
--- a/core/src/main/java/org/apache/iceberg/rest/auth/OAuth2Util.java
+++ b/core/src/main/java/org/apache/iceberg/rest/auth/OAuth2Util.java
@@ -465,24 +465,6 @@ public class OAuth2Util {
this.config = config;
}
- /** @deprecated since 1.5.0, will be removed in 1.6.0 */
- @Deprecated
- public AuthSession(
- Map<String, String> baseHeaders,
- String token,
- String tokenType,
- String credential,
- String scope) {
- this(
- baseHeaders,
- AuthConfig.builder()
- .token(token)
- .tokenType(tokenType)
- .credential(credential)
- .scope(scope)
- .build());
- }
-
/** @deprecated since 1.6.0, will be removed in 1.7.0 */
@Deprecated
public AuthSession(
diff --git
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
b/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
index 2a2503ef24..f06d9b83bc 100644
---
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
+++
b/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
@@ -92,7 +92,7 @@ public class ReaderUtil {
TestFixtures.SCHEMA, TestFixtures.SCHEMA, null, true,
Collections.emptyList()),
combinedTask,
new HadoopFileIO(new org.apache.hadoop.conf.Configuration()),
- new PlaintextEncryptionManager());
+ PlaintextEncryptionManager.instance());
}
public static List<List<Record>> createRecordBatchList(
diff --git
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
b/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
index 88234c6112..790c3bba8a 100644
---
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
+++
b/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
@@ -165,7 +165,7 @@ public class TestIcebergSourceReader {
null,
true,
new HadoopFileIO(new org.apache.hadoop.conf.Configuration()),
- new PlaintextEncryptionManager(),
+ PlaintextEncryptionManager.instance(),
Collections.emptyList());
return new IcebergSourceReader<>(
SerializableRecordEmitter.defaultEmitter(),
diff --git
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
b/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
index d063ad7f4a..764215e904 100644
---
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
+++
b/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
@@ -56,7 +56,7 @@ public class TestRowDataReaderFunction extends
ReaderFunctionTestBase<RowData> {
null,
true,
new HadoopFileIO(new org.apache.hadoop.conf.Configuration()),
- new PlaintextEncryptionManager(),
+ PlaintextEncryptionManager.instance(),
Collections.emptyList());
}
diff --git
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
index 2a2503ef24..f06d9b83bc 100644
---
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
+++
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
@@ -92,7 +92,7 @@ public class ReaderUtil {
TestFixtures.SCHEMA, TestFixtures.SCHEMA, null, true,
Collections.emptyList()),
combinedTask,
new HadoopFileIO(new org.apache.hadoop.conf.Configuration()),
- new PlaintextEncryptionManager());
+ PlaintextEncryptionManager.instance());
}
public static List<List<Record>> createRecordBatchList(
diff --git
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
index f19d57083b..b9af6aca28 100644
---
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
+++
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
@@ -165,7 +165,7 @@ public class TestIcebergSourceReader {
null,
true,
new HadoopFileIO(new org.apache.hadoop.conf.Configuration()),
- new PlaintextEncryptionManager(),
+ PlaintextEncryptionManager.instance(),
Collections.emptyList());
return new IcebergSourceReader<>(
SerializableRecordEmitter.defaultEmitter(),
diff --git
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
index d063ad7f4a..764215e904 100644
---
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
+++
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
@@ -56,7 +56,7 @@ public class TestRowDataReaderFunction extends
ReaderFunctionTestBase<RowData> {
null,
true,
new HadoopFileIO(new org.apache.hadoop.conf.Configuration()),
- new PlaintextEncryptionManager(),
+ PlaintextEncryptionManager.instance(),
Collections.emptyList());
}
diff --git
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
index 2a2503ef24..f06d9b83bc 100644
---
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
+++
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
@@ -92,7 +92,7 @@ public class ReaderUtil {
TestFixtures.SCHEMA, TestFixtures.SCHEMA, null, true,
Collections.emptyList()),
combinedTask,
new HadoopFileIO(new org.apache.hadoop.conf.Configuration()),
- new PlaintextEncryptionManager());
+ PlaintextEncryptionManager.instance());
}
public static List<List<Record>> createRecordBatchList(
diff --git
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
index f19d57083b..b9af6aca28 100644
---
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
+++
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
@@ -165,7 +165,7 @@ public class TestIcebergSourceReader {
null,
true,
new HadoopFileIO(new org.apache.hadoop.conf.Configuration()),
- new PlaintextEncryptionManager(),
+ PlaintextEncryptionManager.instance(),
Collections.emptyList());
return new IcebergSourceReader<>(
SerializableRecordEmitter.defaultEmitter(),
diff --git
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
index d063ad7f4a..764215e904 100644
---
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
+++
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
@@ -56,7 +56,7 @@ public class TestRowDataReaderFunction extends
ReaderFunctionTestBase<RowData> {
null,
true,
new HadoopFileIO(new org.apache.hadoop.conf.Configuration()),
- new PlaintextEncryptionManager(),
+ PlaintextEncryptionManager.instance(),
Collections.emptyList());
}
diff --git
a/nessie/src/main/java/org/apache/iceberg/nessie/NessieIcebergClient.java
b/nessie/src/main/java/org/apache/iceberg/nessie/NessieIcebergClient.java
index 583e45a263..3fc38e436f 100644
--- a/nessie/src/main/java/org/apache/iceberg/nessie/NessieIcebergClient.java
+++ b/nessie/src/main/java/org/apache/iceberg/nessie/NessieIcebergClient.java
@@ -581,19 +581,6 @@ public class NessieIcebergClient implements AutoCloseable {
return false;
}
- /** @deprecated will be removed after 1.5.0 */
- @Deprecated
- public void commitTable(
- TableMetadata base,
- TableMetadata metadata,
- String newMetadataLocation,
- IcebergTable expectedContent,
- ContentKey key)
- throws NessieConflictException, NessieNotFoundException {
- String contentId = expectedContent == null ? null :
expectedContent.getId();
- commitTable(base, metadata, newMetadataLocation, contentId, key);
- }
-
public void commitTable(
TableMetadata base,
TableMetadata metadata,
diff --git
a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/SparkTableUtil.java
b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/SparkTableUtil.java
index 2da0cf7099..47690656b4 100644
---
a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/SparkTableUtil.java
+++
b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/SparkTableUtil.java
@@ -694,18 +694,6 @@ public class SparkTableUtil {
.run(item -> io.deleteFile(item.path()));
}
- /**
- * Loads a metadata table.
- *
- * @deprecated since 0.14.0, will be removed in 0.15.0; use {@link
- * #loadMetadataTable(SparkSession, Table, MetadataTableType)}.
- */
- @Deprecated
- public static Dataset<Row> loadCatalogMetadataTable(
- SparkSession spark, Table table, MetadataTableType type) {
- return loadMetadataTable(spark, table, type);
- }
-
public static Dataset<Row> loadMetadataTable(
SparkSession spark, Table table, MetadataTableType type) {
return loadMetadataTable(spark, table, type, ImmutableMap.of());
