diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/replication/ScopeWALEntryFilter.java hbase-server/src/main/java/org/apache/hadoop/hbase/replication/ScopeWALEntryFilter.java index 166dc37..fbc0177 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/replication/ScopeWALEntryFilter.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/ScopeWALEntryFilter.java @@ -44,8 +44,9 @@ public class ScopeWALEntryFilter implements WALEntryFilter { Cell cell = cells.get(i); // The scope will be null or empty if // there's nothing to replicate in that WALEdit - if (!scopes.containsKey(cell.getFamily()) - || scopes.get(cell.getFamily()) == HConstants.REPLICATION_SCOPE_LOCAL) { + byte[] cf = cell.getFamily(); + if (!scopes.containsKey(cf) + || scopes.get(cf) == HConstants.REPLICATION_SCOPE_LOCAL) { cells.remove(i); } } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/replication/TableCfWALEntryFilter.java hbase-server/src/main/java/org/apache/hadoop/hbase/replication/TableCfWALEntryFilter.java index b892512..3cf1059 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/replication/TableCfWALEntryFilter.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/TableCfWALEntryFilter.java @@ -62,7 +62,8 @@ public class TableCfWALEntryFilter implements WALEntryFilter { Cell cell = cells.get(i); // ignore(remove) kv if its cf isn't in the replicable cf list // (empty cfs means all cfs of this table are replicable) - if ((cfs != null && !cfs.contains(Bytes.toString(cell.getFamily())))) { + if ((cfs != null) && !cfs.contains( + Bytes.toString(cell.getFamilyArray(), cell.getFamilyOffset(), cell.getFamilyLength()))) { cells.remove(i); } }