Repository: hbase
Updated Branches:
  refs/heads/master 3a0dbf71a -> bda5fd5a1


HBASE-16792 - reverting to change commit message


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bda5fd5a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bda5fd5a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bda5fd5a

Branch: refs/heads/master
Commit: bda5fd5a11f8fa127bd0dfdc10e88cd49d51b201
Parents: 3a0dbf7
Author: Ramkrishna <ramkrishna.s.vasude...@intel.com>
Authored: Mon Oct 17 12:24:17 2016 +0530
Committer: Ramkrishna <ramkrishna.s.vasude...@intel.com>
Committed: Mon Oct 17 12:25:13 2016 +0530

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/KeyValue.java  | 15 ---------------
 .../hbase/io/encoding/BufferedDataBlockEncoder.java  |  4 ++--
 .../apache/hadoop/hbase/regionserver/HRegion.java    |  4 ++--
 3 files changed, 4 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/bda5fd5a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
index f9a621a..8f8554c 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
@@ -43,7 +43,6 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.ClassSize;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.RawComparator;
-
 import com.google.common.annotations.VisibleForTesting;
 
 /**
@@ -2642,20 +2641,6 @@ public class KeyValue implements ExtendedCell {
       this.rowLen = Bytes.toShort(this.bytes, this.offset);
     }
 
-    public void set(KeyOnlyKeyValue keyOnlyKeyValue) {
-      this.bytes = keyOnlyKeyValue.bytes;
-      this.length = keyOnlyKeyValue.length;
-      this.offset = keyOnlyKeyValue.offset;
-      this.rowLen = keyOnlyKeyValue.rowLen;
-    }
-
-    public void clear() {
-      rowLen = -1;
-      bytes = null;
-      offset = 0;
-      length = 0;
-    }
-
     @Override
     public int getKeyOffset() {
       return this.offset;

http://git-wip-us.apache.org/repos/asf/hbase/blob/bda5fd5a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
----------------------------------------------------------------------
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
index edecd9a..4d3a26c 100644
--- 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
+++ 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
@@ -139,7 +139,7 @@ abstract class BufferedDataBlockEncoder extends 
AbstractDataBlockEncoder {
     protected void invalidate() {
       valueOffset = -1;
       tagsCompressedLength = 0;
-      currentKey.clear();
+      currentKey = new KeyValue.KeyOnlyKeyValue();
       uncompressTags = true;
       currentBuffer = null;
     }
@@ -188,7 +188,7 @@ abstract class BufferedDataBlockEncoder extends 
AbstractDataBlockEncoder {
             keyBuffer, nextState.lastCommonPrefix, nextState.keyLength
                 - nextState.lastCommonPrefix);
       }
-      currentKey.set(nextState.currentKey);
+      currentKey = nextState.currentKey;
 
       valueOffset = nextState.valueOffset;
       keyLength = nextState.keyLength;

http://git-wip-us.apache.org/repos/asf/hbase/blob/bda5fd5a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
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 ca92f06..f61eb4b 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
@@ -356,9 +356,9 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver, Regi
     // We need to ensure that while we are calculating the smallestReadPoint
     // no new RegionScanners can grab a readPoint that we are unaware of.
     // We achieve this by synchronizing on the scannerReadPoints object.
-    synchronized (scannerReadPoints) {
+    synchronized(scannerReadPoints) {
       minimumReadPoint = mvcc.getReadPoint();
-      for (Long readPoint : this.scannerReadPoints.values()) {
+      for (Long readPoint: this.scannerReadPoints.values()) {
         if (readPoint < minimumReadPoint) {
           minimumReadPoint = readPoint;
         }

Reply via email to