You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2020/08/23 12:33:50 UTC
[hbase] branch branch-2 updated: HBASE-24811 Use class access
static field or method (#2189)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 836c04d HBASE-24811 Use class access static field or method (#2189)
836c04d is described below
commit 836c04d3562d9938987a95c108500f3fb4389324
Author: Yechao Chen <ch...@gmail.com>
AuthorDate: Sun Aug 23 11:24:44 2020 +0800
HBASE-24811 Use class access static field or method (#2189)
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Guanghao Zhang <zg...@apache.org>
Signed-off-by: Anoop Sam John <an...@apache.org>
---
.../src/main/java/org/apache/hadoop/hbase/io/hfile/HFileInfo.java | 2 +-
.../java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java | 2 +-
.../java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java | 2 +-
.../java/org/apache/hadoop/hbase/regionserver/MemStoreLABImpl.java | 2 +-
.../hbase/replication/regionserver/ReplicationSourceShipper.java | 2 +-
.../org/apache/hadoop/hbase/security/access/AccessController.java | 2 +-
.../src/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 6bd1d3c..ad469c0 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
@@ -384,7 +384,7 @@ public class HFileInfo implements SortedMap<byte[], byte[]> {
.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 57db206..7b326c9 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
@@ -290,7 +290,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 bce4597..cd653ac 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 596aa87..7951c72 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 d7e7e01..92646d2 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
@@ -145,7 +145,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 5a23a5c..39e79c1 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
@@ -2581,7 +2581,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 7cedd2e..c44dbc9 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
+}