You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ja...@apache.org on 2019/05/12 19:30:50 UTC
[hbase] branch master updated: HBASE-22392. Remove extra/useless +
This is an automated email from the ASF dual-hosted git repository.
janh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new b8365e5 HBASE-22392. Remove extra/useless +
b8365e5 is described below
commit b8365e5110ff3533eb289158479326d4c1b7d84a
Author: Puleya7 <li...@gmail.com>
AuthorDate: Fri May 10 16:56:45 2019 +0800
HBASE-22392. Remove extra/useless +
Signed-off-by: Jan Hentschel <ja...@ultratendency.com>
---
.../src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +-
.../src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java | 2 +-
.../main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 84cd10f..500c894 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -2711,7 +2711,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
}
MemStoreSize mss = this.memStoreSizing.getMemStoreSize();
- LOG.info("Flushing " + + storesToFlush.size() + "/" + stores.size() + " column families," +
+ LOG.info("Flushing " + storesToFlush.size() + "/" + stores.size() + " column families," +
" dataSize=" + StringUtils.byteDesc(mss.getDataSize()) +
" heapSize=" + StringUtils.byteDesc(mss.getHeapSize()) +
((perCfExtras != null && perCfExtras.length() > 0)? perCfExtras.toString(): "") +
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 5db1879..2f40bcb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -2401,7 +2401,7 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat
if (LOG.isInfoEnabled()) {
LOG.info("Region: " + HStore.this.getRegionInfo().getEncodedName() +
" added " + storeFile + ", entries=" + storeFile.getReader().getEntries() +
- ", sequenceid=" + +storeFile.getReader().getSequenceID() + ", filesize="
+ ", sequenceid=" + storeFile.getReader().getSequenceID() + ", filesize="
+ TraditionalBinaryPrefix.long2String(storeFile.getReader().length(), "", 1));
}
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java
index 70aa26a..c981488 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java
@@ -405,7 +405,7 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
// need to reload split keys each iteration.
final Pair<byte[][], byte[][]> startEndKeys = regionLocator.getStartEndKeys();
if (count != 0) {
- LOG.info("Split occurred while grouping HFiles, retry attempt " + +count + " with " +
+ LOG.info("Split occurred while grouping HFiles, retry attempt " + count + " with " +
queue.size() + " files remaining to group or split");
}