Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HBASE-26856:BufferedDataBlockEncoder.OnheapDecodedCell value can get corrupted (#4394)" 

This reverts commit c198f23e5e.
This commit is contained in:
Nick Dimiduk 2022-05-18 12:59:37 +02:00 committed by GitHub
parent b787648847
commit 2ba95322c6
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
View File

@ -232,10 +232,9 @@ abstract class BufferedDataBlockEncoder extends AbstractDataBlockEncoder {
int tOffset = 0; int tOffset = 0;
if (this.includeTags) { if (this.includeTags) {
if (this.tagCompressionContext == null) { if (this.tagCompressionContext == null) {
tagsArray = valAndTagsBuffer.array();
tOffset = tOffset =
valAndTagsBuffer.arrayOffset() + vOffset + this.valueLength + tagsLenSerializationSize; valAndTagsBuffer.arrayOffset() + vOffset + this.valueLength + tagsLenSerializationSize;
tagsArray = Bytes.copy(valAndTagsBuffer.array(), tOffset, this.tagsLength);
tOffset = 0;
} else { } else {
tagsArray = Bytes.copy(tagsBuffer, 0, this.tagsLength); tagsArray = Bytes.copy(tagsBuffer, 0, this.tagsLength);
tOffset = 0; tOffset = 0;
@ -244,8 +243,9 @@ abstract class BufferedDataBlockEncoder extends AbstractDataBlockEncoder {
return new OnheapDecodedCell(Bytes.copy(keyBuffer, 0, this.keyLength), return new OnheapDecodedCell(Bytes.copy(keyBuffer, 0, this.keyLength),
currentKey.getRowLength(), currentKey.getFamilyOffset(), currentKey.getFamilyLength(), currentKey.getRowLength(), currentKey.getFamilyOffset(), currentKey.getFamilyLength(),
currentKey.getQualifierOffset(), currentKey.getQualifierLength(), currentKey.getTimestamp(), currentKey.getQualifierOffset(), currentKey.getQualifierLength(), currentKey.getTimestamp(),
currentKey.getTypeByte(), Bytes.copy(valAndTagsBuffer.array(), valAndTagsBuffer.arrayOffset() + vOffset, currentKey.getTypeByte(), valAndTagsBuffer.array(),
this.valueLength), 0, this.valueLength, memstoreTS, tagsArray, tOffset, this.tagsLength); valAndTagsBuffer.arrayOffset() + vOffset, this.valueLength, memstoreTS, tagsArray, tOffset,
this.tagsLength);
} }
private Cell toOffheapCell(ByteBuffer valAndTagsBuffer, int vOffset, private Cell toOffheapCell(ByteBuffer valAndTagsBuffer, int vOffset,
@ -254,26 +254,13 @@ abstract class BufferedDataBlockEncoder extends AbstractDataBlockEncoder {
int tOffset = 0; int tOffset = 0;
if (this.includeTags) { if (this.includeTags) {
if (this.tagCompressionContext == null) { if (this.tagCompressionContext == null) {
tagsBuf = valAndTagsBuffer;
tOffset = vOffset + this.valueLength + tagsLenSerializationSize; tOffset = vOffset + this.valueLength + tagsLenSerializationSize;
byte[] output = new byte[this.tagsLength];
ByteBufferUtils.copyFromBufferToArray(output, valAndTagsBuffer, tOffset, 0,
this.tagsLength);
tagsBuf = ByteBuffer.wrap(output);
tOffset = 0;
} else { } else {
tagsBuf = ByteBuffer.wrap(Bytes.copy(tagsBuffer, 0, this.tagsLength)); tagsBuf = ByteBuffer.wrap(Bytes.copy(tagsBuffer, 0, this.tagsLength));
tOffset = 0; tOffset = 0;
} }
} }
if (this.valueLength > 0) {
byte[] output = new byte[this.valueLength];
ByteBufferUtils.copyFromBufferToArray(output, valAndTagsBuffer, vOffset, 0,
this.valueLength);
valAndTagsBuffer = ByteBuffer.wrap(output);
vOffset = 0;
}
return new OffheapDecodedExtendedCell( return new OffheapDecodedExtendedCell(
ByteBuffer.wrap(Bytes.copy(keyBuffer, 0, this.keyLength)), currentKey.getRowLength(), ByteBuffer.wrap(Bytes.copy(keyBuffer, 0, this.keyLength)), currentKey.getRowLength(),
currentKey.getFamilyOffset(), currentKey.getFamilyLength(), currentKey.getQualifierOffset(), currentKey.getFamilyOffset(), currentKey.getFamilyLength(), currentKey.getQualifierOffset(),