This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 1115746a35a HDDS-15893. Change `<? extends KeyValue>` to `<KeyValue>`
in remaining code (#10806)
1115746a35a is described below
commit 1115746a35a4432a913d8b70f485132c3e18be9a
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Sun Jul 19 00:18:00 2026 -0700
HDDS-15893. Change `<? extends KeyValue>` to `<KeyValue>` in remaining code
(#10806)
---
.../ContainerTableSchemaFinalizeAction.java | 2 +-
.../ozone/debug/om/ContainerToKeyMapping.java | 19 ++++++----------
.../apache/hadoop/ozone/fsck/ContainerMapper.java | 3 +--
.../schemaupgrade/UpgradeContainerSchema.java | 3 +--
.../hadoop/ozone/repair/om/FSORepairTool.java | 25 ++++++++--------------
.../hdds/scm/TestStorageContainerManager.java | 4 ++--
.../ozone/client/rpc/OzoneRpcClientTests.java | 2 +-
.../client/rpc/TestOzoneAtRestEncryption.java | 2 +-
.../commandhandler/TestDeleteContainerHandler.java | 2 +-
...TestSnapshotDeletingServiceIntegrationTest.java | 2 +-
.../apache/hadoop/ozone/om/OMMetadataManager.java | 3 +--
.../org/apache/hadoop/ozone/recon/ReconUtils.java | 2 +-
.../ozone/recon/api/OMDBInsightEndpoint.java | 3 +--
.../ozone/recon/api/ReconGlobalMetricsService.java | 4 +---
.../ozone/recon/api/handlers/FSOBucketHandler.java | 3 +--
.../recon/api/handlers/LegacyBucketHandler.java | 5 ++---
.../ozone/recon/api/handlers/OBSBucketHandler.java | 8 ++-----
.../recon/recovery/ReconOmMetadataManagerImpl.java | 8 +++----
.../hadoop/ozone/recon/scm/ReconNodeManager.java | 6 ++----
.../scm/ReconStorageContainerManagerFacade.java | 3 +--
.../spi/impl/OzoneManagerServiceProviderImpl.java | 2 +-
.../impl/ReconContainerMetadataManagerImpl.java | 8 +++----
.../ozone/recon/spi/impl/ReconDBProvider.java | 3 +--
.../recon/tasks/ContainerKeyMapperHelper.java | 2 +-
.../recon/tasks/DeletedKeysInsightHandler.java | 2 +-
.../recon/tasks/MultipartInfoInsightHandler.java | 2 +-
.../ozone/recon/tasks/NSSummaryTaskWithLegacy.java | 3 +--
.../ozone/recon/tasks/OpenKeysInsightHandler.java | 2 +-
.../tasks/util/ParallelTableIteratorOperation.java | 4 ++--
.../ozone/recon/tasks/TestFileSizeCountTask.java | 2 +-
30 files changed, 53 insertions(+), 86 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/ContainerTableSchemaFinalizeAction.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/ContainerTableSchemaFinalizeAction.java
index 7739797953c..cfa03de1b06 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/ContainerTableSchemaFinalizeAction.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/upgrade/ContainerTableSchemaFinalizeAction.java
@@ -60,7 +60,7 @@ public void execute(DatanodeStateMachine arg) throws
Exception {
}
try (BatchOperation batch = metadataStore.getStore().initBatchOperation();
- TableIterator<ContainerID, ? extends Table.KeyValue<ContainerID,
ContainerCreateInfo>> iterator =
+ TableIterator<ContainerID, Table.KeyValue<ContainerID,
ContainerCreateInfo>> iterator =
previousTable.iterator()) {
while (iterator.hasNext()) {
Table.KeyValue<ContainerID, ContainerCreateInfo> next =
iterator.next();
diff --git
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/om/ContainerToKeyMapping.java
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/om/ContainerToKeyMapping.java
index d6c9fce57de..589bd98aace 100644
---
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/om/ContainerToKeyMapping.java
+++
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/debug/om/ContainerToKeyMapping.java
@@ -220,8 +220,7 @@ private void retrieve(String dbPath, PrintWriter writer,
Set<Long> containerIds)
private void processFSOKeys(Set<Long> containerIds, Map<Long, List<String>>
containerToKeysMap,
Map<Long, Long> unreferencedCountMap, Map<Long, Pair<Long, String>>
bucketVolMap) {
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
fileIterator =
- fileTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> fileIterator
= fileTable.iterator()) {
while (fileIterator.hasNext()) {
Table.KeyValue<String, OmKeyInfo> entry = fileIterator.next();
@@ -248,8 +247,7 @@ private void processFSOKeys(Set<Long> containerIds,
Map<Long, List<String>> cont
}
private void processOBSKeys(Set<Long> containerIds, Map<Long, List<String>>
containerToKeysMap) {
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
keyIterator =
- keyTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> keyIterator
= keyTable.iterator()) {
while (keyIterator.hasNext()) {
Table.KeyValue<String, OmKeyInfo> entry = keyIterator.next();
@@ -273,8 +271,7 @@ private void processOBSKeys(Set<Long> containerIds,
Map<Long, List<String>> cont
}
private void processOpenFiles(Set<Long> containerIds, Map<Long,
List<String>> containerToOpenKeysMap) {
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
fileIterator =
- openFileTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> fileIterator
= openFileTable.iterator()) {
while (fileIterator.hasNext()) {
Table.KeyValue<String, OmKeyInfo> entry = fileIterator.next();
addOpenKeyToContainerMap(entry.getKey(), entry.getValue(),
containerIds, containerToOpenKeysMap);
@@ -285,8 +282,7 @@ private void processOpenFiles(Set<Long> containerIds,
Map<Long, List<String>> co
}
private void processOpenKeys(Set<Long> containerIds, Map<Long, List<String>>
containerToOpenKeysMap) {
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
keyIterator =
- openKeyTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> keyIterator
= openKeyTable.iterator()) {
while (keyIterator.hasNext()) {
Table.KeyValue<String, OmKeyInfo> entry = keyIterator.next();
addOpenKeyToContainerMap(entry.getKey(), entry.getValue(),
containerIds, containerToOpenKeysMap);
@@ -309,7 +305,7 @@ private void addOpenKeyToContainerMap(String dbKey,
OmKeyInfo keyInfo, Set<Long>
}
private void processMultipartUpload(Set<Long> containerIds, Map<Long,
List<String>> containerToOpenKeysMap) {
- try (TableIterator<String, ? extends Table.KeyValue<String,
OmMultipartKeyInfo>> mpuIterator =
+ try (TableIterator<String, Table.KeyValue<String, OmMultipartKeyInfo>>
mpuIterator =
multipartInfoTable.iterator()) {
while (mpuIterator.hasNext()) {
@@ -350,8 +346,7 @@ private Set<Long> getKeyContainers(OmKeyInfo keyInfo,
Set<Long> targetContainerI
private void prepareDirIdTree(Map<Long, Pair<Long, String>> bucketVolMap)
throws Exception {
// Add bucket volume tree
- try (TableIterator<String, ? extends Table.KeyValue<String, OmBucketInfo>>
bucketIterator =
- bucketTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmBucketInfo>>
bucketIterator = bucketTable.iterator()) {
while (bucketIterator.hasNext()) {
Table.KeyValue<String, OmBucketInfo> entry = bucketIterator.next();
@@ -370,7 +365,7 @@ private void prepareDirIdTree(Map<Long, Pair<Long, String>>
bucketVolMap) throws
}
// Add dir tree
- try (TableIterator<String, ? extends Table.KeyValue<String,
OmDirectoryInfo>> directoryIterator =
+ try (TableIterator<String, Table.KeyValue<String, OmDirectoryInfo>>
directoryIterator =
directoryTable.iterator()) {
while (directoryIterator.hasNext()) {
diff --git
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
index f023f7d094d..ff2c7cef7ad 100644
---
a/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
+++
b/hadoop-ozone/cli-debug/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
@@ -81,8 +81,7 @@ public static void main(String[] args) throws IOException {
Map<Long, List<Map<Long, BlockIdDetails>>> dataMap = new HashMap<>();
if (keyTable != null) {
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
- keyValueTableIterator = keyTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
keyValueTableIterator = keyTable.iterator()) {
while (keyValueTableIterator.hasNext()) {
Table.KeyValue<String, OmKeyInfo> keyValue =
keyValueTableIterator.next();
diff --git
a/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/UpgradeContainerSchema.java
b/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/UpgradeContainerSchema.java
index 97f2e215ebf..fc2feef2135 100644
---
a/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/UpgradeContainerSchema.java
+++
b/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/UpgradeContainerSchema.java
@@ -423,8 +423,7 @@ private long transferTableData(Table<byte[], byte[]>
targetTable,
Table<byte[], byte[]> sourceTable, ContainerData containerData)
throws IOException {
long count = 0;
- try (TableIterator<byte[], ? extends Table.KeyValue<byte[], byte[]>>
- iter = sourceTable.iterator()) {
+ try (TableIterator<byte[], Table.KeyValue<byte[], byte[]>> iter =
sourceTable.iterator()) {
while (iter.hasNext()) {
count++;
Table.KeyValue<byte[], byte[]> next = iter.next();
diff --git
a/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java
b/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java
index 28c75f47456..68d1c229c6c 100644
---
a/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java
+++
b/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java
@@ -179,8 +179,7 @@ public Report run() throws Exception {
}
// Iterate all volumes or a specific volume if specified
- try (TableIterator<String, ? extends Table.KeyValue<String,
OmVolumeArgs>>
- volumeIterator = volumeTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmVolumeArgs>>
volumeIterator = volumeTable.iterator()) {
try {
openTempDB();
} catch (IOException e) {
@@ -214,7 +213,7 @@ public Report run() throws Exception {
} else {
// Iterate all buckets in the volume.
- try (TableIterator<String, ? extends Table.KeyValue<String,
OmBucketInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmBucketInfo>>
bucketIterator = bucketTable.iterator()) {
bucketIterator.seek(volumeKey);
while (bucketIterator.hasNext()) {
@@ -255,8 +254,7 @@ private boolean checkIfSnapshotExistsForBucket(String
volumeName, String bucketN
return false;
}
- try (TableIterator<String, ? extends Table.KeyValue<String,
SnapshotInfo>> iterator =
- snapshotInfoTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, SnapshotInfo>>
iterator = snapshotInfoTable.iterator()) {
while (iterator.hasNext()) {
SnapshotInfo snapshotInfo = iterator.next().getValue();
String snapshotPath = (volumeName + "/" +
bucketName).replaceFirst("^/", "");
@@ -333,7 +331,7 @@ private void
markPendingToDeleteObjectsInBucket(OmVolumeArgs volume, OmBucketInf
String bucketPrefix = OM_KEY_PREFIX + volume.getObjectID() +
OM_KEY_PREFIX + bucket.getObjectID();
try (BatchedTempWriter writer = new
BatchedTempWriter(pendingToDeleteTable)) {
- try (TableIterator<String, ? extends Table.KeyValue<String,
OmKeyInfo>> deletedDirIterator =
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
deletedDirIterator =
deletedDirectoryTable.iterator()) {
deletedDirIterator.seek(bucketPrefix);
while (deletedDirIterator.hasNext()) {
@@ -386,8 +384,7 @@ private void
handlePendingToDeleteAndOrphanedObjects(OmVolumeArgs volume, OmBuck
OM_KEY_PREFIX +
bucket.getObjectID();
- try (TableIterator<String, ? extends Table.KeyValue<String,
OmDirectoryInfo>> dirIterator =
- directoryTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmDirectoryInfo>>
dirIterator = directoryTable.iterator()) {
dirIterator.seek(bucketPrefix);
while (dirIterator.hasNext()) {
Table.KeyValue<String, OmDirectoryInfo> dirEntry =
dirIterator.next();
@@ -413,8 +410,7 @@ private void
handlePendingToDeleteAndOrphanedObjects(OmVolumeArgs volume, OmBuck
}
// Check for pendingToDelete and orphaned files
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
- fileIterator = fileTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
fileIterator = fileTable.iterator()) {
fileIterator.seek(bucketPrefix);
while (fileIterator.hasNext()) {
Table.KeyValue<String, OmKeyInfo> fileEntry = fileIterator.next();
@@ -484,8 +480,7 @@ private Collection<String>
getChildDirectoriesAndMarkAsReachable(OmVolumeArgs vo
Collection<String> childDirs = new ArrayList<>();
- try (TableIterator<String, ? extends Table.KeyValue<String,
OmDirectoryInfo>>
- dirIterator = directoryTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmDirectoryInfo>>
dirIterator = directoryTable.iterator()) {
String dirPrefix = buildReachableKey(volume, bucket, currentDir);
// Start searching the directory table at the current directory's
// prefix to get its immediate children.
@@ -513,8 +508,7 @@ private Collection<String>
getChildDirectoriesAndMarkAsPendingToDelete(String di
Collection<String> childDirs = new ArrayList<>();
// Find child directories and mark them as pendingToDelete
- try (TableIterator<String, ? extends Table.KeyValue<String,
OmDirectoryInfo>>
- dirIterator = directoryTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmDirectoryInfo>>
dirIterator = directoryTable.iterator()) {
// Start searching the directory table at the current directory's
// prefix to get its immediate children.
dirIterator.seek(dirPrefix);
@@ -537,8 +531,7 @@ private Collection<String>
getChildDirectoriesAndMarkAsPendingToDelete(String di
}
// Find child files and mark them as pendingToDelete
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
fileIterator =
- fileTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
fileIterator = fileTable.iterator()) {
fileIterator.seek(dirPrefix);
while (fileIterator.hasNext()) {
Table.KeyValue<String, OmKeyInfo> childFileEntry =
fileIterator.next();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java
index 519606fd285..16515710160 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java
@@ -896,7 +896,7 @@ public List<Long> getAllBlocks(MiniOzoneCluster cluster,
Long containerID) throw
KeyValueContainerData cData = getContainerMetadata(cluster, containerID);
try (DBHandle db = BlockUtils.getDB(cData, cluster.getConf())) {
- List<? extends Table.KeyValue<String, BlockData>> kvs =
+ List<Table.KeyValue<String, BlockData>> kvs =
db.getStore().getBlockDataTable()
.getRangeKVs(cData.startKeyEmpty(), Integer.MAX_VALUE,
cData.containerPrefix(), cData.getUnprefixedKeyFilter());
@@ -918,7 +918,7 @@ public boolean verifyBlocksWithTxnTable(MiniOzoneCluster
cluster,
DatanodeStore ds = db.getStore();
DatanodeStoreSchemaThreeImpl dnStoreImpl =
(DatanodeStoreSchemaThreeImpl) ds;
- List<? extends Table.KeyValue<String, DeletedBlocksTransaction>>
+ List<Table.KeyValue<String, DeletedBlocksTransaction>>
txnsInTxnTable = dnStoreImpl.getDeleteTransactionTable()
.getRangeKVs(cData.startKeyEmpty(), Integer.MAX_VALUE,
cData.containerPrefix());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
index 9f20507f75b..08b19aa420d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/OzoneRpcClientTests.java
@@ -5063,7 +5063,7 @@ private void checkExceptedResultForVersioningTest(String
volumeName,
cluster.getOzoneManager().awaitDoubleBufferFlush();
if (expectedCount == 1) {
- List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
+ List<Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= metadataManager.getDeletedTable().getRangeKVs(null, 100, ozoneKey);
assertThat(rangeKVs).isNotEmpty();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
index 07c3ad5b307..281c5b2d513 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneAtRestEncryption.java
@@ -810,7 +810,7 @@ void testGetKeyProvider() throws Exception {
private static RepeatedOmKeyInfo getMatchedKeyInfo(
String keyName, OMMetadataManager omMetadataManager) throws IOException {
- List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
+ List<Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= omMetadataManager.getDeletedTable().getRangeKVs(
null, 100, "/");
for (Table.KeyValue<String, RepeatedOmKeyInfo> rangeKV : rangeKVs) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java
index cf41bddfcd0..e055a071fcd 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java
@@ -562,7 +562,7 @@ private void clearBlocksTable(Container container) throws
IOException {
private void clearTable(DBHandle dbHandle, Table<String, BlockData> table,
Container container)
throws IOException {
- List<? extends Table.KeyValue<String, BlockData>>
+ List<Table.KeyValue<String, BlockData>>
blocks = table.getRangeKVs(
((KeyValueContainerData) container.getContainerData()).
startKeyEmpty(),
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDeletingServiceIntegrationTest.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDeletingServiceIntegrationTest.java
index d0b1ccbae68..ab2bb7c5e0f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDeletingServiceIntegrationTest.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/service/TestSnapshotDeletingServiceIntegrationTest.java
@@ -195,7 +195,7 @@ public void testSnapshotSplitAndMove() throws Exception {
OmSnapshot bucket1snap3 = getOmSnapshot(VOLUME_NAME, BUCKET_NAME_ONE,
"bucket1snap3").get();
// Check bucket1key1 added to next non deleted snapshot db.
- List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> omKeyInfos =
+ List<Table.KeyValue<String, RepeatedOmKeyInfo>> omKeyInfos =
bucket1snap3.getMetadataManager()
.getDeletedTable().getRangeKVs(null, 100,
"/vol1/bucket1/bucket1key1");
diff --git
a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
index be66ffc195b..161c1f8a4a8 100644
---
a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
+++
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
@@ -561,8 +561,7 @@ List<OmMultipartUpload> getMultipartUploadKeys(String
volumeName,
Iterator<Map.Entry<CacheKey<String>, CacheValue<OmBucketInfo>>>
getBucketIterator();
- TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
- getKeyIterator() throws IOException;
+ TableIterator<String, Table.KeyValue<String, OmKeyInfo>> getKeyIterator()
throws IOException;
/**
* Given parent object id and path component name, return the corresponding
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
index 5896266d708..bddbb6da572 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
@@ -721,7 +721,7 @@ public static <T> Map<String, T> extractKeysFromTable(
// If limit = -1, set it to Integer.MAX_VALUE to return all records
int actualLimit = (limit == -1) ? Integer.MAX_VALUE : limit;
- try (TableIterator<String, ? extends Table.KeyValue<String, T>> keyIter =
table.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, T>> keyIter =
table.iterator()) {
// Scenario 1 & 4: prevKey is provided (whether startPrefix is empty or
not)
if (!prevKey.isEmpty()) {
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
index 1ec207b973e..fac38bce519 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
@@ -1052,8 +1052,7 @@ private void retrieveKeysFromTable(
throws IOException {
boolean skipPrevKey = false;
String seekKey = paramInfo.getPrevKey();
- try (
- TableIterator<String, ? extends Table.KeyValue<String,
ReconBasicOmKeyInfo>> keyIter = table.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, ReconBasicOmKeyInfo>>
keyIter = table.iterator()) {
if (!paramInfo.isSkipPrevKeyDone() && isNotBlank(seekKey)) {
skipPrevKey = true;
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ReconGlobalMetricsService.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ReconGlobalMetricsService.java
index 0796fafd90b..d4dd2d21099 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ReconGlobalMetricsService.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ReconGlobalMetricsService.java
@@ -160,9 +160,7 @@ public KeyInsightInfoResponse
getPendingForDeletionDirInfo(int limit, String pre
if (deletedDirTable == null) {
return deletedDirInsightInfo;
}
- try (
- TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
- keyIter = deletedDirTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> keyIter =
deletedDirTable.iterator()) {
boolean skipPrevKey = false;
String lastKey = "";
if (isNotBlank(prevKey)) {
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/FSOBucketHandler.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/FSOBucketHandler.java
index 7d482745c21..cce757f2b27 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/FSOBucketHandler.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/FSOBucketHandler.java
@@ -139,8 +139,7 @@ public long handleDirectKeys(long parentId, boolean
withReplica,
Table<String, OmKeyInfo> keyTable = getOmMetadataManager().getFileTable();
long keyDataSizeWithReplica = 0L;
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
- iterator = keyTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> iterator =
keyTable.iterator()) {
String seekPrefix = OM_KEY_PREFIX +
volumeId +
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/LegacyBucketHandler.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/LegacyBucketHandler.java
index 03396a63400..4ea3ce888ef 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/LegacyBucketHandler.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/LegacyBucketHandler.java
@@ -77,8 +77,7 @@ public EntityType determineKeyPath(String keyName)
Table<String, OmKeyInfo> keyTable = getKeyTable();
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
- iterator = keyTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> iterator =
keyTable.iterator()) {
iterator.seek(key);
if (iterator.hasNext()) {
@@ -150,7 +149,7 @@ public long handleDirectKeys(long parentId, boolean
withReplica,
seekPrefix += dirName;
}
String[] seekKeys = seekPrefix.split(OM_KEY_PREFIX);
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
iterator = keyTable.iterator()) {
iterator.seek(seekPrefix);
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/OBSBucketHandler.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/OBSBucketHandler.java
index 7c4fb871791..b0849971832 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/OBSBucketHandler.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/OBSBucketHandler.java
@@ -67,9 +67,7 @@ public EntityType determineKeyPath(String keyName) throws
IOException {
Table<String, OmKeyInfo> keyTable = getKeyTable();
- try (
- TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
- iterator = keyTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> iterator =
keyTable.iterator()) {
iterator.seek(key);
if (iterator.hasNext()) {
Table.KeyValue<String, OmKeyInfo> kv = iterator.next();
@@ -111,9 +109,7 @@ public long handleDirectKeys(long parentId, boolean
withReplica,
Table<String, OmKeyInfo> keyTable = getKeyTable();
long keyDataSizeWithReplica = 0L;
- try (
- TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
- iterator = keyTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> iterator =
keyTable.iterator()) {
String seekPrefix = OM_KEY_PREFIX +
vol +
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOmMetadataManagerImpl.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOmMetadataManagerImpl.java
index 85a8fd86bbb..ae0059f039d 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOmMetadataManagerImpl.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOmMetadataManagerImpl.java
@@ -207,8 +207,7 @@ public List<OmVolumeArgs> listVolumes(String startKey,
return result;
}
- try (TableIterator<String, ? extends Table.KeyValue<String, OmVolumeArgs>>
- iterator = volumeTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmVolumeArgs>> iterator
= volumeTable.iterator()) {
while (iterator.hasNext() && result.size() < maxKeys) {
Table.KeyValue<String, OmVolumeArgs> kv = iterator.next();
@@ -283,7 +282,7 @@ public List<OmBucketInfo> listBucketsUnderVolume(final
String volumeName,
// Unlike in {@link OmMetadataManagerImpl}, the buckets are queried
directly
// from the volume table (not through cache) since Recon does not use
// Table cache.
- try (TableIterator<String, ? extends Table.KeyValue<String, OmBucketInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmBucketInfo>>
iterator = getBucketTable().iterator(seekPrefix)) {
while (currentCount < maxNumOfBuckets && iterator.hasNext()) {
@@ -341,8 +340,7 @@ private List<OmBucketInfo> listAllBuckets(final int
maxNumberOfBuckets)
return result;
}
- try (TableIterator<String, ? extends Table.KeyValue<String, OmBucketInfo>>
- iterator = bucketTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmBucketInfo>> iterator
= bucketTable.iterator()) {
while (currentCount < maxNumberOfBuckets && iterator.hasNext()) {
Table.KeyValue<String, OmBucketInfo> kv = iterator.next();
OmBucketInfo omBucketInfo = kv.getValue();
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconNodeManager.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconNodeManager.java
index e5cdf65c910..624824ccc81 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconNodeManager.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconNodeManager.java
@@ -107,8 +107,7 @@ public ReconNodeManager(OzoneConfiguration conf,
SCMStorageConfig scmStorageConf
}
private void loadExistingNodes() {
- try (TableIterator<DatanodeID, ? extends Table.KeyValue<DatanodeID,
DatanodeDetails>>
- iterator = nodeDB.iterator()) {
+ try (TableIterator<DatanodeID, Table.KeyValue<DatanodeID,
DatanodeDetails>> iterator = nodeDB.iterator()) {
int nodeCount = 0;
while (iterator.hasNext()) {
DatanodeDetails datanodeDetails = iterator.next().getValue();
@@ -266,8 +265,7 @@ public void reinitialize(Table<DatanodeID, DatanodeDetails>
nodeTable) {
@VisibleForTesting
public long getNodeDBKeyCount() throws IOException {
long nodeCount = 0;
- try (TableIterator<DatanodeID, ? extends Table.KeyValue<DatanodeID,
DatanodeDetails>>
- iterator = nodeDB.iterator()) {
+ try (TableIterator<DatanodeID, Table.KeyValue<DatanodeID,
DatanodeDetails>> iterator = nodeDB.iterator()) {
while (iterator.hasNext()) {
iterator.next();
nodeCount++;
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
index 73f76e4731a..c4caf6527ca 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
@@ -964,8 +964,7 @@ private void initializeNewRdbStore(File dbFile) throws
IOException {
if (oldStore != null) {
final Table<DatanodeID, DatanodeDetails> nodeTable =
ReconSCMDBDefinition.NODES.getTable(oldStore);
- try (TableIterator<DatanodeID, ? extends KeyValue<DatanodeID,
- DatanodeDetails>> iterator = nodeTable.iterator()) {
+ try (TableIterator<DatanodeID, Table.KeyValue<DatanodeID,
DatanodeDetails>> iterator = nodeTable.iterator()) {
while (iterator.hasNext()) {
final KeyValue<DatanodeID, DatanodeDetails> keyValue =
iterator.next();
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/OzoneManagerServiceProviderImpl.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/OzoneManagerServiceProviderImpl.java
index cd62b2160da..f5d7e4e0acf 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/OzoneManagerServiceProviderImpl.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/OzoneManagerServiceProviderImpl.java
@@ -937,7 +937,7 @@ private void printTableCount(String tableName) {
return;
}
if (LOG.isDebugEnabled()) {
- try (TableIterator<String, ? extends Table.KeyValue<String, ?>> iterator
= table.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, ?>> iterator =
table.iterator()) {
long count = Iterators.size(iterator);
LOG.debug("{} Table count: {}", tableName, count);
} catch (IOException ioException) {
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java
index 470b2d2a812..10d18383914 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java
@@ -351,8 +351,7 @@ public Map<ContainerKeyPrefix, Integer>
getKeyPrefixesForContainer(
long containerId, String prevKeyPrefix, int limit) throws IOException {
Map<ContainerKeyPrefix, Integer> prefixes = new LinkedHashMap<>();
- try (TableIterator<ContainerKeyPrefix,
- ? extends KeyValue<ContainerKeyPrefix, Integer>>
+ try (TableIterator<ContainerKeyPrefix, Table.KeyValue<ContainerKeyPrefix,
Integer>>
containerIterator = containerKeyTable.iterator()) {
ContainerKeyPrefix seekKey;
boolean skipPrevKey = false;
@@ -439,7 +438,7 @@ public SeekableIterator<Long, ContainerMetadata>
getContainersIterator()
}
private class ContainerMetadataIterator implements SeekableIterator<Long,
ContainerMetadata> {
- private TableIterator<ContainerKeyPrefix, ? extends
KeyValue<ContainerKeyPrefix, Integer>> containerIterator;
+ private TableIterator<ContainerKeyPrefix,
Table.KeyValue<ContainerKeyPrefix, Integer>> containerIterator;
private KeyValue<ContainerKeyPrefix, Integer> currentKey;
ContainerMetadataIterator()
@@ -613,8 +612,7 @@ public Map<KeyPrefixContainer, Integer>
getContainerForKeyPrefixes(
String keyPrefix, long keyVersion) throws IOException {
Map<KeyPrefixContainer, Integer> containers = new LinkedHashMap<>();
- try (TableIterator<KeyPrefixContainer,
- ? extends KeyValue<KeyPrefixContainer, Integer>> keyIterator =
+ try (TableIterator<KeyPrefixContainer, Table.KeyValue<KeyPrefixContainer,
Integer>> keyIterator =
keyContainerTable.iterator()) {
KeyPrefixContainer seekKey;
if (keyVersion != -1) {
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconDBProvider.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconDBProvider.java
index ab84e990634..16a303aa6fe 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconDBProvider.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconDBProvider.java
@@ -115,8 +115,7 @@ static void truncateTable(Table table) throws IOException {
if (table == null) {
return;
}
- try (TableIterator<Object, ? extends KeyValue<Object, Object>>
- tableIterator = table.iterator()) {
+ try (TableIterator<Object, Table.KeyValue<Object, Object>> tableIterator =
table.iterator()) {
while (tableIterator.hasNext()) {
KeyValue<Object, Object> entry = tableIterator.next();
table.delete(entry.getKey());
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperHelper.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperHelper.java
index 3e60ceceb6b..6998baaabe4 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperHelper.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperHelper.java
@@ -378,7 +378,7 @@ private static void handleDeleteOMKeyEvent(String key,
throws IOException {
Set<ContainerKeyPrefix> keysToBeDeleted = new HashSet<>();
- try (TableIterator<KeyPrefixContainer, ? extends
Table.KeyValue<KeyPrefixContainer, Integer>>
+ try (TableIterator<KeyPrefixContainer, Table.KeyValue<KeyPrefixContainer,
Integer>>
keyContainerIterator =
reconContainerMetadataManager.getKeyContainerTableIterator()) {
// Check if we have keys in this container in the DB
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/DeletedKeysInsightHandler.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/DeletedKeysInsightHandler.java
index 54e375ae0d6..1567332b6f9 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/DeletedKeysInsightHandler.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/DeletedKeysInsightHandler.java
@@ -120,7 +120,7 @@ public Triple<Long, Long, Long> getTableSizeAndCount(String
tableName,
long replicatedSize = 0;
Table<String, RepeatedOmKeyInfo> table =
omMetadataManager.getDeletedTable();
- try (TableIterator<String, ? extends Table.KeyValue<String,
RepeatedOmKeyInfo>> iterator = table.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, RepeatedOmKeyInfo>>
iterator = table.iterator()) {
while (iterator.hasNext()) {
Table.KeyValue<String, RepeatedOmKeyInfo> kv = iterator.next();
if (kv != null && kv.getValue() != null) {
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/MultipartInfoInsightHandler.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/MultipartInfoInsightHandler.java
index 828192ec127..4f14de2885b 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/MultipartInfoInsightHandler.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/MultipartInfoInsightHandler.java
@@ -158,7 +158,7 @@ public Triple<Long, Long, Long> getTableSizeAndCount(String
tableName,
Table<String, OmMultipartKeyInfo> table =
(Table<String, OmMultipartKeyInfo>)
omMetadataManager.getTable(tableName);
- try (TableIterator<String, ? extends Table.KeyValue<String,
OmMultipartKeyInfo>> iterator = table.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmMultipartKeyInfo>>
iterator = table.iterator()) {
while (iterator.hasNext()) {
Table.KeyValue<String, OmMultipartKeyInfo> kv = iterator.next();
if (kv != null && kv.getValue() != null) {
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java
index cca44fd71fc..7a12c3e0b1e 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/NSSummaryTaskWithLegacy.java
@@ -273,8 +273,7 @@ public boolean reprocessWithLegacy(OMMetadataManager
omMetadataManager) {
Table<String, OmKeyInfo> keyTable =
omMetadataManager.getKeyTable(LEGACY_BUCKET_LAYOUT);
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
- keyTableIter = keyTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
keyTableIter = keyTable.iterator()) {
while (keyTableIter.hasNext()) {
Table.KeyValue<String, OmKeyInfo> kv = keyTableIter.next();
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OpenKeysInsightHandler.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OpenKeysInsightHandler.java
index b78e8cb1518..b37cf306309 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OpenKeysInsightHandler.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OpenKeysInsightHandler.java
@@ -135,7 +135,7 @@ public Triple<Long, Long, Long> getTableSizeAndCount(String
tableName,
long replicatedSize = 0;
Table<String, OmKeyInfo> table = (Table<String, OmKeyInfo>)
omMetadataManager.getTable(tableName);
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
iterator = table.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> iterator =
table.iterator()) {
while (iterator.hasNext()) {
Table.KeyValue<String, OmKeyInfo> kv = iterator.next();
if (kv != null && kv.getValue() != null) {
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/util/ParallelTableIteratorOperation.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/util/ParallelTableIteratorOperation.java
index 3c378c36cd9..427c3b091b7 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/util/ParallelTableIteratorOperation.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/util/ParallelTableIteratorOperation.java
@@ -146,7 +146,7 @@ public void performTaskOnTableVals(String taskName, K
startKey, K endKey,
LOG.debug("Length of the bounds - {}", bounds.size());
// Fallback for small tables (no SST files yet - data only in memtable)
if (bounds.size() < 2) {
- try (TableIterator<K, ? extends Table.KeyValue<K, V>> iter =
table.iterator()) {
+ try (TableIterator<K, Table.KeyValue<K, V>> iter = table.iterator()) {
if (startKey != null) {
iter.seek(startKey);
}
@@ -188,7 +188,7 @@ public void performTaskOnTableVals(String taskName, K
startKey, K endKey,
// ===== STEP 3: SUBMIT ITERATOR TASK =====
iterFutures.add(iteratorExecutor.submit(() -> {
- try (TableIterator<K, ? extends Table.KeyValue<K, V>> iter =
table.iterator()) {
+ try (TableIterator<K, Table.KeyValue<K, V>> iter = table.iterator()) {
iter.seek(beg);
while (iter.hasNext()) {
List<Table.KeyValue<K, V>> keyValues = new ArrayList<>();
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java
index c4b1041f76a..d4b6bbeded7 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestFileSizeCountTask.java
@@ -94,7 +94,7 @@ public void setUp() throws IOException {
fileSizeCountTaskOBS = new FileSizeCountTaskOBS(reconFileMetadataManager,
configuration);
fileSizeCountTaskFSO = new FileSizeCountTaskFSO(reconFileMetadataManager,
configuration);
// Clear RocksDB table before each test.
- try (TableIterator<FileSizeCountKey, ? extends
Table.KeyValue<FileSizeCountKey, Long>> iterator =
+ try (TableIterator<FileSizeCountKey, Table.KeyValue<FileSizeCountKey,
Long>> iterator =
reconFileMetadataManager.getFileCountTable().iterator()) {
while (iterator.hasNext()) {
Table.KeyValue<FileSizeCountKey, Long> keyValue = iterator.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
