From f5fd353b81ad092d770996857932cb1a30cb748c Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Wed, 18 May 2022 12:59:37 +0200 Subject: [PATCH] Revert "HBASE-26856:BufferedDataBlockEncoder.OnheapDecodedCell value can get corrupted (#4394)" This reverts commit c198f23e5eb078abc47d4c3439477c6c2b4d5136. --- .../io/encoding/BufferedDataBlockEncoder.java | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) 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 93960f7a314b..8ab17285d9d9 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 @@ -232,10 +232,9 @@ private Cell toOnheapCell(ByteBuffer valAndTagsBuffer, int vOffset, int tOffset = 0; if (this.includeTags) { if (this.tagCompressionContext == null) { + tagsArray = valAndTagsBuffer.array(); tOffset = valAndTagsBuffer.arrayOffset() + vOffset + this.valueLength + tagsLenSerializationSize; - tagsArray = Bytes.copy(valAndTagsBuffer.array(), tOffset, this.tagsLength); - tOffset = 0; } else { tagsArray = Bytes.copy(tagsBuffer, 0, this.tagsLength); tOffset = 0; @@ -244,8 +243,9 @@ private Cell toOnheapCell(ByteBuffer valAndTagsBuffer, int vOffset, return new OnheapDecodedCell(Bytes.copy(keyBuffer, 0, this.keyLength), currentKey.getRowLength(), currentKey.getFamilyOffset(), currentKey.getFamilyLength(), currentKey.getQualifierOffset(), currentKey.getQualifierLength(), currentKey.getTimestamp(), - currentKey.getTypeByte(), Bytes.copy(valAndTagsBuffer.array(), valAndTagsBuffer.arrayOffset() + vOffset, - this.valueLength), 0, this.valueLength, memstoreTS, tagsArray, tOffset, this.tagsLength); + currentKey.getTypeByte(), valAndTagsBuffer.array(), + valAndTagsBuffer.arrayOffset() + vOffset, this.valueLength, memstoreTS, tagsArray, tOffset, + this.tagsLength); } private Cell toOffheapCell(ByteBuffer valAndTagsBuffer, int vOffset, @@ -254,26 +254,13 @@ private Cell toOffheapCell(ByteBuffer valAndTagsBuffer, int vOffset, int tOffset = 0; if (this.includeTags) { if (this.tagCompressionContext == null) { + tagsBuf = valAndTagsBuffer; 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 { tagsBuf = ByteBuffer.wrap(Bytes.copy(tagsBuffer, 0, this.tagsLength)); 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( ByteBuffer.wrap(Bytes.copy(keyBuffer, 0, this.keyLength)), currentKey.getRowLength(), currentKey.getFamilyOffset(), currentKey.getFamilyLength(), currentKey.getQualifierOffset(),