[hbase] branch branch-2 updated: HBASE-22392. Remove extra/useless +

[janh]

This is an automated email from the ASF dual-hosted git repository.

janh 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 164924c  HBASE-22392. Remove extra/useless +
164924c is described below

commit 164924c7df6db3afc28dc1e62f165569a97a39e5
Author: Puleya7 <liyong1...@gmail.com>
AuthorDate: Fri May 10 16:56:45 2019 +0800

    HBASE-22392. Remove extra/useless +
    
    Signed-off-by: Jan Hentschel <jan.hentsc...@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 4ee231b..24bafab 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
@@ -2682,7 +2682,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 0faeaa1..86b6c1e 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
@@ -2359,7 +2359,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 fb87d79..bebd736 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
@@ -411,7 +411,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");
       }