Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E6A02200CF6 for ; Mon, 18 Sep 2017 16:39:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E51ED1609DB; Mon, 18 Sep 2017 14:39:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 108971609D8 for ; Mon, 18 Sep 2017 16:39:16 +0200 (CEST) Received: (qmail 41982 invoked by uid 500); 18 Sep 2017 14:39:16 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 41973 invoked by uid 99); 18 Sep 2017 14:39:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Sep 2017 14:39:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1BBFDE0667; Mon, 18 Sep 2017 14:39:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chia7712@apache.org To: commits@hbase.apache.org Message-Id: <886bedc9afad4b49af7b6d31053d2ec4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-18835 The return type of ExtendedCell#deepClone should be ExtendedCell rather than Cell Date: Mon, 18 Sep 2017 14:39:16 +0000 (UTC) archived-at: Mon, 18 Sep 2017 14:39:18 -0000 Repository: hbase Updated Branches: refs/heads/branch-2 5ed2f899e -> f380676d4 HBASE-18835 The return type of ExtendedCell#deepClone should be ExtendedCell rather than Cell Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f380676d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f380676d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f380676d Branch: refs/heads/branch-2 Commit: f380676d4958933da7be75da6c042071dcb77160 Parents: 5ed2f89 Author: Chia-Ping Tsai Authored: Mon Sep 18 18:22:55 2017 +0800 Committer: Chia-Ping Tsai Committed: Mon Sep 18 22:38:42 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/ByteBufferKeyValue.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/CellUtil.java | 8 ++++---- .../src/main/java/org/apache/hadoop/hbase/ExtendedCell.java | 2 +- .../org/apache/hadoop/hbase/IndividualBytesFieldCell.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/KeyValue.java | 2 +- .../org/apache/hadoop/hbase/NoTagsByteBufferKeyValue.java | 2 +- .../main/java/org/apache/hadoop/hbase/NoTagsKeyValue.java | 2 +- .../hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f380676d/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java index f906681..c59b947 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java @@ -302,7 +302,7 @@ public class ByteBufferKeyValue extends ByteBufferCell implements ExtendedCell { } @Override - public Cell deepClone() { + public ExtendedCell deepClone() { byte[] copy = new byte[this.length]; ByteBufferUtils.copyFromBufferToArray(copy, this.buf, this.offset, 0, this.length); KeyValue kv = new KeyValue(copy, 0, copy.length); http://git-wip-us.apache.org/repos/asf/hbase/blob/f380676d/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java index 825d9b1..a3029f8 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java @@ -657,7 +657,7 @@ public final class CellUtil { } @Override - public Cell deepClone() { + public ExtendedCell deepClone() { Cell clonedBaseCell = ((ExtendedCell) this.cell).deepClone(); return new TagRewriteCell(clonedBaseCell, this.tags); } @@ -838,7 +838,7 @@ public final class CellUtil { } @Override - public Cell deepClone() { + public ExtendedCell deepClone() { Cell clonedBaseCell = ((ExtendedCell) this.cell).deepClone(); if (clonedBaseCell instanceof ByteBufferCell) { return new TagRewriteByteBufferCell((ByteBufferCell) clonedBaseCell, this.tags); @@ -981,7 +981,7 @@ public final class CellUtil { } @Override - public Cell deepClone() { + public ExtendedCell deepClone() { Cell clonedBaseCell = ((ExtendedCell) this.cell).deepClone(); return new ValueAndTagRewriteCell(clonedBaseCell, this.value, this.tags); } @@ -1047,7 +1047,7 @@ public final class CellUtil { } @Override - public Cell deepClone() { + public ExtendedCell deepClone() { Cell clonedBaseCell = ((ExtendedCell) this.cell).deepClone(); if (clonedBaseCell instanceof ByteBufferCell) { return new ValueAndTagRewriteByteBufferCell((ByteBufferCell) clonedBaseCell, this.value, http://git-wip-us.apache.org/repos/asf/hbase/blob/f380676d/hbase-common/src/main/java/org/apache/hadoop/hbase/ExtendedCell.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ExtendedCell.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ExtendedCell.java index 7ed4dc0..4d16fca 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ExtendedCell.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ExtendedCell.java @@ -73,7 +73,7 @@ public interface ExtendedCell extends Cell, SettableSequenceId, SettableTimestam * Does a deep copy of the contents to a new memory area and returns it as a new cell. * @return The deep cloned cell */ - Cell deepClone(); + ExtendedCell deepClone(); /** * Extracts the id of the backing bytebuffer of this cell if it was obtained from fixed sized http://git-wip-us.apache.org/repos/asf/hbase/blob/f380676d/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java index 0597c5e..14e35df 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java @@ -183,7 +183,7 @@ public class IndividualBytesFieldCell implements ExtendedCell { } @Override - public Cell deepClone() { + public ExtendedCell deepClone() { // When being added to the memstore, deepClone() is called and KeyValue has less heap overhead. return new KeyValue(this); } http://git-wip-us.apache.org/repos/asf/hbase/blob/f380676d/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 0ee8b80..ae95738 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 @@ -2808,7 +2808,7 @@ public class KeyValue implements ExtendedCell { } @Override - public Cell deepClone() { + public ExtendedCell deepClone() { byte[] copy = Bytes.copy(this.bytes, this.offset, this.length); KeyValue kv = new KeyValue(copy, 0, copy.length); kv.setSequenceId(this.getSequenceId()); http://git-wip-us.apache.org/repos/asf/hbase/blob/f380676d/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsByteBufferKeyValue.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsByteBufferKeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsByteBufferKeyValue.java index 1822563..82b243b 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsByteBufferKeyValue.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsByteBufferKeyValue.java @@ -52,7 +52,7 @@ public class NoTagsByteBufferKeyValue extends ByteBufferKeyValue { } @Override - public Cell deepClone() { + public ExtendedCell deepClone() { byte[] copy = new byte[this.length]; ByteBufferUtils.copyFromBufferToArray(copy, this.buf, this.offset, 0, this.length); KeyValue kv = new NoTagsKeyValue(copy, 0, copy.length); http://git-wip-us.apache.org/repos/asf/hbase/blob/f380676d/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsKeyValue.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsKeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsKeyValue.java index 8a57a01..088aff5 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsKeyValue.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/NoTagsKeyValue.java @@ -51,7 +51,7 @@ public class NoTagsKeyValue extends KeyValue { } @Override - public Cell deepClone() { + public ExtendedCell deepClone() { byte[] copy = Bytes.copy(this.bytes, this.offset, this.length); KeyValue kv = new NoTagsKeyValue(copy, 0, copy.length); kv.setSequenceId(this.getSequenceId()); http://git-wip-us.apache.org/repos/asf/hbase/blob/f380676d/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 00ec0fc..bc905e5 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 @@ -470,7 +470,7 @@ abstract class BufferedDataBlockEncoder extends AbstractDataBlockEncoder { } @Override - public Cell deepClone() { + public ExtendedCell deepClone() { // This is not used in actual flow. Throwing UnsupportedOperationException throw new UnsupportedOperationException(); } @@ -715,7 +715,7 @@ abstract class BufferedDataBlockEncoder extends AbstractDataBlockEncoder { } @Override - public Cell deepClone() { + public ExtendedCell deepClone() { // This is not used in actual flow. Throwing UnsupportedOperationException throw new UnsupportedOperationException(); }