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 9b7dccd80f2 HDDS-13255. Change `<? extends KeyValue>` to `<KeyValue>`
in ozone-manger (#10793)
9b7dccd80f2 is described below
commit 9b7dccd80f23bb63dcba0fd740526f43236e4a0e
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Sat Jul 18 07:04:42 2026 -0700
HDDS-13255. Change `<? extends KeyValue>` to `<KeyValue>` in ozone-manger
(#10793)
---
.../org/apache/hadoop/ozone/om/KeyManager.java | 4 ++--
.../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 23 +++++++++++-----------
.../org/apache/hadoop/ozone/om/ListIterator.java | 3 +--
.../hadoop/ozone/om/OMDBCheckpointServlet.java | 2 +-
.../om/OMDBCheckpointServletInodeBasedXfer.java | 2 +-
.../hadoop/ozone/om/OMMultiTenantManagerImpl.java | 4 ++--
.../hadoop/ozone/om/OmMetadataManagerImpl.java | 18 ++++++++---------
.../org/apache/hadoop/ozone/om/OzoneManager.java | 5 ++---
.../hadoop/ozone/om/SnapshotChainManager.java | 2 +-
.../hadoop/ozone/om/SstFilteringService.java | 3 +--
.../ozone/om/request/OMClientRequestUtils.java | 2 +-
.../om/request/bucket/OMBucketDeleteRequest.java | 6 ++----
.../ozone/om/request/file/OMFileRequest.java | 2 +-
.../om/request/util/OMMultipartUploadUtils.java | 3 +--
.../om/request/volume/OMQuotaRepairRequest.java | 2 +-
.../ozone/om/service/DirectoryDeletingService.java | 5 ++---
.../ozone/om/service/OMRangerBGSyncService.java | 4 ++--
.../om/snapshot/FSODirectoryPathResolver.java | 3 +--
.../om/request/key/TestOMKeyCommitRequest.java | 4 ++--
.../TestS3MultipartUploadCompleteRequest.java | 2 +-
.../snapshot/TestOMSnapshotCreateRequest.java | 6 +++---
.../om/response/key/TestOMKeyCommitResponse.java | 2 +-
.../om/response/key/TestOMKeyDeleteResponse.java | 2 +-
.../TestS3MultipartUploadCommitPartResponse.java | 2 +-
.../ozone/om/service/TestKeyDeletingService.java | 2 +-
.../om/snapshot/TestFSODirectoryPathResolver.java | 2 +-
26 files changed, 52 insertions(+), 63 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java
index fdf4172c71b..4579e244481 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java
@@ -276,7 +276,7 @@ OmMultipartUploadListParts listParts(String volumeName,
String bucketName,
/**
* Returns an iterator for pending deleted directories all buckets.
*/
- default TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
getDeletedDirEntries() throws IOException {
+ default TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
getDeletedDirEntries() throws IOException {
return getDeletedDirEntries(null, null);
}
@@ -284,7 +284,7 @@ OmMultipartUploadListParts listParts(String volumeName,
String bucketName,
* Returns an iterator for pending deleted directories for volume and bucket.
* @throws IOException
*/
- TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
getDeletedDirEntries(
+ TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
getDeletedDirEntries(
String volume, String bucket) throws IOException;
default List<Table.KeyValue<String, OmKeyInfo>> getDeletedDirEntries(String
volume, String bucket, int size)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index 3232f9b1ff3..a7d4c549b26 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -827,7 +827,7 @@ public PendingKeysDeletion getPendingDeletionKeys(
// Bucket prefix would be empty if volume is empty i.e. either null or "".
Table<String, RepeatedOmKeyInfo> deletedTable =
metadataManager.getDeletedTable();
Optional<String> bucketPrefix = getBucketPrefix(volume, bucket,
deletedTable);
- try (TableIterator<String, ? extends KeyValue<String, RepeatedOmKeyInfo>>
+ try (TableIterator<String, Table.KeyValue<String, RepeatedOmKeyInfo>>
delKeyIter = deletedTable.iterator(bucketPrefix.orElse(""))) {
/* Seeking to the start key if it not null. The next key picked up would
be ensured to start with the bucket
@@ -888,7 +888,7 @@ public PendingKeysDeletion getPendingDeletionKeys(
}
private <V, R> List<KeyValue<String, R>> getTableEntries(String startKey,
- TableIterator<String, ? extends KeyValue<String, V>> tableIterator,
+ TableIterator<String, Table.KeyValue<String, V>> tableIterator,
Function<V, R> valueFunction,
CheckedFunction<KeyValue<String, V>, Boolean, IOException> filter,
int size) throws IOException {
@@ -929,7 +929,7 @@ public List<KeyValue<String, String>> getRenamesKeyEntries(
CheckedFunction<KeyValue<String, String>, Boolean, IOException> filter,
int size) throws IOException {
Table<String, String> snapshotRenamedTable =
metadataManager.getSnapshotRenamedTable();
Optional<String> bucketPrefix = getBucketPrefix(volume, bucket,
snapshotRenamedTable);
- try (TableIterator<String, ? extends KeyValue<String, String>>
+ try (TableIterator<String, Table.KeyValue<String, String>>
renamedKeyIter =
snapshotRenamedTable.iterator(bucketPrefix.orElse(""))) {
return getTableEntries(startKey, renamedKeyIter, Function.identity(),
filter, size);
}
@@ -980,7 +980,7 @@ public List<KeyValue<String, List<OmKeyInfo>>>
getDeletedKeyEntries(
int size) throws IOException {
Table<String, RepeatedOmKeyInfo> deletedTable =
metadataManager.getDeletedTable();
Optional<String> bucketPrefix = getBucketPrefix(volume, bucket,
deletedTable);
- try (TableIterator<String, ? extends KeyValue<String, RepeatedOmKeyInfo>>
+ try (TableIterator<String, Table.KeyValue<String, RepeatedOmKeyInfo>>
delKeyIter = deletedTable.iterator(bucketPrefix.orElse(""))) {
return getTableEntries(startKey, delKeyIter,
RepeatedOmKeyInfo::cloneOmKeyInfoList, filter, size);
}
@@ -1667,7 +1667,7 @@ private OmKeyInfo createFakeDirIfShould(String volume,
String bucket,
}
}
- try (TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
keyTblItr = keyTable.iterator(targetKey)) {
while (keyTblItr.hasNext()) {
KeyValue<String, OmKeyInfo> keyValue = keyTblItr.next();
@@ -1975,7 +1975,7 @@ public List<OzoneFileStatus> listStatus(OmKeyArgs args,
boolean recursive,
String keyArgs = OzoneFSUtils.addTrailingSlashIfNeeded(
metadataManager.getOzoneKey(volumeName, bucketName, keyName));
- TableIterator<String, ? extends KeyValue<String, OmKeyInfo>> iterator;
+ TableIterator<String, Table.KeyValue<String, OmKeyInfo>> iterator;
Table<String, OmKeyInfo> keyTable;
metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName,
bucketName);
@@ -2032,12 +2032,12 @@ public List<OzoneFileStatus> listStatus(OmKeyArgs args,
boolean recursive,
return fileStatusList;
}
- private TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
+ private TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
getIteratorForKeyInTableCache(
boolean recursive, String startKey, String volumeName, String bucketName,
TreeMap<String, OzoneFileStatus> cacheKeyMap, String keyArgs,
Table<String, OmKeyInfo> keyTable) throws IOException {
- TableIterator<String, ? extends KeyValue<String, OmKeyInfo>> iterator;
+ TableIterator<String, Table.KeyValue<String, OmKeyInfo>> iterator;
Iterator<Map.Entry<CacheKey<String>, CacheValue<OmKeyInfo>>>
cacheIter = keyTable.cacheIterator();
String startCacheKey = metadataManager.getOzoneKey(volumeName, bucketName,
startKey);
@@ -2054,8 +2054,7 @@ private void findKeyInDbWithIterator(boolean recursive,
String startKey,
long numEntries, String volumeName, String bucketName, String keyName,
TreeMap<String, OzoneFileStatus> cacheKeyMap, String keyArgs,
Table<String, OmKeyInfo> keyTable,
- TableIterator<String,
- ? extends KeyValue<String, OmKeyInfo>> iterator)
+ TableIterator<String, Table.KeyValue<String, OmKeyInfo>> iterator)
throws IOException {
// Then, find key in DB
String seekKeyInDb =
@@ -2311,7 +2310,7 @@ private void slimLocationVersion(OmKeyInfo... keyInfos) {
}
@Override
- public TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
getDeletedDirEntries(
+ public TableIterator<String, KeyValue<String, OmKeyInfo>>
getDeletedDirEntries(
String volume, String bucket) throws IOException {
Table<String, OmKeyInfo> deletedDirTable =
metadataManager.getDeletedDirTable();
Optional<String> bucketPrefix = getBucketPrefix(volume, bucket,
deletedDirTable);
@@ -2333,7 +2332,7 @@ private <T extends WithParentObjectId> DeleteKeysResult
gatherSubPathsWithIterat
throws IOException {
List<OmKeyInfo> keyInfos = new ArrayList<>();
String seekFileInDB = metadataManager.getOzonePathKey(volumeId, bucketId,
parentInfo.getObjectID(), "");
- try (TableIterator<String, ? extends KeyValue<String, T>> iterator =
table.iterator(seekFileInDB)) {
+ try (TableIterator<String, Table.KeyValue<String, T>> iterator =
table.iterator(seekFileInDB)) {
while (iterator.hasNext() && remainingNum > 0) {
KeyValue<String, T> entry = iterator.next();
KeyValue<String, OmKeyInfo> keyInfo =
deleteKeyTransformer.apply(entry);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java
index 426e7b73ec4..e7737c20699 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java
@@ -115,8 +115,7 @@ public int hashCode() {
public static class DbTableIter<Value> implements
ClosableIterator {
private final int entryIteratorId;
- private final TableIterator<String,
- ? extends Table.KeyValue<String, Value>> tableIterator;
+ private final TableIterator<String, Table.KeyValue<String, Value>>
tableIterator;
private final Table<String, Value> table;
private HeapEntry currentEntry;
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
index fbb1b56ff16..9e8fc5c79f9 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
@@ -387,7 +387,7 @@ private Set<Path> getSnapshotDirs(DBCheckpoint checkpoint,
boolean waitForDir)
try (OmMetadataManagerImpl checkpointMetadataManager =
OmMetadataManagerImpl.createCheckpointMetadataManager(
conf, checkpoint);
- TableIterator<String, ? extends Table.KeyValue<String, SnapshotInfo>>
+ TableIterator<String, Table.KeyValue<String, SnapshotInfo>>
iterator = checkpointMetadataManager
.getSnapshotInfoTable().iterator()) {
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServletInodeBasedXfer.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServletInodeBasedXfer.java
index 9cea3d5a0ff..0e055467096 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServletInodeBasedXfer.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServletInodeBasedXfer.java
@@ -483,7 +483,7 @@ private OzoneConfiguration getConf() {
Map<UUID, Path> getSnapshotDirsFromDB(OMMetadataManager
activeOMMetadataManager, OMMetadataManager omMetadataManager,
OmSnapshotLocalDataManager localDataManager) throws IOException {
Map<UUID, Path> snapshotPaths = new HashMap<>();
- try (TableIterator<String, ? extends Table.KeyValue<String, SnapshotInfo>>
iter =
+ try (TableIterator<String, Table.KeyValue<String, SnapshotInfo>> iter =
omMetadataManager.getSnapshotInfoTable().iterator()) {
while (iter.hasNext()) {
Table.KeyValue<String, SnapshotInfo> kv = iter.next();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java
index f2449a3c68e..157b5bdba89 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java
@@ -841,7 +841,7 @@ private void loadTenantCacheFromDB() {
// First load each tenant as a key into the cache.
final Table<String, OmDBTenantState> tenantStateTable =
omMetadataManager.getTenantStateTable();
- try (TableIterator<String, ? extends KeyValue<String, OmDBTenantState>>
+ try (TableIterator<String, Table.KeyValue<String, OmDBTenantState>>
tenantStateTableIter = tenantStateTable.iterator()) {
while (tenantStateTableIter.hasNext()) {
final KeyValue<String, OmDBTenantState> next =
@@ -863,7 +863,7 @@ private void loadTenantCacheFromDB() {
int userCount = 0;
final Table<String, OmDBAccessIdInfo> tenantAccessIdTable =
omMetadataManager.getTenantAccessIdTable();
- try (TableIterator<String, ? extends KeyValue<String, OmDBAccessIdInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmDBAccessIdInfo>>
accessIdTableIter = tenantAccessIdTable.iterator()) {
while (accessIdTableIter.hasNext()) {
final KeyValue<String, OmDBAccessIdInfo> next =
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
index 283bb493358..d26de751436 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
@@ -852,8 +852,7 @@ private <T> boolean isKeyPresentInTableCache(String
keyPrefix,
private <T> boolean isKeyPresentInTable(String keyPrefix,
Table<String, T> table)
throws IOException {
- try (TableIterator<String, ? extends KeyValue<String, T>>
- keyIter = table.iterator(keyPrefix)) {
+ try (TableIterator<String, Table.KeyValue<String, T>> keyIter =
table.iterator(keyPrefix)) {
KeyValue<String, T> kv = null;
if (keyIter.hasNext()) {
kv = keyIter.next();
@@ -992,7 +991,7 @@ public List<OmBucketInfo> listBuckets(final String
volumeName,
}
@Override
- public TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
+ public TableIterator<String, KeyValue<String, OmKeyInfo>>
getKeyIterator() throws IOException {
return keyTable.iterator();
}
@@ -1018,8 +1017,7 @@ public ListOpenFilesResult listOpenFiles(BucketLayout
bucketLayout,
okTable = getOpenKeyTable(bucketLayout);
// No lock required since table iterator creates a "snapshot"
- try (TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
- openKeyIter = okTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> openKeyIter
= okTable.iterator()) {
KeyValue<String, OmKeyInfo> kv;
kv = openKeyIter.seek(dbContTokenPrefix);
if (hasContToken && kv.getKey().equals(dbContTokenPrefix)) {
@@ -1135,7 +1133,7 @@ public ListKeysResult listKeys(String volumeName, String
bucketName,
int currentCount = 0;
long readFromRDbStartNs, readFromRDbStopNs = 0;
// Get maxKeys from DB if it has.
- try (TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
keyIter = getKeyTable(getBucketLayout()).iterator()) {
readFromRDbStartNs = Time.monotonicNowNanos();
KeyValue< String, OmKeyInfo > kv;
@@ -1445,7 +1443,7 @@ public ExpiredOpenKeys getExpiredOpenKeys(Duration
expireThreshold,
// Only check for expired keys in the open key table, not its cache.
// If a key expires while it is in the cache, it will be cleaned
// up after the cache is flushed.
- try (TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
keyValueTableIterator = getOpenKeyTable(bucketLayout).iterator()) {
final long expiredCreationTimestamp =
@@ -1523,7 +1521,7 @@ public List<ExpiredMultipartUploadsBucket>
getExpiredMultipartUploads(
Map<String, ExpiredMultipartUploadsBucket.Builder> expiredMPUs =
new HashMap<>();
- try (TableIterator<String, ? extends KeyValue<String, OmMultipartKeyInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmMultipartKeyInfo>>
mpuInfoTableIterator = getMultipartInfoTable().iterator()) {
final long expiredCreationTimestamp =
@@ -1570,7 +1568,7 @@ public <KEY, VALUE> long countRowsInTable(Table<KEY,
VALUE> table)
throws IOException {
long count = 0;
if (table != null) {
- try (TableIterator<KEY, ? extends KeyValue<KEY, VALUE>>
+ try (TableIterator<KEY, Table.KeyValue<KEY, VALUE>>
keyValueTableIterator = table.iterator()) {
while (keyValueTableIterator.hasNext()) {
keyValueTableIterator.next();
@@ -1642,7 +1640,7 @@ public List<OmMultipartUpload> getMultipartUploadKeys(
int dbKeysCount = 0;
// the prefix iterator will only iterate keys that match the given prefix
// so we don't need to check if the key is started with prefixKey again
- try (TableIterator<String, ? extends KeyValue<String, OmMultipartKeyInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmMultipartKeyInfo>>
iterator = getMultipartInfoTable().iterator(prefixKey)) {
iterator.seek(seekKey);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 5d1e33f7cd8..92fc332a5cc 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -853,8 +853,7 @@ public void run() {
public void warmUpEdekCache(final ExecutorService executor, final int delay,
final int interval, int maxRetries) {
Set<String> keys = new HashSet<>();
- try (
- TableIterator<String, ? extends Table.KeyValue<String, OmBucketInfo>>
iterator =
+ try (TableIterator<String, Table.KeyValue<String, OmBucketInfo>> iterator =
metadataManager.getBucketTable().iterator()) {
while (iterator.hasNext()) {
Table.KeyValue<String, OmBucketInfo> entry = iterator.next();
@@ -3710,7 +3709,7 @@ public TenantStateList listTenant() throws IOException {
// are flushed to the table. This should be acceptable for a list tenant
// request.
- try (TableIterator<String, ? extends KeyValue<String, OmDBTenantState>>
+ try (TableIterator<String, Table.KeyValue<String, OmDBTenantState>>
iterator = tenantStateTable.iterator()) {
final List<TenantState> tenantStateList = new ArrayList<>();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/SnapshotChainManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/SnapshotChainManager.java
index c4d8f18637a..5951c1303ff 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/SnapshotChainManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/SnapshotChainManager.java
@@ -286,7 +286,7 @@ private boolean deleteSnapshotPath(String snapshotPath,
private boolean loadFromSnapshotInfoTable(OMMetadataManager metadataManager)
{
// read from snapshotInfo table to populate
// snapshot chains - both global and local path
- try (TableIterator<String, ? extends Table.KeyValue<String, SnapshotInfo>>
+ try (TableIterator<String, Table.KeyValue<String, SnapshotInfo>>
keyIter = metadataManager.getSnapshotInfoTable().iterator()) {
Map<UUID, SnapshotInfo> snaps = new HashMap<>();
// Forward Linked list for snapshot chain.
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/SstFilteringService.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/SstFilteringService.java
index 9dc8332697b..03124c77cbd 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/SstFilteringService.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/SstFilteringService.java
@@ -197,8 +197,7 @@ public BackgroundTaskResult call() throws Exception {
Table<String, SnapshotInfo> snapshotInfoTable =
ozoneManager.getMetadataManager().getSnapshotInfoTable();
-
- try (TableIterator<String, ? extends Table.KeyValue
+ try (TableIterator<String, Table.KeyValue
<String, SnapshotInfo>> iterator = snapshotInfoTable
.iterator()) {
iterator.seekToFirst();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequestUtils.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequestUtils.java
index 7a6a3b3c3b2..dab476f9c9b 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequestUtils.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequestUtils.java
@@ -73,7 +73,7 @@ public static boolean isSnapshotBucket(OMMetadataManager
omMetadataManager,
private static boolean checkInSnapshotDB(OMMetadataManager omMetadataManager,
String dbSnapshotBucketKey) throws IOException {
- try (TableIterator<String, ? extends Table.KeyValue<String, SnapshotInfo>>
+ try (TableIterator<String, Table.KeyValue<String, SnapshotInfo>>
iterator = omMetadataManager.getSnapshotInfoTable().iterator()) {
iterator.seek(dbSnapshotBucketKey);
return iterator.hasNext() && iterator.next().getKey()
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketDeleteRequest.java
index deb2c8a05b3..f8259586f63 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketDeleteRequest.java
@@ -234,10 +234,8 @@ private boolean bucketContainsSnapshot(OMMetadataManager
omMetadataManager,
private boolean bucketContainsSnapshotInTable(
OMMetadataManager omMetadataManager, String snapshotBucketKey)
throws IOException {
- try (
- TableIterator<String, ? extends Table.KeyValue<String, SnapshotInfo>>
- snapshotIterator = omMetadataManager
- .getSnapshotInfoTable().iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, SnapshotInfo>>
snapshotIterator
+ = omMetadataManager.getSnapshotInfoTable().iterator()) {
snapshotIterator.seek(snapshotBucketKey);
if (snapshotIterator.hasNext()) {
return snapshotIterator.next().getKey().startsWith(snapshotBucketKey);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
index 54006c13427..372e5931732 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
@@ -944,7 +944,7 @@ private static boolean checkSubFileExists(OmKeyInfo
omKeyInfo,
// Check fileTable entries for any sub paths.
String seekFileInDB = metaMgr.getOzonePathKey(volumeId, bucketId,
omKeyInfo.getObjectID(), "");
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
iterator = fileTable.iterator(seekFileInDB)) {
while (iterator.hasNext()) {
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMMultipartUploadUtils.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMMultipartUploadUtils.java
index e896ea0ee64..598f7dc9410 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMMultipartUploadUtils.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMMultipartUploadUtils.java
@@ -144,8 +144,7 @@ public static SortedMap<Integer, OmMultipartPartInfo>
scanParts(
}
OmMultipartPartKey prefix = OmMultipartPartKey.prefix(uploadId);
- try (TableIterator<OmMultipartPartKey,
- ? extends Table.KeyValue<OmMultipartPartKey, OmMultipartPartInfo>>
+ try (TableIterator<OmMultipartPartKey, Table.KeyValue<OmMultipartPartKey,
OmMultipartPartInfo>>
iterator =
omMetadataManager.getMultipartPartsTable().iterator(prefix)) {
while (iterator.hasNext()) {
Table.KeyValue<OmMultipartPartKey, OmMultipartPartInfo> kv =
iterator.next();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMQuotaRepairRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMQuotaRepairRequest.java
index c58b700529f..a82382e9c11 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMQuotaRepairRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMQuotaRepairRequest.java
@@ -156,7 +156,7 @@ private Map<String, OmVolumeArgs>
updateOldVolumeQuotaSupport(
OMMetadataManager metadataManager, long transactionLogIndex) throws
IOException {
LOG.info("Starting volume quota support update");
Map<String, OmVolumeArgs> volUpdateMap = new HashMap<>();
- try (TableIterator<String, ? extends Table.KeyValue<String, OmVolumeArgs>>
+ try (TableIterator<String, Table.KeyValue<String, OmVolumeArgs>>
iterator = metadataManager.getVolumeTable().iterator()) {
while (iterator.hasNext()) {
Table.KeyValue<String, OmVolumeArgs> entry = iterator.next();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
index df62ce92deb..9b3f2b2a7a3 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
@@ -385,10 +385,9 @@ void optimizeDirDeletesAndSubmitRequest(
}
private static final class DeletedDirSupplier implements Closeable {
- private final TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
- deleteTableIterator;
+ private final TableIterator<String, Table.KeyValue<String, OmKeyInfo>>
deleteTableIterator;
- private DeletedDirSupplier(TableIterator<String, ? extends
KeyValue<String, OmKeyInfo>> deleteTableIterator) {
+ private DeletedDirSupplier(TableIterator<String, Table.KeyValue<String,
OmKeyInfo>> deleteTableIterator) {
this.deleteTableIterator = deleteTableIterator;
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/OMRangerBGSyncService.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/OMRangerBGSyncService.java
index 624516b13d9..7413818d754 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/OMRangerBGSyncService.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/OMRangerBGSyncService.java
@@ -509,7 +509,7 @@ private void processAllPoliciesFromOMDB() throws
IOException {
// Iterate all DB tenant states. For each tenant,
// queue or dequeue bucketNamespacePolicyName and bucketPolicyName
- try (TableIterator<String, ? extends KeyValue<String, OmDBTenantState>>
+ try (TableIterator<String, Table.KeyValue<String, OmDBTenantState>>
tenantStateTableIt = metadataManager.getTenantStateTable().iterator())
{
while (tenantStateTableIt.hasNext()) {
@@ -629,7 +629,7 @@ private void loadAllRolesFromDB() throws IOException {
// Iterate all DB ExtendedUserAccessIdInfo. For each accessId,
// add to userRole. And add to adminRole if isAdmin is set.
- try (TableIterator<String, ? extends KeyValue<String, OmDBAccessIdInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmDBAccessIdInfo>>
tenantAccessIdTableIter =
metadataManager.getTenantAccessIdTable().iterator()) {
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/FSODirectoryPathResolver.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/FSODirectoryPathResolver.java
index 70aaa0c4034..e8be6d79776 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/FSODirectoryPathResolver.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/FSODirectoryPathResolver.java
@@ -85,8 +85,7 @@ public Map<Long, Path> getAbsolutePathForObjectIDs(
while (!objectIdPathVals.isEmpty() && !objIds.isEmpty()) {
Pair<Long, Path> parent = objectIdPathVals.poll();
- try (TableIterator<String,
- ? extends Table.KeyValue<String, OmDirectoryInfo>>
+ try (TableIterator<String, Table.KeyValue<String, OmDirectoryInfo>>
subDirIter = dirInfoTable.iterator(
prefix + parent.getKey() + OM_KEY_PREFIX)) {
while (!objIds.isEmpty() && subDirIter.hasNext()) {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
index de009bf8fe4..88601481b1c 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
@@ -771,7 +771,7 @@ public void testValidateAndUpdateCacheOnOverwrite() throws
Exception {
// verify deleted key is unique generated
String deletedKey = omMetadataManager.getOzoneKey(volumeName,
omKeyInfo.getBucketName(), keyName);
- List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
+ List<Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= omMetadataManager.getDeletedTable().getRangeKVs(null, 100,
deletedKey);
assertThat(rangeKVs.size()).isGreaterThan(0);
Table.KeyValue<String, RepeatedOmKeyInfo> keyValue = rangeKVs.get(0);
@@ -873,7 +873,7 @@ public void
testValidateAndUpdateCacheOnOverwriteWithUncommittedBlocks() throws
// verify deleted keys are stored in the deletedTable
String deletedKey = omMetadataManager.getOzoneKey(volumeName,
omKeyInfo.getBucketName(), keyName);
- List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
+ List<Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= omMetadataManager.getDeletedTable().getRangeKVs(null, 100,
deletedKey);
assertThat(rangeKVs.size()).isGreaterThan(0);
Table.KeyValue<String, RepeatedOmKeyInfo> keyValue = rangeKVs.get(0);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
index 819f4bf448d..653b0703a67 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
@@ -103,7 +103,7 @@ public void checkDeleteTableCount(String volumeName,
throws Exception {
String dbOzoneKey = getMultipartKey(volumeName, bucketName, keyName,
uploadId);
- List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
+ List<Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= omMetadataManager.getDeletedTable().getRangeKVs(
null, 100, dbOzoneKey);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
index f3f16d7286f..605e1c10df2 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotCreateRequest.java
@@ -259,7 +259,7 @@ public void testEntryRenamedKeyTable() throws Exception {
createSnapshotForBucket(volumeName, bucket1Name, snapshotName2);
assertEquals(2,
getOmMetadataManager().countRowsInTable(snapshotRenamedTable));
// Verify the remaining entries are from bucket2
- try (TableIterator<String, ? extends Table.KeyValue<String, String>> iter =
+ try (TableIterator<String, Table.KeyValue<String, String>> iter =
snapshotRenamedTable.iterator()) {
iter.seekToFirst();
while (iter.hasNext()) {
@@ -419,7 +419,7 @@ public void testEntryDeletedTable() throws Exception {
// 5. Verify deletedTable now only contains the key from bucket2 (1 row)
assertEquals(1, getOmMetadataManager().countRowsInTable(deletedTable));
// Verify the remaining entry is from bucket2
- try (TableIterator<String, ? extends Table.KeyValue<String,
RepeatedOmKeyInfo>> iter = deletedTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, RepeatedOmKeyInfo>> iter
= deletedTable.iterator()) {
iter.seekToFirst();
while (iter.hasNext()) {
String key = iter.next().getKey();
@@ -457,7 +457,7 @@ public void testEntryDeletedDirTable() throws Exception {
// 5. Verify deletedTable now only contains the key from bucket2 (1 row)
assertEquals(1, getOmMetadataManager().countRowsInTable(deletedDirTable));
// Verify the remaining entry is from bucket2
- try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
iter = deletedDirTable.iterator()) {
+ try (TableIterator<String, Table.KeyValue<String, OmKeyInfo>> iter =
deletedDirTable.iterator()) {
while (iter.hasNext()) {
String key = iter.next().getKey();
assertTrue(key.startsWith(getOmMetadataManager().getBucketKeyPrefixFSO(volumeName,
bucket2Name)),
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
index fefe0d3596a..0a0eea1b75d 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
@@ -122,7 +122,7 @@ public void testAddToDBBatchOnOverwrite() throws Exception {
String deletedKey = omMetadataManager.getOzoneKey(volumeName,
omBucketInfo.getBucketName(), keyName);
- List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
+ List<Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= omMetadataManager.getDeletedTable().getRangeKVs(
null, 100, deletedKey);
assertThat(rangeKVs.size()).isGreaterThan(0);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
index 5c8f9973166..9e1bf9b3105 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
@@ -119,7 +119,7 @@ public void testAddToDBBatchWithNonEmptyBlocks() throws
Exception {
String deletedKey = omMetadataManager.getOzoneKey(volumeName, bucketName,
keyName);
- List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
+ List<Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= omMetadataManager.getDeletedTable().getRangeKVs(
null, 100, deletedKey);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponse.java
index f2683206416..7e9e4d99e5f 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponse.java
@@ -218,7 +218,7 @@ public void testWithMultipartUploadError() throws Exception
{
// openkey entry should be there in delete table.
assertEquals(1, omMetadataManager.countRowsInTable(
omMetadataManager.getDeletedTable()));
- List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
+ List<Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= omMetadataManager.getDeletedTable().getRangeKVs(
null, 100, multipartKeyInvalid);
assertThat(rangeKVs.size()).isGreaterThan(0);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
index ed56d9ac6ac..4c2efd47668 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
@@ -401,7 +401,7 @@ void checkDeletedTableCleanUpForSnapshot() throws Exception
{
// key1 belongs to snapshot, so it should not be deleted when
// KeyDeletingService runs. But key2 can be reclaimed as it doesn't
// belong to any snapshot scope.
- List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
+ List<Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= metadataManager.getDeletedTable().getRangeKVs(
null, 100, ozoneKey1);
assertThat(rangeKVs.size()).isGreaterThan(0);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestFSODirectoryPathResolver.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestFSODirectoryPathResolver.java
index ec6b9909d35..52d9f5867a5 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestFSODirectoryPathResolver.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestFSODirectoryPathResolver.java
@@ -53,7 +53,7 @@ private Table<String, OmDirectoryInfo>
getMockedDirectoryInfoTable(
.thenAnswer(i -> {
int dirId = Integer.parseInt(((String)i.getArgument(0))
.split(OM_KEY_PREFIX)[3]);
- Iterator<? extends Table.KeyValue<String, OmDirectoryInfo>> iterator
=
+ Iterator<Table.KeyValue<String, OmDirectoryInfo>> iterator =
dirMap
.getOrDefault(dirId, Collections.emptyList()).stream()
.map(children -> Table.newKeyValue(prefix + children +
OM_KEY_PREFIX + "dir" + children,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
