You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ch...@apache.org on 2018/02/02 12:05:56 UTC
hbase git commit: HBASE-19720 Rename WALKey#getTabnename to
WALKey#getTableName
Repository: hbase
Updated Branches:
refs/heads/branch-2 b2fe24108 -> b0bf6f504
HBASE-19720 Rename WALKey#getTabnename to WALKey#getTableName
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b0bf6f50
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b0bf6f50
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b0bf6f50
Branch: refs/heads/branch-2
Commit: b0bf6f504e2ebaaa5e2ec94b3fb5392a8586474f
Parents: b2fe241
Author: Chia-Ping Tsai <ch...@gmail.com>
Authored: Fri Feb 2 20:02:04 2018 +0800
Committer: Chia-Ping Tsai <ch...@gmail.com>
Committed: Fri Feb 2 20:02:04 2018 +0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java | 10 +++++-----
.../hbase/mapreduce/TestCellBasedImportExport2.java | 2 +-
.../hadoop/hbase/mapreduce/TestCellBasedWALPlayer2.java | 2 +-
.../apache/hadoop/hbase/mapreduce/TestImportExport.java | 2 +-
.../org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java | 2 +-
.../hadoop/hbase/protobuf/ReplicationProtbufUtil.java | 3 +--
.../apache/hadoop/hbase/regionserver/wal/ReaderBase.java | 2 +-
.../hbase/replication/NamespaceTableCfWALEntryFilter.java | 10 +++++-----
.../hbase/replication/SystemTableWALEntryFilter.java | 2 +-
.../HBaseInterClusterReplicationEndpoint.java | 2 +-
.../src/main/java/org/apache/hadoop/hbase/wal/WALKey.java | 5 ++---
.../main/java/org/apache/hadoop/hbase/wal/WALKeyImpl.java | 2 +-
.../java/org/apache/hadoop/hbase/wal/WALSplitter.java | 4 ++--
.../hadoop/hbase/coprocessor/SimpleRegionObserver.java | 2 +-
.../apache/hadoop/hbase/regionserver/TestWALLockup.java | 4 ++--
.../hbase/regionserver/wal/AbstractTestProtobufLog.java | 2 +-
.../TestRegionReplicaReplicationEndpointNoMaster.java | 2 +-
.../java/org/apache/hadoop/hbase/wal/TestWALFactory.java | 4 ++--
18 files changed, 30 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java
index 7f8a5c7..23ddc14 100644
--- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java
+++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java
@@ -109,7 +109,7 @@ public class WALPlayer extends Configured implements Tool {
throws IOException {
try {
// skip all other tables
- if (Bytes.equals(table, key.getTablename().getName())) {
+ if (Bytes.equals(table, key.getTableName().getName())) {
for (Cell cell : value.getCells()) {
KeyValue kv = KeyValueUtil.ensureKeyValue(cell);
if (WALEdit.isMetaEditFamily(kv)) {
@@ -150,7 +150,7 @@ public class WALPlayer extends Configured implements Tool {
throws IOException {
try {
// skip all other tables
- if (Bytes.equals(table, key.getTablename().getName())) {
+ if (Bytes.equals(table, key.getTableName().getName())) {
for (Cell cell : value.getCells()) {
if (WALEdit.isMetaEditFamily(cell)) {
continue;
@@ -190,10 +190,10 @@ public class WALPlayer extends Configured implements Tool {
public void map(WALKey key, WALEdit value, Context context)
throws IOException {
try {
- if (tables.isEmpty() || tables.containsKey(key.getTablename())) {
+ if (tables.isEmpty() || tables.containsKey(key.getTableName())) {
TableName targetTable = tables.isEmpty() ?
- key.getTablename() :
- tables.get(key.getTablename());
+ key.getTableName() :
+ tables.get(key.getTableName());
ImmutableBytesWritable tableOut = new ImmutableBytesWritable(targetTable.getName());
Put put = null;
Delete del = null;
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellBasedImportExport2.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellBasedImportExport2.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellBasedImportExport2.java
index cb179cc..d52863e 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellBasedImportExport2.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellBasedImportExport2.java
@@ -794,7 +794,7 @@ public class TestCellBasedImportExport2 {
@Override
public void visitLogEntryBeforeWrite(WALKey logKey, WALEdit logEdit) {
- if (logKey.getTablename().getNameAsString().equalsIgnoreCase(
+ if (logKey.getTableName().getNameAsString().equalsIgnoreCase(
this.regionInfo.getTable().getNameAsString()) && (!logEdit.isMetaEdit())) {
isVisited = true;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellBasedWALPlayer2.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellBasedWALPlayer2.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellBasedWALPlayer2.java
index d25603c..9a63ae9 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellBasedWALPlayer2.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellBasedWALPlayer2.java
@@ -173,7 +173,7 @@ public class TestCellBasedWALPlayer2 {
configuration.set(tableConfigKey, "table");
WALCellMapper mapper = new WALCellMapper();
WALKey key = mock(WALKey.class);
- when(key.getTablename()).thenReturn(TableName.valueOf("table"));
+ when(key.getTableName()).thenReturn(TableName.valueOf("table"));
@SuppressWarnings("unchecked")
Mapper<WALKey, WALEdit, ImmutableBytesWritable, Cell>.Context context = mock(Context.class);
when(context.getConfiguration()).thenReturn(configuration);
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
index 6d323c9..0dbf738 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
@@ -794,7 +794,7 @@ public class TestImportExport {
@Override
public void visitLogEntryBeforeWrite(WALKey logKey, WALEdit logEdit) {
- if (logKey.getTablename().getNameAsString().equalsIgnoreCase(
+ if (logKey.getTableName().getNameAsString().equalsIgnoreCase(
this.regionInfo.getTable().getNameAsString()) && (!logEdit.isMetaEdit())) {
isVisited = true;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java
index eedada8..7ddcb44 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java
@@ -173,7 +173,7 @@ public class TestWALPlayer {
configuration.set(tableConfigKey, "table");
WALKeyValueMapper mapper = new WALKeyValueMapper();
WALKey key = mock(WALKey.class);
- when(key.getTablename()).thenReturn(TableName.valueOf("table"));
+ when(key.getTableName()).thenReturn(TableName.valueOf("table"));
@SuppressWarnings("unchecked")
Mapper<WALKey, WALEdit, ImmutableBytesWritable, KeyValue>.Context context = mock(Context.class);
when(context.getConfiguration()).thenReturn(configuration);
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ReplicationProtbufUtil.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ReplicationProtbufUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ReplicationProtbufUtil.java
index 79fd000..81dd59e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ReplicationProtbufUtil.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ReplicationProtbufUtil.java
@@ -46,7 +46,6 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.hbase.wal.WAL.Entry;
-import org.apache.hadoop.hbase.wal.WALKey;
@InterfaceAudience.Private
public class ReplicationProtbufUtil {
@@ -116,7 +115,7 @@ public class ReplicationProtbufUtil {
UnsafeByteOperations.unsafeWrap(encodedRegionName == null
? key.getEncodedRegionName()
: encodedRegionName));
- keyBuilder.setTableName(UnsafeByteOperations.unsafeWrap(key.getTablename().getName()));
+ keyBuilder.setTableName(UnsafeByteOperations.unsafeWrap(key.getTableName().getName()));
long sequenceId = key.getSequenceId();
keyBuilder.setLogSequenceNumber(sequenceId);
keyBuilder.setWriteTime(key.getWriteTime());
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ReaderBase.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ReaderBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ReaderBase.java
index f057358..f242cef 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ReaderBase.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ReaderBase.java
@@ -100,7 +100,7 @@ public abstract class ReaderBase implements AbstractFSWALProvider.Reader {
try {
hasEntry = readNext(e);
} catch (IllegalArgumentException iae) {
- TableName tableName = e.getKey().getTablename();
+ TableName tableName = e.getKey().getTableName();
if (tableName != null && tableName.equals(TableName.OLD_ROOT_TABLE_NAME)) {
// It is old ROOT table edit, ignore it
LOG.info("Got an old ROOT edit, ignoring ");
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/NamespaceTableCfWALEntryFilter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/NamespaceTableCfWALEntryFilter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/NamespaceTableCfWALEntryFilter.java
index b540416..ad6e5a6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/NamespaceTableCfWALEntryFilter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/NamespaceTableCfWALEntryFilter.java
@@ -57,7 +57,7 @@ public class NamespaceTableCfWALEntryFilter implements WALEntryFilter, WALCellFi
@Override
public Entry filter(Entry entry) {
- TableName tabName = entry.getKey().getTablename();
+ TableName tabName = entry.getKey().getTableName();
String namespace = tabName.getNamespaceAsString();
ReplicationPeerConfig peerConfig = this.peer.getPeerConfig();
@@ -110,10 +110,10 @@ public class NamespaceTableCfWALEntryFilter implements WALEntryFilter, WALCellFi
if (CellUtil.matchingColumn(cell, WALEdit.METAFAMILY, WALEdit.BULK_LOAD)) {
cell = bulkLoadFilter.filterCell(cell,
- fam -> filterByExcludeTableCfs(entry.getKey().getTablename(), Bytes.toString(fam),
+ fam -> filterByExcludeTableCfs(entry.getKey().getTableName(), Bytes.toString(fam),
excludeTableCfs));
} else {
- if (filterByExcludeTableCfs(entry.getKey().getTablename(),
+ if (filterByExcludeTableCfs(entry.getKey().getTableName(),
Bytes.toString(cell.getFamilyArray(), cell.getFamilyOffset(), cell.getFamilyLength()),
excludeTableCfs)) {
return null;
@@ -130,9 +130,9 @@ public class NamespaceTableCfWALEntryFilter implements WALEntryFilter, WALCellFi
if (CellUtil.matchingColumn(cell, WALEdit.METAFAMILY, WALEdit.BULK_LOAD)) {
cell = bulkLoadFilter.filterCell(cell,
- fam -> filterByTableCfs(entry.getKey().getTablename(), Bytes.toString(fam), tableCfs));
+ fam -> filterByTableCfs(entry.getKey().getTableName(), Bytes.toString(fam), tableCfs));
} else {
- if (filterByTableCfs(entry.getKey().getTablename(),
+ if (filterByTableCfs(entry.getKey().getTableName(),
Bytes.toString(cell.getFamilyArray(), cell.getFamilyOffset(), cell.getFamilyLength()),
tableCfs)) {
return null;
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/SystemTableWALEntryFilter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/SystemTableWALEntryFilter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/SystemTableWALEntryFilter.java
index dc9aaf4..1984436 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/SystemTableWALEntryFilter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/SystemTableWALEntryFilter.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.hbase.wal.WAL.Entry;
public class SystemTableWALEntryFilter implements WALEntryFilter {
@Override
public Entry filter(Entry entry) {
- if (entry.getKey().getTablename().isSystemTable()) {
+ if (entry.getKey().getTableName().isSystemTable()) {
return null;
}
return entry;
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
index 5872d08..5467de0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
@@ -258,7 +258,7 @@ public class HBaseInterClusterReplicationEndpoint extends HBaseReplicationEndpoi
ArrayList<Entry> thisList = new ArrayList<Entry>(entries.size());
entryLists.add(thisList);
for (Entry e : entries) {
- if (!e.getKey().getTablename().equals(table)) {
+ if (!e.getKey().getTableName().equals(table)) {
thisList.add(e);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java
index 0c818db..af3cf71 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKey.java
@@ -29,7 +29,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.NavigableMap;
import java.util.UUID;
@@ -57,7 +56,7 @@ public interface WALKey extends SequenceId, Comparable<WALKey> {
/**
* @return table name
*/
- TableName getTablename();
+ TableName getTableName();
/**
* @return the write time
@@ -96,7 +95,7 @@ public interface WALKey extends SequenceId, Comparable<WALKey> {
*/
default Map<String, Object> toStringMap() {
Map<String, Object> stringMap = new HashMap<>();
- stringMap.put("table", getTablename());
+ stringMap.put("table", getTableName());
stringMap.put("region", Bytes.toStringBinary(getEncodedRegionName()));
stringMap.put("sequence", getSequenceId());
return stringMap;
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKeyImpl.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKeyImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKeyImpl.java
index 0a5acda..7abd4a5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKeyImpl.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALKeyImpl.java
@@ -352,7 +352,7 @@ public class WALKeyImpl implements WALKey {
/** @return table name */
@Override
- public TableName getTablename() {
+ public TableName getTableName() {
return tablename;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
index 97f80e0..e442fd8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
@@ -469,7 +469,7 @@ public class WALSplitter {
static Path getRegionSplitEditsPath(final FileSystem fs,
final Entry logEntry, final Path rootDir, String fileNameBeingSplit)
throws IOException {
- Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTablename());
+ Path tableDir = FSUtils.getTableDir(rootDir, logEntry.getKey().getTableName());
String encodedRegionName = Bytes.toString(logEntry.getKey().getEncodedRegionName());
Path regiondir = HRegion.getRegionDir(tableDir, encodedRegionName);
Path dir = getRegionDirRecoveredEditsDir(regiondir);
@@ -876,7 +876,7 @@ public class WALSplitter {
synchronized (this) {
buffer = buffers.get(key.getEncodedRegionName());
if (buffer == null) {
- buffer = new RegionEntryBuffer(key.getTablename(), key.getEncodedRegionName());
+ buffer = new RegionEntryBuffer(key.getTableName(), key.getEncodedRegionName());
buffers.put(key.getEncodedRegionName(), buffer);
}
incrHeap= buffer.appendEntry(entry);
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java
index 0d864b6..62623b0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java
@@ -600,7 +600,7 @@ public class SimpleRegionObserver implements RegionCoprocessor, RegionObserver {
@Override
public void preWALRestore(ObserverContext<? extends RegionCoprocessorEnvironment> env,
RegionInfo info, WALKey logKey, WALEdit logEdit) throws IOException {
- String tableName = logKey.getTablename().getNameAsString();
+ String tableName = logKey.getTableName().getNameAsString();
if (tableName.equals(TABLE_SKIPPED)) {
// skip recovery of TABLE_SKIPPED for testing purpose
env.bypass();
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
index 7abba4c..e973a33 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
@@ -590,14 +590,14 @@ public class TestWALLockup {
@Override
public void visitLogEntryBeforeWrite(WALKey logKey, WALEdit logEdit)
throws IOException {
- if (logKey.getTablename().getNameAsString().equalsIgnoreCase("sleep")) {
+ if (logKey.getTableName().getNameAsString().equalsIgnoreCase("sleep")) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
- if (logKey.getTablename().getNameAsString()
+ if (logKey.getTableName().getNameAsString()
.equalsIgnoreCase("DamagedWALException")) {
throw new DamagedWALException("Failed appending");
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestProtobufLog.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestProtobufLog.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestProtobufLog.java
index c0510d3..e9d147f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestProtobufLog.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestProtobufLog.java
@@ -178,7 +178,7 @@ public abstract class AbstractTestProtobufLog<W extends Closeable> {
assertNotNull(entry);
assertEquals(columnCount, entry.getEdit().size());
assertArrayEquals(hri.getEncodedNameAsBytes(), entry.getKey().getEncodedRegionName());
- assertEquals(tableName, entry.getKey().getTablename());
+ assertEquals(tableName, entry.getKey().getTableName());
int idx = 0;
for (Cell val : entry.getEdit().getCells()) {
assertTrue(Bytes.equals(row, 0, row.length, val.getRowArray(), val.getRowOffset(),
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java
index 33ea8d7..15066dd 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java
@@ -167,7 +167,7 @@ public class TestRegionReplicaReplicationEndpointNoMaster {
public void postWALWrite(ObserverContext<? extends WALCoprocessorEnvironment> ctx,
RegionInfo info, WALKey logKey, WALEdit logEdit) throws IOException {
// only keep primary region's edits
- if (logKey.getTablename().equals(tableName) && info.getReplicaId() == 0) {
+ if (logKey.getTableName().equals(tableName) && info.getReplicaId() == 0) {
// Presume type is a WALKeyImpl
entries.add(new Entry((WALKeyImpl)logKey, logEdit));
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0bf6f50/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java
index 5679d96..3a4c852 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java
@@ -536,7 +536,7 @@ public class TestWALFactory {
WALKey key = entry.getKey();
WALEdit val = entry.getEdit();
assertTrue(Bytes.equals(info.getEncodedNameAsBytes(), key.getEncodedRegionName()));
- assertTrue(htd.getTableName().equals(key.getTablename()));
+ assertTrue(htd.getTableName().equals(key.getTableName()));
Cell cell = val.getCells().get(0);
assertTrue(Bytes.equals(row, 0, row.length, cell.getRowArray(), cell.getRowOffset(),
cell.getRowLength()));
@@ -592,7 +592,7 @@ public class TestWALFactory {
for (Cell val : entry.getEdit().getCells()) {
assertTrue(Bytes.equals(hri.getEncodedNameAsBytes(),
entry.getKey().getEncodedRegionName()));
- assertTrue(htd.getTableName().equals(entry.getKey().getTablename()));
+ assertTrue(htd.getTableName().equals(entry.getKey().getTableName()));
assertTrue(Bytes.equals(row, 0, row.length, val.getRowArray(), val.getRowOffset(),
val.getRowLength()));
assertEquals((byte) (idx + '0'), CellUtil.cloneValue(val)[0]);