From b1c58dbf8c44e0cbb85efa51611f56d62f408b1e Mon Sep 17 00:00:00 2001 From: chenheng Date: Thu, 14 Jan 2016 15:26:16 +0800 Subject: [PATCH] HBASE-15018 TestReplicationAdmin failed on branch-1.0 --- .../apache/hadoop/hbase/client/replication/ReplicationAdmin.java | 6 ++---- .../hadoop/hbase/client/replication/TestReplicationAdmin.java | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java index 1bb18b2..44e0d31 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.TreeMap; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -41,10 +42,7 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableNotFoundException; -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.RegionLocator; @@ -247,7 +245,7 @@ public class ReplicationAdmin implements Closeable { // 4 put > to map if (tableCFsMap == null) { - tableCFsMap = new HashMap>(); + tableCFsMap = new TreeMap>(); } tableCFsMap.put(TableName.valueOf(tabName), cfs); } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java index 1a5dd33..dd0a249 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java @@ -175,11 +175,11 @@ public class TestReplicationAdmin { // append table t2 to replication admin.appendPeerTableCFs(ID_ONE, "t2"); - assertEquals("t2;t1", admin.getPeerTableCFs(ID_ONE)); + assertEquals("t1;t2", admin.getPeerTableCFs(ID_ONE)); // append table column family: f1 of t3 to replication admin.appendPeerTableCFs(ID_ONE, "t3:f1"); - assertEquals("t3:f1;t2;t1", admin.getPeerTableCFs(ID_ONE)); + assertEquals("t1;t2;t3:f1", admin.getPeerTableCFs(ID_ONE)); admin.removePeer(ID_ONE); } -- 1.9.3 (Apple Git-50)