Repository: hbase Updated Branches: refs/heads/master 197bd7907 -> 62ee7d950
HBASE-20097 Merge TableDescriptors#getAll and TableDescriptors#getAllDescriptors into one Signed-off-by: tedyu <yuzhih...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/62ee7d95 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/62ee7d95 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/62ee7d95 Branch: refs/heads/master Commit: 62ee7d9502d599f704ea8c9cf16f9ac4c1b1d22a Parents: 197bd79 Author: Chia-Ping Tsai <chia7...@gmail.com> Authored: Tue Feb 27 16:34:14 2018 +0800 Committer: Chia-Ping Tsai <chia7...@gmail.com> Committed: Wed Feb 28 15:21:21 2018 +0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/TableDescriptors.java | 9 --------- .../hadoop/hbase/master/TableStateManager.java | 2 +- .../hadoop/hbase/util/FSTableDescriptors.java | 16 +--------------- .../hbase/master/assignment/MockMasterServices.java | 5 ----- 4 files changed, 2 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/62ee7d95/hbase-server/src/main/java/org/apache/hadoop/hbase/TableDescriptors.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/TableDescriptors.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/TableDescriptors.java index ecdfc82..5787f66 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/TableDescriptors.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/TableDescriptors.java @@ -55,15 +55,6 @@ public interface TableDescriptors { throws IOException; /** - * Get Map of all TableDescriptors. Populates the descriptor cache as a - * side effect. - * @return Map of all descriptors. - * @throws IOException - */ - Map<String, TableDescriptor> getAllDescriptors() - throws IOException; - - /** * Add or update descriptor * @param htd Descriptor to set into TableDescriptors * @throws IOException http://git-wip-us.apache.org/repos/asf/hbase/blob/62ee7d95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java index 0d89eef..affb684 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java @@ -223,7 +223,7 @@ public class TableStateManager { private void fixTableStates(TableDescriptors tableDescriptors, Connection connection) throws IOException { - final Map<String, TableDescriptor> allDescriptors = tableDescriptors.getAllDescriptors(); + final Map<String, TableDescriptor> allDescriptors = tableDescriptors.getAll(); final Map<String, TableState> states = new HashMap<>(); // NOTE: Ful hbase:meta table scan! MetaTableAccessor.fullScanTables(connection, new MetaTableAccessor.Visitor() { http://git-wip-us.apache.org/repos/asf/hbase/blob/62ee7d95/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java index c72b9e0..b4b0be0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java @@ -248,7 +248,7 @@ public class FSTableDescriptors implements TableDescriptors { * Returns a map from table name to table descriptor for all tables. */ @Override - public Map<String, TableDescriptor> getAllDescriptors() + public Map<String, TableDescriptor> getAll() throws IOException { Map<String, TableDescriptor> tds = new TreeMap<>(); @@ -282,20 +282,6 @@ public class FSTableDescriptors implements TableDescriptors { } /** - * Returns a map from table name to table descriptor for all tables. - */ - @Override - public Map<String, TableDescriptor> getAll() throws IOException { - Map<String, TableDescriptor> htds = new TreeMap<>(); - Map<String, TableDescriptor> allDescriptors = getAllDescriptors(); - for (Map.Entry<String, TableDescriptor> entry : allDescriptors - .entrySet()) { - htds.put(entry.getKey(), entry.getValue()); - } - return htds; - } - - /** * Find descriptors by namespace. * @see #get(org.apache.hadoop.hbase.TableName) */ http://git-wip-us.apache.org/repos/asf/hbase/blob/62ee7d95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java index 91f123f..6cd399d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java @@ -327,11 +327,6 @@ public class MockMasterServices extends MockNoopMasterServices { return null; } - @Override public Map<String, TableDescriptor> getAllDescriptors() throws IOException { - // noop - return null; - } - @Override public TableDescriptor get(TableName tablename) throws IOException { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tablename);