You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/09/24 00:34:24 UTC
[24/47] hbase git commit: HBASE-18835 The return type of
ExtendedCell#deepClone should be ExtendedCell rather than Cell
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/fc13cf7d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fc13cf7d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fc13cf7d
Branch: refs/heads/HBASE-18467
Commit: fc13cf7d7843029d807878869e3c64cace5640dd
Parents: efb95a1
Author: Chia-Ping Tsai <ch...@gmail.com>
Authored: Mon Sep 18 18:22:55 2017 +0800
Committer: Chia-Ping Tsai <ch...@gmail.com>
Committed: Mon Sep 18 22:31:32 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/fc13cf7d/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/fc13cf7d/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/fc13cf7d/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/fc13cf7d/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/fc13cf7d/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/fc13cf7d/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/fc13cf7d/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/fc13cf7d/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();
}