This is an automated email from the ASF dual-hosted git repository.
findepi 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 a5c8f9cd45 Build: Remove unused variables, fields and parameters
(#11101)
a5c8f9cd45 is described below
commit a5c8f9cd4557639d39eed716d499e9837d13b88e
Author: Piotr Findeisen <[email protected]>
AuthorDate: Tue Sep 10 11:59:26 2024 +0200
Build: Remove unused variables, fields and parameters (#11101)
* Remove unused variables, fields and parameters
---
.../java/org/apache/iceberg/expressions/ExpressionUtil.java | 1 -
api/src/main/java/org/apache/iceberg/types/TypeUtil.java | 1 -
.../org/apache/iceberg/aws/TestAssumeRoleAwsClientFactory.java | 4 ----
.../java/org/apache/iceberg/aws/glue/GlueTestBase.java | 4 ----
.../java/org/apache/iceberg/aws/glue/TestGlueCatalogTable.java | 2 --
.../iceberg/aws/lakeformation/LakeFormationTestBase.java | 8 +++-----
.../aws/lakeformation/TestLakeFormationAwsClientFactory.java | 1 -
.../org/apache/iceberg/aws/s3/TestS3FileIOIntegration.java | 1 -
aws/src/main/java/org/apache/iceberg/aws/AwsProperties.java | 5 -----
baseline.gradle | 1 +
.../src/jmh/java/org/apache/iceberg/ManifestReadBenchmark.java | 3 +--
core/src/main/java/org/apache/iceberg/UpdateRequirements.java | 10 +++++-----
.../main/java/org/apache/iceberg/actions/RewriteFileGroup.java | 2 +-
.../apache/iceberg/actions/RewritePositionDeletesGroup.java | 2 +-
.../src/main/java/org/apache/iceberg/rest/auth/OAuth2Util.java | 2 --
.../main/java/org/apache/iceberg/util/ParallelIterable.java | 4 +---
.../main/java/org/apache/iceberg/flink/data/StructRowData.java | 4 ++--
.../java/org/apache/iceberg/flink/source/RowDataRewriter.java | 6 ------
.../main/java/org/apache/iceberg/flink/data/StructRowData.java | 4 ++--
.../java/org/apache/iceberg/flink/source/RowDataRewriter.java | 6 ------
.../main/java/org/apache/iceberg/flink/data/StructRowData.java | 4 ++--
.../java/org/apache/iceberg/flink/source/RowDataRewriter.java | 6 ------
mr/src/main/java/org/apache/iceberg/mr/Catalogs.java | 10 +++-------
.../java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java | 4 ++--
orc/src/main/java/org/apache/iceberg/orc/OrcFileAppender.java | 3 +++
.../integration/java/org/apache/iceberg/spark/SmokeTest.java | 2 +-
.../integration/java/org/apache/iceberg/spark/SmokeTest.java | 2 +-
.../integration/java/org/apache/iceberg/spark/SmokeTest.java | 2 +-
28 files changed, 30 insertions(+), 74 deletions(-)
diff --git
a/api/src/main/java/org/apache/iceberg/expressions/ExpressionUtil.java
b/api/src/main/java/org/apache/iceberg/expressions/ExpressionUtil.java
index bd0adb228b..43c97c50df 100644
--- a/api/src/main/java/org/apache/iceberg/expressions/ExpressionUtil.java
+++ b/api/src/main/java/org/apache/iceberg/expressions/ExpressionUtil.java
@@ -44,7 +44,6 @@ public class ExpressionUtil {
Transforms.bucket(Integer.MAX_VALUE).bind(Types.StringType.get());
private static final OffsetDateTime EPOCH =
Instant.ofEpochSecond(0).atOffset(ZoneOffset.UTC);
private static final long FIVE_MINUTES_IN_MICROS =
TimeUnit.MINUTES.toMicros(5);
- private static final long FIVE_MINUTES_IN_NANOS =
TimeUnit.MINUTES.toNanos(5);
private static final long THREE_DAYS_IN_HOURS = TimeUnit.DAYS.toHours(3);
private static final long NINETY_DAYS_IN_HOURS = TimeUnit.DAYS.toHours(90);
private static final Pattern DATE = Pattern.compile("\\d{4}-\\d{2}-\\d{2}");
diff --git a/api/src/main/java/org/apache/iceberg/types/TypeUtil.java
b/api/src/main/java/org/apache/iceberg/types/TypeUtil.java
index 9d4b217f15..8a9184569a 100644
--- a/api/src/main/java/org/apache/iceberg/types/TypeUtil.java
+++ b/api/src/main/java/org/apache/iceberg/types/TypeUtil.java
@@ -197,7 +197,6 @@ public class TypeUtil {
IndexByName indexer = new IndexByName();
visit(struct, indexer);
- Map<String, Integer> byName = indexer.byName();
Map<Integer, String> byId = indexer.byId();
indexByName(struct)
diff --git
a/aws/src/integration/java/org/apache/iceberg/aws/TestAssumeRoleAwsClientFactory.java
b/aws/src/integration/java/org/apache/iceberg/aws/TestAssumeRoleAwsClientFactory.java
index 9845d31021..fc6f2da9c6 100644
---
a/aws/src/integration/java/org/apache/iceberg/aws/TestAssumeRoleAwsClientFactory.java
+++
b/aws/src/integration/java/org/apache/iceberg/aws/TestAssumeRoleAwsClientFactory.java
@@ -34,8 +34,6 @@ import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import software.amazon.awssdk.core.exception.SdkServiceException;
import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
import software.amazon.awssdk.regions.Region;
@@ -51,8 +49,6 @@ import software.amazon.awssdk.services.s3.model.S3Exception;
public class TestAssumeRoleAwsClientFactory {
- private static final Logger LOG =
LoggerFactory.getLogger(TestAssumeRoleAwsClientFactory.class);
-
private IamClient iam;
private String roleName;
private Map<String, String> assumeRoleProperties;
diff --git
a/aws/src/integration/java/org/apache/iceberg/aws/glue/GlueTestBase.java
b/aws/src/integration/java/org/apache/iceberg/aws/glue/GlueTestBase.java
index ecf589d7c0..495c5ca98e 100644
--- a/aws/src/integration/java/org/apache/iceberg/aws/glue/GlueTestBase.java
+++ b/aws/src/integration/java/org/apache/iceberg/aws/glue/GlueTestBase.java
@@ -38,8 +38,6 @@ import
org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.types.Types;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import software.amazon.awssdk.services.glue.GlueClient;
import software.amazon.awssdk.services.glue.model.Column;
import software.amazon.awssdk.services.glue.model.GetTableRequest;
@@ -52,8 +50,6 @@ import software.amazon.awssdk.services.s3.S3Client;
@SuppressWarnings({"VisibilityModifier", "HideUtilityClassConstructor"})
public class GlueTestBase {
- private static final Logger LOG =
LoggerFactory.getLogger(GlueTestBase.class);
-
// the integration test requires the following env variables
static final String TEST_BUCKET_NAME = AwsIntegTestUtil.testBucketName();
diff --git
a/aws/src/integration/java/org/apache/iceberg/aws/glue/TestGlueCatalogTable.java
b/aws/src/integration/java/org/apache/iceberg/aws/glue/TestGlueCatalogTable.java
index 6bd6a4ad38..6ca2fe0216 100644
---
a/aws/src/integration/java/org/apache/iceberg/aws/glue/TestGlueCatalogTable.java
+++
b/aws/src/integration/java/org/apache/iceberg/aws/glue/TestGlueCatalogTable.java
@@ -333,8 +333,6 @@ public class TestGlueCatalogTable extends GlueTestBase {
public void testRenameTableFailsToDeleteOldTable() {
String namespace = createNamespace();
String tableName = createTable(namespace);
- TableIdentifier id = TableIdentifier.of(namespace, tableName);
- Table table = glueCatalog.loadTable(id);
// delete the old table metadata, so that drop old table will fail
String newTableName = tableName + "_2";
GLUE.updateTable(
diff --git
a/aws/src/integration/java/org/apache/iceberg/aws/lakeformation/LakeFormationTestBase.java
b/aws/src/integration/java/org/apache/iceberg/aws/lakeformation/LakeFormationTestBase.java
index 630db7a5a1..5e34c200cf 100644
---
a/aws/src/integration/java/org/apache/iceberg/aws/lakeformation/LakeFormationTestBase.java
+++
b/aws/src/integration/java/org/apache/iceberg/aws/lakeformation/LakeFormationTestBase.java
@@ -78,7 +78,6 @@ import
software.amazon.awssdk.services.lakeformation.model.GetDataLakeSettingsRe
import
software.amazon.awssdk.services.lakeformation.model.GrantPermissionsRequest;
import software.amazon.awssdk.services.lakeformation.model.Permission;
import
software.amazon.awssdk.services.lakeformation.model.PutDataLakeSettingsRequest;
-import
software.amazon.awssdk.services.lakeformation.model.PutDataLakeSettingsResponse;
import
software.amazon.awssdk.services.lakeformation.model.RegisterResourceRequest;
import software.amazon.awssdk.services.lakeformation.model.Resource;
import software.amazon.awssdk.services.lakeformation.model.TableResource;
@@ -217,10 +216,9 @@ public class LakeFormationTestBase {
// put lf data lake settings
GetDataLakeSettingsResponse getDataLakeSettingsResponse =
lakeformation.getDataLakeSettings(GetDataLakeSettingsRequest.builder().build());
- PutDataLakeSettingsResponse putDataLakeSettingsResponse =
- lakeformation.putDataLakeSettings(
- putDataLakeSettingsRequest(
- lfRegisterPathRoleArn,
getDataLakeSettingsResponse.dataLakeSettings(), true));
+ lakeformation.putDataLakeSettings(
+ putDataLakeSettingsRequest(
+ lfRegisterPathRoleArn,
getDataLakeSettingsResponse.dataLakeSettings(), true));
// Build test glueCatalog with lfPrivilegedRole
glueCatalogPrivilegedRole = new GlueCatalog();
diff --git
a/aws/src/integration/java/org/apache/iceberg/aws/lakeformation/TestLakeFormationAwsClientFactory.java
b/aws/src/integration/java/org/apache/iceberg/aws/lakeformation/TestLakeFormationAwsClientFactory.java
index 609dbf1a6a..8a3bb71ce3 100644
---
a/aws/src/integration/java/org/apache/iceberg/aws/lakeformation/TestLakeFormationAwsClientFactory.java
+++
b/aws/src/integration/java/org/apache/iceberg/aws/lakeformation/TestLakeFormationAwsClientFactory.java
@@ -52,7 +52,6 @@ public class TestLakeFormationAwsClientFactory {
private static final Logger LOG =
LoggerFactory.getLogger(TestLakeFormationAwsClientFactory.class);
- private static final int IAM_PROPAGATION_DELAY = 10000;
private static final int ASSUME_ROLE_SESSION_DURATION = 3600;
private IamClient iam;
diff --git
a/aws/src/integration/java/org/apache/iceberg/aws/s3/TestS3FileIOIntegration.java
b/aws/src/integration/java/org/apache/iceberg/aws/s3/TestS3FileIOIntegration.java
index fc2b9f97f1..b8b86fddc5 100644
---
a/aws/src/integration/java/org/apache/iceberg/aws/s3/TestS3FileIOIntegration.java
+++
b/aws/src/integration/java/org/apache/iceberg/aws/s3/TestS3FileIOIntegration.java
@@ -76,7 +76,6 @@ public class TestS3FileIOIntegration {
private static S3Client s3;
private static S3ControlClient s3Control;
private static S3ControlClient crossRegionS3Control;
- private static S3ControlClient multiRegionS3Control;
private static KmsClient kms;
private static String bucketName;
private static String crossRegionBucketName;
diff --git a/aws/src/main/java/org/apache/iceberg/aws/AwsProperties.java
b/aws/src/main/java/org/apache/iceberg/aws/AwsProperties.java
index 5c3afc28a9..1a8db99057 100644
--- a/aws/src/main/java/org/apache/iceberg/aws/AwsProperties.java
+++ b/aws/src/main/java/org/apache/iceberg/aws/AwsProperties.java
@@ -31,8 +31,6 @@ import
org.apache.iceberg.relocated.com.google.common.base.Preconditions;
import org.apache.iceberg.relocated.com.google.common.base.Strings;
import org.apache.iceberg.relocated.com.google.common.collect.Sets;
import org.apache.iceberg.util.PropertyUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
@@ -46,8 +44,6 @@ import software.amazon.awssdk.services.glue.GlueClientBuilder;
public class AwsProperties implements Serializable {
- private static final Logger LOG =
LoggerFactory.getLogger(AwsProperties.class);
-
/**
* The ID of the Glue Data Catalog where the tables reside. If none is
provided, Glue
* automatically uses the caller's AWS account ID by default.
@@ -210,7 +206,6 @@ public class AwsProperties implements Serializable {
*/
public static final String REST_SESSION_TOKEN = "rest.session-token";
- private static final String HTTP_CLIENT_PREFIX = "http-client.";
private final Set<software.amazon.awssdk.services.sts.model.Tag>
stsClientAssumeRoleTags;
private final String clientAssumeRoleArn;
diff --git a/baseline.gradle b/baseline.gradle
index be6e267697..5e2710be17 100644
--- a/baseline.gradle
+++ b/baseline.gradle
@@ -157,6 +157,7 @@ subprojects {
// Palantir's UnnecessarilyQualified may throw during analysis
'-Xep:UnnecessarilyQualified:OFF',
'-Xep:UnusedMethod:ERROR',
+ '-Xep:UnusedVariable:ERROR',
)
}
}
diff --git a/core/src/jmh/java/org/apache/iceberg/ManifestReadBenchmark.java
b/core/src/jmh/java/org/apache/iceberg/ManifestReadBenchmark.java
index e4a63becea..7b4e2b9ec5 100644
--- a/core/src/jmh/java/org/apache/iceberg/ManifestReadBenchmark.java
+++ b/core/src/jmh/java/org/apache/iceberg/ManifestReadBenchmark.java
@@ -122,12 +122,11 @@ public class ManifestReadBenchmark {
TestTables.LocalFileIO fileIO = new TestTables.LocalFileIO();
Map<Integer, PartitionSpec> specs =
ImmutableMap.of(PartitionSpec.unpartitioned().specId(),
PartitionSpec.unpartitioned());
- long recordCount = 0L;
for (ManifestFile manifestFile : manifests) {
ManifestReader<DataFile> reader = ManifestFiles.read(manifestFile,
fileIO, specs);
try (CloseableIterator<DataFile> it = reader.iterator()) {
while (it.hasNext()) {
- recordCount += it.next().recordCount();
+ it.next().recordCount();
}
}
}
diff --git a/core/src/main/java/org/apache/iceberg/UpdateRequirements.java
b/core/src/main/java/org/apache/iceberg/UpdateRequirements.java
index 6a5d07d781..d92c1a3742 100644
--- a/core/src/main/java/org/apache/iceberg/UpdateRequirements.java
+++ b/core/src/main/java/org/apache/iceberg/UpdateRequirements.java
@@ -124,7 +124,7 @@ public class UpdateRequirements {
}
}
- private void update(MetadataUpdate.AddSchema update) {
+ private void update(MetadataUpdate.AddSchema unused) {
if (!addedSchema) {
if (base != null) {
require(new
UpdateRequirement.AssertLastAssignedFieldId(base.lastColumnId()));
@@ -133,7 +133,7 @@ public class UpdateRequirements {
}
}
- private void update(MetadataUpdate.SetCurrentSchema update) {
+ private void update(MetadataUpdate.SetCurrentSchema unused) {
if (!setSchemaId) {
if (base != null && !isReplace) {
// require that the current schema has not changed
@@ -143,7 +143,7 @@ public class UpdateRequirements {
}
}
- private void update(MetadataUpdate.AddPartitionSpec update) {
+ private void update(MetadataUpdate.AddPartitionSpec unused) {
if (!addedSpec) {
if (base != null) {
require(
@@ -153,7 +153,7 @@ public class UpdateRequirements {
}
}
- private void update(MetadataUpdate.SetDefaultPartitionSpec update) {
+ private void update(MetadataUpdate.SetDefaultPartitionSpec unused) {
if (!setSpecId) {
if (base != null && !isReplace) {
// require that the default spec has not changed
@@ -163,7 +163,7 @@ public class UpdateRequirements {
}
}
- private void update(MetadataUpdate.SetDefaultSortOrder update) {
+ private void update(MetadataUpdate.SetDefaultSortOrder unused) {
if (!setOrderId) {
if (base != null && !isReplace) {
// require that the default write order has not changed
diff --git
a/core/src/main/java/org/apache/iceberg/actions/RewriteFileGroup.java
b/core/src/main/java/org/apache/iceberg/actions/RewriteFileGroup.java
index f816b5d7a4..dd1358f2ed 100644
--- a/core/src/main/java/org/apache/iceberg/actions/RewriteFileGroup.java
+++ b/core/src/main/java/org/apache/iceberg/actions/RewriteFileGroup.java
@@ -106,7 +106,7 @@ public class RewriteFileGroup {
case FILES_DESC:
return Comparator.comparing(RewriteFileGroup::numFiles,
Comparator.reverseOrder());
default:
- return (fileGroupOne, fileGroupTwo) -> 0;
+ return (unused, unused2) -> 0;
}
}
}
diff --git
a/core/src/main/java/org/apache/iceberg/actions/RewritePositionDeletesGroup.java
b/core/src/main/java/org/apache/iceberg/actions/RewritePositionDeletesGroup.java
index b8ebe528de..2be7145bcd 100644
---
a/core/src/main/java/org/apache/iceberg/actions/RewritePositionDeletesGroup.java
+++
b/core/src/main/java/org/apache/iceberg/actions/RewritePositionDeletesGroup.java
@@ -127,7 +127,7 @@ public class RewritePositionDeletesGroup {
return Comparator.comparing(
RewritePositionDeletesGroup::numRewrittenDeleteFiles,
Comparator.reverseOrder());
default:
- return (fileGroupOne, fileGroupTwo) -> 0;
+ return (unused, unused2) -> 0;
}
}
}
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 52c89af9d4..1757ae653c 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
@@ -72,7 +72,6 @@ public class OAuth2Util {
private static final String CLIENT_CREDENTIALS = "client_credentials";
private static final String TOKEN_EXCHANGE =
"urn:ietf:params:oauth:grant-type:token-exchange";
private static final String SCOPE = "scope";
- private static final String CATALOG = "catalog";
// Client credentials flow
private static final String CLIENT_ID = "client_id";
@@ -97,7 +96,6 @@ public class OAuth2Util {
private static final String TOKEN_TYPE = "token_type";
private static final String EXPIRES_IN = "expires_in";
private static final String ISSUED_TOKEN_TYPE = "issued_token_type";
- private static final String REFRESH_TOKEN = "refresh_token";
public static Map<String, String> authHeaders(String token) {
if (token != null) {
diff --git a/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java
b/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java
index f86e5ddc5a..d40f648447 100644
--- a/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java
+++ b/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java
@@ -85,18 +85,16 @@ public class ParallelIterable<T> extends CloseableGroup
implements CloseableIter
private final ExecutorService workerPool;
private final CompletableFuture<Optional<Task<T>>>[] taskFutures;
private final ConcurrentLinkedQueue<T> queue = new
ConcurrentLinkedQueue<>();
- private final int maxQueueSize;
private final AtomicBoolean closed = new AtomicBoolean(false);
private ParallelIterator(
Iterable<? extends Iterable<T>> iterables, ExecutorService workerPool,
int maxQueueSize) {
+ Preconditions.checkArgument(maxQueueSize > 0, "Max queue size must be
greater than 0");
this.tasks =
Iterables.transform(
iterables, iterable -> new Task<>(iterable, queue, closed,
maxQueueSize))
.iterator();
this.workerPool = workerPool;
- Preconditions.checkArgument(maxQueueSize > 0, "Max queue size must be
greater than 0");
- this.maxQueueSize = maxQueueSize;
// submit 2 tasks per worker at a time
this.taskFutures = new CompletableFuture[2 *
ThreadPools.WORKER_THREAD_POOL_SIZE];
}
diff --git
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
index 1019285018..34576a1e5c 100644
---
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
+++
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
@@ -237,10 +237,10 @@ public class StructRowData implements RowData {
@Override
public RowData getRow(int pos, int numFields) {
- return isNullAt(pos) ? null : getStructRowData(pos, numFields);
+ return isNullAt(pos) ? null : getStructRowData(pos);
}
- private StructRowData getStructRowData(int pos, int numFields) {
+ private StructRowData getStructRowData(int pos) {
return new StructRowData(
type.fields().get(pos).type().asStructType(), struct.get(pos,
StructLike.class));
}
diff --git
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
index c958604c00..3916339242 100644
---
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
+++
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
@@ -104,10 +104,7 @@ public class RowDataRewriter {
private int subTaskId;
private int attemptId;
- private final Schema schema;
- private final String nameMapping;
private final FileIO io;
- private final boolean caseSensitive;
private final EncryptionManager encryptionManager;
private final TaskWriterFactory<RowData> taskWriterFactory;
private final RowDataFileScanTaskReader rowDataReader;
@@ -119,10 +116,7 @@ public class RowDataRewriter {
boolean caseSensitive,
EncryptionManager encryptionManager,
TaskWriterFactory<RowData> taskWriterFactory) {
- this.schema = schema;
- this.nameMapping = nameMapping;
this.io = io;
- this.caseSensitive = caseSensitive;
this.encryptionManager = encryptionManager;
this.taskWriterFactory = taskWriterFactory;
this.rowDataReader =
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
index 1019285018..34576a1e5c 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
@@ -237,10 +237,10 @@ public class StructRowData implements RowData {
@Override
public RowData getRow(int pos, int numFields) {
- return isNullAt(pos) ? null : getStructRowData(pos, numFields);
+ return isNullAt(pos) ? null : getStructRowData(pos);
}
- private StructRowData getStructRowData(int pos, int numFields) {
+ private StructRowData getStructRowData(int pos) {
return new StructRowData(
type.fields().get(pos).type().asStructType(), struct.get(pos,
StructLike.class));
}
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
index c958604c00..3916339242 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
@@ -104,10 +104,7 @@ public class RowDataRewriter {
private int subTaskId;
private int attemptId;
- private final Schema schema;
- private final String nameMapping;
private final FileIO io;
- private final boolean caseSensitive;
private final EncryptionManager encryptionManager;
private final TaskWriterFactory<RowData> taskWriterFactory;
private final RowDataFileScanTaskReader rowDataReader;
@@ -119,10 +116,7 @@ public class RowDataRewriter {
boolean caseSensitive,
EncryptionManager encryptionManager,
TaskWriterFactory<RowData> taskWriterFactory) {
- this.schema = schema;
- this.nameMapping = nameMapping;
this.io = io;
- this.caseSensitive = caseSensitive;
this.encryptionManager = encryptionManager;
this.taskWriterFactory = taskWriterFactory;
this.rowDataReader =
diff --git
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
index 1019285018..34576a1e5c 100644
---
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
+++
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
@@ -237,10 +237,10 @@ public class StructRowData implements RowData {
@Override
public RowData getRow(int pos, int numFields) {
- return isNullAt(pos) ? null : getStructRowData(pos, numFields);
+ return isNullAt(pos) ? null : getStructRowData(pos);
}
- private StructRowData getStructRowData(int pos, int numFields) {
+ private StructRowData getStructRowData(int pos) {
return new StructRowData(
type.fields().get(pos).type().asStructType(), struct.get(pos,
StructLike.class));
}
diff --git
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
index c958604c00..3916339242 100644
---
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
+++
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
@@ -104,10 +104,7 @@ public class RowDataRewriter {
private int subTaskId;
private int attemptId;
- private final Schema schema;
- private final String nameMapping;
private final FileIO io;
- private final boolean caseSensitive;
private final EncryptionManager encryptionManager;
private final TaskWriterFactory<RowData> taskWriterFactory;
private final RowDataFileScanTaskReader rowDataReader;
@@ -119,10 +116,7 @@ public class RowDataRewriter {
boolean caseSensitive,
EncryptionManager encryptionManager,
TaskWriterFactory<RowData> taskWriterFactory) {
- this.schema = schema;
- this.nameMapping = nameMapping;
this.io = io;
- this.caseSensitive = caseSensitive;
this.encryptionManager = encryptionManager;
this.taskWriterFactory = taskWriterFactory;
this.rowDataReader =
diff --git a/mr/src/main/java/org/apache/iceberg/mr/Catalogs.java
b/mr/src/main/java/org/apache/iceberg/mr/Catalogs.java
index e8a4b5da35..2cd0e5ef4c 100644
--- a/mr/src/main/java/org/apache/iceberg/mr/Catalogs.java
+++ b/mr/src/main/java/org/apache/iceberg/mr/Catalogs.java
@@ -225,8 +225,7 @@ public final class Catalogs {
if (catalogType != null) {
return
CatalogUtil.ICEBERG_CATALOG_TYPE_HIVE.equalsIgnoreCase(catalogType);
}
- return getCatalogProperties(conf, catalogName,
catalogType).get(CatalogProperties.CATALOG_IMPL)
- == null;
+ return getCatalogProperties(conf,
catalogName).get(CatalogProperties.CATALOG_IMPL) == null;
}
@VisibleForTesting
@@ -237,8 +236,7 @@ public final class Catalogs {
} else {
String name = catalogName == null ? ICEBERG_DEFAULT_CATALOG_NAME :
catalogName;
return Optional.of(
- CatalogUtil.buildIcebergCatalog(
- name, getCatalogProperties(conf, name, catalogType), conf));
+ CatalogUtil.buildIcebergCatalog(name, getCatalogProperties(conf,
name), conf));
}
}
@@ -247,11 +245,9 @@ public final class Catalogs {
*
* @param conf a Hadoop configuration
* @param catalogName name of the catalog
- * @param catalogType type of the catalog
* @return complete map of catalog properties
*/
- private static Map<String, String> getCatalogProperties(
- Configuration conf, String catalogName, String catalogType) {
+ private static Map<String, String> getCatalogProperties(Configuration conf,
String catalogName) {
String keyPrefix = InputFormatConfig.CATALOG_CONFIG_PREFIX + catalogName;
return Streams.stream(conf.iterator())
diff --git
a/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java
b/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java
index 49f5b86aa0..637dc6d15d 100644
--- a/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java
+++ b/mr/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java
@@ -118,7 +118,7 @@ public class HiveIcebergMetaHook implements HiveMetaHook {
// Iceberg schema and specification generated by the code
Schema schema = schema(catalogProperties, hmsTable);
- PartitionSpec spec = spec(schema, catalogProperties, hmsTable);
+ PartitionSpec spec = spec(schema, hmsTable);
// If there are partition keys specified remove them from the HMS table
and add them to the
// column list
@@ -290,7 +290,7 @@ public class HiveIcebergMetaHook implements HiveMetaHook {
}
private static PartitionSpec spec(
- Schema schema, Properties properties,
org.apache.hadoop.hive.metastore.api.Table hmsTable) {
+ Schema schema, org.apache.hadoop.hive.metastore.api.Table hmsTable) {
if (hmsTable.getParameters().get(InputFormatConfig.PARTITION_SPEC) !=
null) {
Preconditions.checkArgument(
diff --git a/orc/src/main/java/org/apache/iceberg/orc/OrcFileAppender.java
b/orc/src/main/java/org/apache/iceberg/orc/OrcFileAppender.java
index b8a48645ef..842bd99f46 100644
--- a/orc/src/main/java/org/apache/iceberg/orc/OrcFileAppender.java
+++ b/orc/src/main/java/org/apache/iceberg/orc/OrcFileAppender.java
@@ -53,7 +53,10 @@ class OrcFileAppender<D> implements FileAppender<D> {
private final int avgRowByteSize;
private final OrcRowWriter<D> valueWriter;
private boolean isClosed = false;
+
+ @SuppressWarnings("unused") // Currently used in tests TODO remove this
redundant field
private final Configuration conf;
+
private final MetricsConfig metricsConfig;
OrcFileAppender(
diff --git
a/spark/v3.3/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
b/spark/v3.3/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
index d6fab897d6..51e3721aea 100644
---
a/spark/v3.3/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
+++
b/spark/v3.3/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
@@ -101,7 +101,7 @@ public class SmokeTest extends SparkExtensionsTestBase {
sql(
"CREATE TABLE %s (category int, id bigint, data string, ts timestamp)
USING iceberg",
tableName);
- Table table = getTable();
+ Table table;
// Add examples
sql("ALTER TABLE %s ADD PARTITION FIELD bucket(16, id)", tableName);
sql("ALTER TABLE %s ADD PARTITION FIELD truncate(data, 4)", tableName);
diff --git
a/spark/v3.4/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
b/spark/v3.4/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
index 59bc70854c..20be98d17b 100644
---
a/spark/v3.4/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
+++
b/spark/v3.4/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
@@ -103,7 +103,7 @@ public class SmokeTest extends SparkExtensionsTestBase {
sql(
"CREATE TABLE %s (category int, id bigint, data string, ts timestamp)
USING iceberg",
tableName);
- Table table = getTable();
+ Table table;
// Add examples
sql("ALTER TABLE %s ADD PARTITION FIELD bucket(16, id)", tableName);
sql("ALTER TABLE %s ADD PARTITION FIELD truncate(data, 4)", tableName);
diff --git
a/spark/v3.5/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
b/spark/v3.5/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
index 89f7ad5dc6..ec445774a4 100644
---
a/spark/v3.5/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
+++
b/spark/v3.5/spark-runtime/src/integration/java/org/apache/iceberg/spark/SmokeTest.java
@@ -101,7 +101,7 @@ public class SmokeTest extends ExtensionsTestBase {
sql(
"CREATE TABLE %s (category int, id bigint, data string, ts timestamp)
USING iceberg",
tableName);
- Table table = getTable();
+ Table table;
// Add examples
sql("ALTER TABLE %s ADD PARTITION FIELD bucket(16, id)", tableName);
sql("ALTER TABLE %s ADD PARTITION FIELD truncate(data, 4)", tableName);
