HBASE-16792 - reverting to change commit message

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;

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;

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;
         }