From 9f62a82334574b135f8e220b024981df64fab811 Mon Sep 17 00:00:00 2001 From: Yechao Chen Date: Sun, 23 Aug 2020 11:24:44 +0800 Subject: [PATCH] HBASE-24811 Use class access static field or method (#2189) Signed-off-by: Duo Zhang Signed-off-by: Guanghao Zhang Signed-off-by: Anoop Sam John --- .../main/java/org/apache/hadoop/hbase/io/hfile/HFileInfo.java | 2 +- .../org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java | 2 +- .../apache/hadoop/hbase/regionserver/CompactingMemStore.java | 2 +- .../org/apache/hadoop/hbase/regionserver/MemStoreLABImpl.java | 2 +- .../replication/regionserver/ReplicationSourceShipper.java | 2 +- .../apache/hadoop/hbase/security/access/AccessController.java | 2 +- .../main/java/org/apache/hadoop/hbase/util/HbckTableInfo.java | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileInfo.java index 1dd25737953..330ef6fed00 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileInfo.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileInfo.java @@ -386,7 +386,7 @@ public class HFileInfo implements SortedMap { .withHBaseCheckSum(true) .withHFileName(path.getName()) .withCompression(trailer.getCompressionCodec()) - .withCellComparator(trailer.createComparator(trailer.getComparatorClassName())); + .withCellComparator(FixedFileTrailer.createComparator(trailer.getComparatorClassName())); // Check for any key material available byte[] keyBytes = trailer.getEncryptionKey(); if (keyBytes != null) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java index 6256e6de8e5..93d85af677b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java @@ -291,7 +291,7 @@ public class HFilePrettyPrinter extends Configured implements Tool { if (checkRootDir) { Path rootPath = CommonFSUtils.getRootDir(getConf()); - String rootString = rootPath + rootPath.SEPARATOR; + String rootString = rootPath + Path.SEPARATOR; if (!file.toString().startsWith(rootString)) { // First we see if fully-qualified URI matches the root dir. It might // also be an absolute path in the same filesystem, so we prepend the FS diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java index 64c2c53ec06..8ffe7b30d36 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java @@ -501,7 +501,7 @@ public class CompactingMemStore extends AbstractMemStore { @VisibleForTesting protected boolean shouldFlushInMemory(MutableSegment currActive, Cell cellToAdd, MemStoreSizing memstoreSizing) { - long cellSize = currActive.getCellLength(cellToAdd); + long cellSize = MutableSegment.getCellLength(cellToAdd); long segmentDataSize = currActive.getDataSize(); while (segmentDataSize + cellSize < inmemoryFlushSize || inWalReplay) { // when replaying edits from WAL there is no need in in-memory flush regardless the size diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreLABImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreLABImpl.java index 596aa87d10c..7951c72b0da 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreLABImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreLABImpl.java @@ -377,7 +377,7 @@ public class MemStoreLABImpl implements MemStoreLAB { */ @Override public Chunk getNewExternalChunk(int size) { - int allocSize = size + ChunkCreator.getInstance().SIZEOF_CHUNK_HEADER; + int allocSize = size + ChunkCreator.SIZEOF_CHUNK_HEADER; if (allocSize <= ChunkCreator.getInstance().getChunkSize()) { return getNewExternalChunk(ChunkCreator.ChunkType.DATA_CHUNK); } else { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java index e50005a2339..72cc5e82b69 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.java @@ -155,7 +155,7 @@ public class ReplicationSourceShipper extends Thread { private int getBatchEntrySizeExcludeBulkLoad(WALEntryBatch entryBatch) { int totalSize = 0; for(Entry entry : entryBatch.getWalEntries()) { - totalSize += entryReader.getEntrySizeExcludeBulkLoad(entry); + totalSize += ReplicationSourceWALReader.getEntrySizeExcludeBulkLoad(entry); } return totalSize; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java index 292f1ab6c31..858afde8d01 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java @@ -2587,7 +2587,7 @@ public class AccessController implements MasterCoprocessor, RegionCoprocessor, result = AuthResult.allow(request, "Self user validation allowed", caller, null, null, null, null); } - accessChecker.logResult(result); + AccessChecker.logResult(result); } } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HbckTableInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HbckTableInfo.java index aec0e1e6e5b..75699d88890 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HbckTableInfo.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HbckTableInfo.java @@ -716,7 +716,7 @@ public class HbckTableInfo { } } - if (hbck.shouldDisplayFullReport()) { + if (HBaseFsck.shouldDisplayFullReport()) { // do full region split map dump hbck.getErrors().print("---- Table '" + this.tableName + "': region split map"); @@ -807,4 +807,4 @@ public class HbckTableInfo { path.toUri().getPath() + " " + tableName); } } -} \ No newline at end of file +}