HDDS-13255. Change <? extend KeyValue> to <KeyValue> in ozone-manger.

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java

@@ -276,15 +276,15 @@ 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);
   }
 
   /**
    * 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)

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);

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;

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()) {
 

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();

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 =

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);
 

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<>();

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.

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();

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()

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);

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()) {

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();

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();

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;
     }
 

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()) {