From f4bbd9d69ad78714c4e9e39a3af9201274b556f3 Mon Sep 17 00:00:00 2001 From: tejaskriya Date: Mon, 3 Feb 2025 12:11:07 +0530 Subject: [PATCH] HDDS-12159. Remove redundant seek for rocksDBs --- .../java/org/apache/hadoop/ozone/om/KeyManagerImpl.java | 4 +--- .../org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 3 +-- .../hadoop/ozone/om/request/OMClientRequestUtils.java | 3 +-- .../ozone/om/request/bucket/OMBucketDeleteRequest.java | 3 +-- .../hadoop/ozone/om/request/file/OMFileRequest.java | 8 ++------ 5 files changed, 6 insertions(+), 15 deletions(-) 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 8e3bbb47c3c..32bcb5c3225 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 @@ -2130,9 +2130,7 @@ public List getPendingDeletionSubFiles(long volumeId, Table fileTable = metadataManager.getFileTable(); try (TableIterator> - iterator = fileTable.iterator()) { - - iterator.seek(seekFileInDB); + iterator = fileTable.iterator(seekFileInDB)) { while (iterator.hasNext() && numEntries - countEntries > 0) { Table.KeyValue entry = iterator.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 8f4c070b76c..223f8f63240 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 @@ -1956,8 +1956,7 @@ public Set getMultipartUploadKeys( } try (TableIterator> - iterator = getMultipartInfoTable().iterator()) { - iterator.seek(prefixKey); + iterator = getMultipartInfoTable().iterator(prefixKey)) { while (iterator.hasNext()) { KeyValue entry = iterator.next(); 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 1b318354eeb..07c2e263c99 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 @@ -75,8 +75,7 @@ public static boolean isSnapshotBucket(OMMetadataManager omMetadataManager, private static boolean checkInSnapshotDB(OMMetadataManager omMetadataManager, String dbSnapshotBucketKey) throws IOException { try (TableIterator> - iterator = omMetadataManager.getSnapshotInfoTable().iterator()) { - iterator.seek(dbSnapshotBucketKey); + iterator = omMetadataManager.getSnapshotInfoTable().iterator(dbSnapshotBucketKey)) { return iterator.hasNext() && iterator.next().getKey() .startsWith(dbSnapshotBucketKey); } 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 c984c66a259..8cbc7a20b07 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 @@ -242,8 +242,7 @@ private boolean bucketContainsSnapshotInTable( try ( TableIterator> snapshotIterator = omMetadataManager - .getSnapshotInfoTable().iterator()) { - snapshotIterator.seek(snapshotBucketKey); + .getSnapshotInfoTable().iterator(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 8f2a768c525..afcd721ea23 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 @@ -906,9 +906,7 @@ private static boolean checkSubDirectoryExists(OmKeyInfo omKeyInfo, omKeyInfo.getObjectID(), ""); try (TableIterator> - iterator = dirTable.iterator()) { - - iterator.seek(seekDirInDB); + iterator = dirTable.iterator(seekDirInDB)) { if (iterator.hasNext()) { Table.KeyValue entry = iterator.next(); @@ -952,9 +950,7 @@ private static boolean checkSubFileExists(OmKeyInfo omKeyInfo, String seekFileInDB = metaMgr.getOzonePathKey(volumeId, bucketId, omKeyInfo.getObjectID(), ""); try (TableIterator> - iterator = fileTable.iterator()) { - - iterator.seek(seekFileInDB); + iterator = fileTable.iterator(seekFileInDB)) { if (iterator.hasNext()) { Table.KeyValue entry = iterator.next();