Skip to content

Commit 831b4ea

Browse files
authored
Core: Change removal of deprecations to 1.12.0 (#14392)
1 parent 69b4191 commit 831b4ea

File tree

13 files changed

+22
-21
lines changed

13 files changed

+22
-21
lines changed

core/src/main/java/org/apache/iceberg/LocationProviders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private static String getAndCheckLegacyLocation(Map<String, String> properties,
8787
if (value != null && DEPRECATED_PROPERTIES.contains(key)) {
8888
throw new IllegalArgumentException(
8989
String.format(
90-
"Property '%s' has been deprecated and will be removed in 2.0, use '%s' instead.",
90+
"Property '%s' has been deprecated and will be removed in 2.0.0, use '%s' instead.",
9191
key, TableProperties.WRITE_DATA_LOCATION));
9292
}
9393

core/src/main/java/org/apache/iceberg/MetricsConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public static MetricsConfig forPositionDelete() {
8484
* Creates a metrics config from table configuration.
8585
*
8686
* @param props table configuration
87-
* @deprecated use {@link MetricsConfig#forTable(Table)}
87+
* @deprecated use {@link MetricsConfig#forTable(Table)}. Will be removed in 2.0.0
8888
*/
8989
@Deprecated
9090
public static MetricsConfig fromProperties(Map<String, String> props) {

core/src/main/java/org/apache/iceberg/SystemConfigs.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private SystemConfigs() {}
8181
Integer::parseUnsignedInt);
8282

8383
/**
84-
* @deprecated will be removed in 2.0.0; use name mapping instead
84+
* @deprecated will be removed in 1.12.0; use name mapping instead
8585
*/
8686
@Deprecated
8787
public static final ConfigEntry<Boolean> NETFLIX_UNSAFE_PARQUET_ID_FALLBACK_ENABLED =
@@ -91,7 +91,7 @@ private SystemConfigs() {}
9191
true,
9292
s -> {
9393
LOG.warn(
94-
"Fallback ID assignment in Parquet is UNSAFE and will be removed in 2.0.0. Use name mapping instead.");
94+
"Fallback ID assignment in Parquet is UNSAFE and will be removed in 1.12.0. Use name mapping instead.");
9595
return Boolean.parseBoolean(s);
9696
});
9797

core/src/main/java/org/apache/iceberg/SystemProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/**
2222
* Configuration properties that are controlled by Java system properties.
2323
*
24-
* @deprecated Use {@link SystemConfigs} instead; will be removed in 2.0.0
24+
* @deprecated Use {@link SystemConfigs} instead; will be removed in 1.12.0
2525
*/
2626
@Deprecated
2727
public class SystemProperties {

core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public static Schema pruneColumns(Schema schema, Set<Integer> selectedIds) {
129129
}
130130

131131
/**
132-
* @deprecated will be removed in 2.0.0; use applyNameMapping and pruneColumns(Schema, Set)
132+
* @deprecated will be removed in 1.12.0; use applyNameMapping and pruneColumns(Schema, Set)
133133
* instead.
134134
*/
135135
@Deprecated

core/src/main/java/org/apache/iceberg/data/avro/RawDecoder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static <D> RawDecoder<D> create(
6464
* schema used to decode buffers. The {@code writeSchema} must be the schema that was used to
6565
* encode all buffers decoded by this class.
6666
*
67-
* @deprecated will be removed in 2.0.0; use {@link #create(org.apache.iceberg.Schema, Function,
67+
* @deprecated will be removed in 1.12.0; use {@link #create(org.apache.iceberg.Schema, Function,
6868
* Schema)} instead
6969
*/
7070
@Deprecated

core/src/main/java/org/apache/iceberg/encryption/StandardEncryptionManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private TransientEncryptionState(KeyManagementClient kmsClient, List<EncryptedKe
8181
private transient volatile SecureRandom lazyRNG = null;
8282

8383
/**
84-
* @deprecated will be removed in 2.0.
84+
* @deprecated will be removed in 1.12.0.
8585
*/
8686
@Deprecated
8787
public StandardEncryptionManager(
@@ -141,7 +141,7 @@ private SecureRandom workerRNG() {
141141
}
142142

143143
/**
144-
* @deprecated will be removed in 2.0.
144+
* @deprecated will be removed in 1.12.0.
145145
*/
146146
@Deprecated
147147
public ByteBuffer wrapKey(ByteBuffer secretKey) {
@@ -153,7 +153,7 @@ public ByteBuffer wrapKey(ByteBuffer secretKey) {
153153
}
154154

155155
/**
156-
* @deprecated will be removed in 2.0.
156+
* @deprecated will be removed in 1.12.0.
157157
*/
158158
@Deprecated
159159
public ByteBuffer unwrapKey(ByteBuffer wrappedSecretKey) {

core/src/main/java/org/apache/iceberg/io/ContentCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public void invalidate(String key) {
140140
}
141141

142142
/**
143-
* @deprecated since 1.7.0, will be removed in 2.0.0; This method does only best-effort
143+
* @deprecated since 1.7.0, will be removed in 1.12.0; This method does only best-effort
144144
* invalidation and is susceptible to a race condition. If the caller changed the state that
145145
* could be cached (perhaps files on the storage) and calls this method, there is no guarantee
146146
* that the cache will not contain stale entries some time after this method returns.

core/src/main/java/org/apache/iceberg/rest/RESTSessionCatalog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public class RESTSessionCatalog extends BaseViewSessionCatalog
109109
private static final String DEFAULT_FILE_IO_IMPL = "org.apache.iceberg.io.ResolvingFileIO";
110110

111111
/**
112-
* @deprecated will be removed in 2.0.0. Use {@link
112+
* @deprecated will be removed in 1.12.0. Use {@link
113113
* org.apache.iceberg.rest.RESTCatalogProperties#PAGE_SIZE} instead.
114114
*/
115115
@Deprecated public static final String REST_PAGE_SIZE = "rest-page-size";

core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ private static Iterable<Long> toIds(Iterable<Snapshot> snapshots) {
283283
}
284284

285285
/**
286-
* @deprecated will be removed in 2.0.0, use {@link #newFilesBetween(Long, long, Function,
286+
* @deprecated will be removed in 1.12.0, use {@link #newFilesBetween(Long, long, Function,
287287
* FileIO)} instead.
288288
*/
289289
@Deprecated

0 commit comments

Comments
 (0)