Repository: hbase Updated Branches: refs/heads/master 88ff71b91 -> 193e0d602
revert HBASE-16792 due to test failures Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/193e0d60 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/193e0d60 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/193e0d60 Branch: refs/heads/master Commit: 193e0d60246441a00ef96a3f4b92b7cfd3b4cb1f Parents: 88ff71b Author: Ramkrishna <ramkrishna.s.vasude...@intel.com> Authored: Thu Oct 13 14:31:01 2016 +0530 Committer: Ramkrishna <ramkrishna.s.vasude...@intel.com> Committed: Thu Oct 13 14:32:02 2016 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/KeyValue.java | 8 -------- .../hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/193e0d60/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 da5677d..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,13 +2641,6 @@ public class KeyValue implements ExtendedCell { this.rowLen = Bytes.toShort(this.bytes, this.offset); } - 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/193e0d60/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 514e829..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; }
