You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bh...@apache.org on 2019/07/29 23:44:07 UTC
[hadoop] 01/01: Revert "HDDS-1829 On OM reload/restart
OmMetrics#numKeys should be updated (#1164)"
This is an automated email from the ASF dual-hosted git repository.
bharat pushed a commit to branch revert-1164-HDDS-1829
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 45095e4d3ae1801639e82140c5e8dc2d18b1b0c0
Author: Bharat Viswanadham <bh...@apache.org>
AuthorDate: Mon Jul 29 16:43:57 2019 -0700
Revert "HDDS-1829 On OM reload/restart OmMetrics#numKeys should be updated (#1164)"
This reverts commit 4d07134b139e8acdb1018a90dec02de088da2ec7.
---
.../java/org/apache/hadoop/utils/db/RDBTable.java | 10 ----------
.../main/java/org/apache/hadoop/utils/db/Table.java | 7 -------
.../java/org/apache/hadoop/utils/db/TypedTable.java | 5 -----
.../apache/hadoop/utils/db/TestRDBTableStore.java | 21 +--------------------
.../hadoop/utils/db/TestTypedRDBTableStore.java | 21 +--------------------
.../apache/hadoop/ozone/om/OMMetadataManager.java | 11 -----------
.../hadoop/ozone/om/OmMetadataManagerImpl.java | 10 ----------
.../org/apache/hadoop/ozone/om/OzoneManager.java | 2 --
8 files changed, 2 insertions(+), 85 deletions(-)
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBTable.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBTable.java
index 9d14558..f26fcf7 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBTable.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBTable.java
@@ -183,14 +183,4 @@ class RDBTable implements Table<byte[], byte[]> {
public void close() throws Exception {
// Nothing do for a Column Family.
}
-
- @Override
- public long getEstimatedKeyCount() throws IOException {
- try {
- return db.getLongProperty(handle, "rocksdb.estimate-num-keys");
- } catch (RocksDBException e) {
- throw toIOException(
- "Failed to get estimated key count of table " + getName(), e);
- }
- }
}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/Table.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/Table.java
index 5c4551f..1c51616 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/Table.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/Table.java
@@ -112,13 +112,6 @@ public interface Table<KEY, VALUE> extends AutoCloseable {
String getName() throws IOException;
/**
- * Returns the key count of this Table. Note the result can be inaccurate.
- * @return Estimated key count of this Table
- * @throws IOException on failure
- */
- long getEstimatedKeyCount() throws IOException;
-
- /**
* Add entry to the table cache.
*
* If the cacheKey already exists, it will override the entry.
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/TypedTable.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/TypedTable.java
index d0d522d..e8f9e0a 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/TypedTable.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/TypedTable.java
@@ -206,11 +206,6 @@ public class TypedTable<KEY, VALUE> implements Table<KEY, VALUE> {
}
@Override
- public long getEstimatedKeyCount() throws IOException {
- return rawTable.getEstimatedKeyCount();
- }
-
- @Override
public void close() throws Exception {
rawTable.close();
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestRDBTableStore.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestRDBTableStore.java
index 0e6ad18..6b6cd75 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestRDBTableStore.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestRDBTableStore.java
@@ -51,8 +51,7 @@ public class TestRDBTableStore {
Arrays.asList(DFSUtil.bytes2String(RocksDB.DEFAULT_COLUMN_FAMILY),
"First", "Second", "Third",
"Fourth", "Fifth",
- "Sixth", "Seventh",
- "Eighth");
+ "Sixth", "Seventh");
@Rule
public TemporaryFolder folder = new TemporaryFolder();
private RDBStore rdbStore = null;
@@ -248,22 +247,4 @@ public class TestRDBTableStore {
Assert.assertFalse(testTable.isExist(invalidKey));
}
}
-
- @Test
- public void testCountEstimatedRowsInTable() throws Exception {
- try (Table<byte[], byte[]> testTable = rdbStore.getTable("Eighth")) {
- // Add a few keys
- final int numKeys = 12345;
- for (int i = 0; i < numKeys; i++) {
- byte[] key =
- RandomStringUtils.random(10).getBytes(StandardCharsets.UTF_8);
- byte[] value =
- RandomStringUtils.random(10).getBytes(StandardCharsets.UTF_8);
- testTable.put(key, value);
- }
- long count = testTable.getEstimatedKeyCount();
- // The result should be larger than zero but not exceed(?) numKeys
- Assert.assertTrue(count > 0 && count <= numKeys);
- }
- }
}
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestTypedRDBTableStore.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestTypedRDBTableStore.java
index 8271b1b..e48a5aa 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestTypedRDBTableStore.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/utils/db/TestTypedRDBTableStore.java
@@ -55,8 +55,7 @@ public class TestTypedRDBTableStore {
Arrays.asList(DFSUtil.bytes2String(RocksDB.DEFAULT_COLUMN_FAMILY),
"First", "Second", "Third",
"Fourth", "Fifth",
- "Sixth", "Seven", "Eighth",
- "Ninth");
+ "Sixth", "Seven", "Eighth");
@Rule
public TemporaryFolder folder = new TemporaryFolder();
private RDBStore rdbStore = null;
@@ -352,22 +351,4 @@ public class TestTypedRDBTableStore {
Assert.assertFalse(testTable.isExist(key));
}
}
-
- @Test
- public void testCountEstimatedRowsInTable() throws Exception {
- try (Table<String, String> testTable = createTypedTable(
- "Ninth")) {
- // Add a few keys
- final int numKeys = 12345;
- for (int i = 0; i < numKeys; i++) {
- String key =
- RandomStringUtils.random(10);
- String value = RandomStringUtils.random(10);
- testTable.put(key, value);
- }
- long count = testTable.getEstimatedKeyCount();
- // The result should be larger than zero but not exceed(?) numKeys
- Assert.assertTrue(count > 0 && count <= numKeys);
- }
- }
}
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
index 96a0b96..f0b54e0 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
@@ -316,15 +316,4 @@ public interface OMMetadataManager {
*/
<KEY, VALUE> long countRowsInTable(Table<KEY, VALUE> table)
throws IOException;
-
- /**
- * Returns an estimated number of rows in a table. This is much quicker
- * than {@link OMMetadataManager#countRowsInTable} but the result can be
- * inaccurate.
- * @param table Table
- * @return long Estimated number of rows in the table.
- * @throws IOException
- */
- <KEY, VALUE> long countEstimatedRowsInTable(Table<KEY, VALUE> table)
- throws IOException;
}
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 f6b08c2..c7d6bb4 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
@@ -803,16 +803,6 @@ public class OmMetadataManagerImpl implements OMMetadataManager {
}
@Override
- public <KEY, VALUE> long countEstimatedRowsInTable(Table<KEY, VALUE> table)
- throws IOException {
- long count = 0;
- if (table != null) {
- count = table.getEstimatedKeyCount();
- }
- return count;
- }
-
- @Override
public Table<String, S3SecretValue> getS3SecretTable() {
return s3SecretTable;
}
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 f7fd0f5..84e1781 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
@@ -3267,8 +3267,6 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
.getVolumeTable()));
metrics.setNumBuckets(metadataManager.countRowsInTable(metadataManager
.getBucketTable()));
- metrics.setNumKeys(metadataManager.countEstimatedRowsInTable(metadataManager
- .getKeyTable()));
// Delete the omMetrics file if it exists and save the a new metrics file
// with new data
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org