Skip to content

Core: Change removal of deprecations to 1.12.0 #14392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Core: Change removal of deprecations to 1.12.0 #14392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/LocationProviders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private static String getAndCheckLegacyLocation(Map<String, String> properties,
if (value != null && DEPRECATED_PROPERTIES.contains(key)) {
throw new IllegalArgumentException(
String.format(
"Property '%s' has been deprecated and will be removed in 2.0, use '%s' instead.",
"Property '%s' has been deprecated and will be removed in 1.12.0, use '%s' instead.",
key, TableProperties.WRITE_DATA_LOCATION));
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/MetricsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public static MetricsConfig forPositionDelete() {
* Creates a metrics config from table configuration.
*
* @param props table configuration
* @deprecated use {@link MetricsConfig#forTable(Table)}
* @deprecated use {@link MetricsConfig#forTable(Table)}. Will be removed in 1.12.0
*/
@Deprecated
public static MetricsConfig fromProperties(Map<String, String> props) {
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/apache/iceberg/SystemConfigs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private SystemConfigs() {}
Integer::parseUnsignedInt);

/**
* @deprecated will be removed in 2.0.0; use name mapping instead
* @deprecated will be removed in 1.12.0; use name mapping instead
*/
@Deprecated
public static final ConfigEntry<Boolean> NETFLIX_UNSAFE_PARQUET_ID_FALLBACK_ENABLED =
Expand All @@ -91,7 +91,7 @@ private SystemConfigs() {}
true,
s -> {
LOG.warn(
"Fallback ID assignment in Parquet is UNSAFE and will be removed in 2.0.0. Use name mapping instead.");
"Fallback ID assignment in Parquet is UNSAFE and will be removed in 1.12.0. Use name mapping instead.");
return Boolean.parseBoolean(s);
});

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/SystemProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/**
* Configuration properties that are controlled by Java system properties.
*
* @deprecated Use {@link SystemConfigs} instead; will be removed in 2.0.0
* @deprecated Use {@link SystemConfigs} instead; will be removed in 1.12.0
*/
@Deprecated
public class SystemProperties {
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/java/org/apache/iceberg/TableProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,14 +256,14 @@ private TableProperties() {}
public static final boolean WRITE_OBJECT_STORE_PARTITIONED_PATHS_DEFAULT = true;

/**
* @deprecated will be removed in 2.0.0, use {@link #WRITE_DATA_LOCATION} instead.
* @deprecated will be removed in 1.12.0, use {@link #WRITE_DATA_LOCATION} instead.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit hesitant removing table properties earlier, since that would mean a behavioral change

*/
@Deprecated public static final String OBJECT_STORE_PATH = "write.object-storage.path";

public static final String WRITE_LOCATION_PROVIDER_IMPL = "write.location-provider.impl";

/**
* @deprecated will be removed in 2.0.0, use {@link #WRITE_DATA_LOCATION} instead.
* @deprecated will be removed in 1.12.0, use {@link #WRITE_DATA_LOCATION} instead.
*/
@Deprecated
public static final String WRITE_FOLDER_STORAGE_LOCATION = "write.folder-storage.path";
Expand All @@ -282,12 +282,12 @@ private TableProperties() {}
public static final int WRITE_PARTITION_SUMMARY_LIMIT_DEFAULT = 0;

/**
* @deprecated will be removed in 2.0.0, writing manifest lists is always enabled
* @deprecated will be removed in 1.12.0, writing manifest lists is always enabled
*/
@Deprecated public static final String MANIFEST_LISTS_ENABLED = "write.manifest-lists.enabled";

/**
* @deprecated will be removed in 2.0.0, writing manifest lists is always enabled
* @deprecated will be removed in 1.12.0, writing manifest lists is always enabled
*/
@Deprecated public static final boolean MANIFEST_LISTS_ENABLED_DEFAULT = true;

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public static Schema pruneColumns(Schema schema, Set<Integer> selectedIds) {
}

/**
* @deprecated will be removed in 2.0.0; use applyNameMapping and pruneColumns(Schema, Set)
* @deprecated will be removed in 1.12.0; use applyNameMapping and pruneColumns(Schema, Set)
* instead.
*/
@Deprecated
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/data/avro/DataReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.apache.iceberg.types.Types;

/**
* @deprecated will be removed in 2.0.0; use {@link PlannedDataReader} instead.
* @deprecated will be removed in 1.12.0; use {@link PlannedDataReader} instead.
*/
@Deprecated
public class DataReader<T> implements DatumReader<T>, SupportsRowPosition {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/data/avro/RawDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static <D> RawDecoder<D> create(
* schema used to decode buffers. The {@code writeSchema} must be the schema that was used to
* encode all buffers decoded by this class.
*
* @deprecated will be removed in 2.0.0; use {@link #create(org.apache.iceberg.Schema, Function,
* @deprecated will be removed in 1.12.0; use {@link #create(org.apache.iceberg.Schema, Function,
* Schema)} instead
*/
@Deprecated
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/encryption/StandardEncryptionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private TransientEncryptionState(KeyManagementClient kmsClient, List<EncryptedKe
private transient volatile SecureRandom lazyRNG = null;

/**
* @deprecated will be removed in 2.0.
* @deprecated will be removed in 1.12.0.
*/
@Deprecated
public StandardEncryptionManager(
Expand Down Expand Up @@ -134,7 +134,7 @@ private SecureRandom workerRNG() {
}

/**
* @deprecated will be removed in 2.0.
* @deprecated will be removed in 1.12.0.
*/
@Deprecated
public ByteBuffer wrapKey(ByteBuffer secretKey) {
Expand All @@ -147,7 +147,7 @@ public ByteBuffer wrapKey(ByteBuffer secretKey) {
}

/**
* @deprecated will be removed in 2.0.
* @deprecated will be removed in 1.12.0.
*/
@Deprecated
public ByteBuffer unwrapKey(ByteBuffer wrappedSecretKey) {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/io/ContentCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void invalidate(String key) {
}

/**
* @deprecated since 1.7.0, will be removed in 2.0.0; This method does only best-effort
* @deprecated since 1.7.0, will be removed in 1.12.0; This method does only best-effort
* invalidation and is susceptible to a race condition. If the caller changed the state that
* could be cached (perhaps files on the storage) and calls this method, there is no guarantee
* that the cache will not contain stale entries some time after this method returns.
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/rest/RESTSessionCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public class RESTSessionCatalog extends BaseViewSessionCatalog
private static final String DEFAULT_FILE_IO_IMPL = "org.apache.iceberg.io.ResolvingFileIO";

/**
* @deprecated will be removed in 2.0.0. Use {@link
* @deprecated will be removed in 1.12.0. Use {@link
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one should be fine to remove before 2.0.0, since the property was only moved to a different class

* org.apache.iceberg.rest.RESTCatalogProperties#PAGE_SIZE} instead.
*/
@Deprecated public static final String REST_PAGE_SIZE = "rest-page-size";
Expand Down
11 changes: 8 additions & 3 deletions core/src/main/java/org/apache/iceberg/rest/auth/AuthManagers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,20 @@ public class AuthManagers {

private static final Logger LOG = LoggerFactory.getLogger(AuthManagers.class);

/** Old property name for enabling SigV4 authentication. */
private static final String SIGV4_ENABLED_LEGACY = "rest.sigv4-enabled";
/**
* Old property name for enabling SigV4 authentication.
*
* @deprecated Use {@link AuthProperties#AUTH_TYPE}={@link AuthProperties#AUTH_TYPE_SIGV4}
* instead. Will be removed in 1.12.0.
*/
@Deprecated private static final String SIGV4_ENABLED_LEGACY = "rest.sigv4-enabled";

private AuthManagers() {}

public static AuthManager loadAuthManager(String name, Map<String, String> properties) {
if (properties.containsKey(SIGV4_ENABLED_LEGACY)) {
LOG.warn(
"The property {} is deprecated and will be removed in a future release. "
"The property {} is deprecated and will be removed in 1.12.0. "
+ "Please use the property {}={} instead.",
SIGV4_ENABLED_LEGACY,
AuthProperties.AUTH_TYPE,
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ private static Iterable<Long> toIds(Iterable<Snapshot> snapshots) {
}

/**
* @deprecated will be removed in 2.0.0, use {@link #newFilesBetween(Long, long, Function,
* @deprecated will be removed in 1.12.0, use {@link #newFilesBetween(Long, long, Function,
* FileIO)} instead.
*/
@Deprecated
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/util/ThreadPools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private ThreadPools() {}

/**
* @deprecated Use {@link SystemConfigs#WORKER_THREAD_POOL_SIZE WORKER_THREAD_POOL_SIZE} instead;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* @deprecated Use {@link SystemConfigs#WORKER_THREAD_POOL_SIZE WORKER_THREAD_POOL_SIZE} instead;
* @deprecated Use {@link SystemConfigs#WORKER_THREAD_POOL_SIZE} instead;

* will be removed in 2.0.0
* will be removed in 1.12.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be ok to remove earlier as well

*/
@Deprecated
public static final String WORKER_THREAD_POOL_SIZE_PROP =
Expand Down Expand Up @@ -113,7 +113,7 @@ private static class AuthRefreshPoolHolder {
* either {@link #newExitingWorkerPool(String, int)} or {@link #newFixedThreadPool(String, int)},
* depending on the intended lifecycle of the thread pool.
*
* @deprecated will be removed in 2.0.0. Use {@link #newExitingWorkerPool(String, int)} for
* @deprecated will be removed in 1.12.0. Use {@link #newExitingWorkerPool(String, int)} for
* long-lived thread pools that require a shutdown hook, or {@link #newFixedThreadPool(String,
* int)} for short-lived thread pools where you manage the lifecycle.
*/
Expand All @@ -134,7 +134,7 @@ public static ExecutorService newWorkerPool(String namePrefix) {
* either {@link #newExitingWorkerPool(String, int)} or {@link #newFixedThreadPool(String, int)},
* depending on the intended lifecycle of the thread pool.
*
* @deprecated will be removed in 2.0.0. Use {@link #newExitingWorkerPool(String, int)} for
* @deprecated will be removed in 1.12.0. Use {@link #newExitingWorkerPool(String, int)} for
* long-lived thread pools that require a shutdown hook, or {@link #newFixedThreadPool(String,
* int)} for short-lived thread pools where you manage the lifecycle.
*/
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/view/ViewProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class ViewProperties {
public static final String METADATA_COMPRESSION_DEFAULT = "gzip";

/**
* @deprecated will be removed in 2.0.0, use {@link ViewBuilder#withLocation} instead.
* @deprecated will be removed in 1.12.0, use {@link ViewBuilder#withLocation} instead.
*/
@Deprecated public static final String WRITE_METADATA_LOCATION = "write.metadata.path";

Expand Down
6 changes: 3 additions & 3 deletions core/src/test/java/org/apache/iceberg/TestLocationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public void testObjectStorageLocationProviderThrowOnDeprecatedProperties() {
assertThatThrownBy(() -> table.locationProvider().newDataLocation("file"))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage(
"Property 'write.folder-storage.path' has been deprecated and will be removed in 2.0, use 'write.data.path' instead.");
"Property 'write.folder-storage.path' has been deprecated and will be removed in 1.12.0, use 'write.data.path' instead.");

table
.updateProperties()
Expand All @@ -231,7 +231,7 @@ public void testObjectStorageLocationProviderThrowOnDeprecatedProperties() {
assertThatThrownBy(() -> table.locationProvider().newDataLocation("file"))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage(
"Property 'write.object-storage.path' has been deprecated and will be removed in 2.0, use 'write.data.path' instead.");
"Property 'write.object-storage.path' has been deprecated and will be removed in 1.12.0, use 'write.data.path' instead.");
}

@TestTemplate
Expand All @@ -246,7 +246,7 @@ public void testDefaultStorageLocationProviderThrowOnDeprecatedProperties() {
assertThatThrownBy(() -> table.locationProvider().newDataLocation("file"))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage(
"Property 'write.folder-storage.path' has been deprecated and will be removed in 2.0, use 'write.data.path' instead.");
"Property 'write.folder-storage.path' has been deprecated and will be removed in 1.12.0, use 'write.data.path' instead.");
}

@TestTemplate
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/org/apache/iceberg/jdbc/TestJdbcTableConcurrency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,8 @@ public void setAsciiStream(int parameterIndex, InputStream x, int length) throws
delegate.setAsciiStream(parameterIndex, x, length);
}

@Deprecated(since = "1.2")
/* @deprecated Will be removed in 1.12.0 */
@Deprecated
@Override
public void setUnicodeStream(int parameterIndex, InputStream inputStream, int length)
throws SQLException {
Expand Down