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 2a48bd1..7a9fe66 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 @@ -974,7 +974,7 @@ public final class CellUtil { @Override public Cell deepClone() { Cell clonedBaseCell = ((ExtendedCell) this.cell).deepClone(); - return new ValueAndTagRewriteCell(clonedBaseCell, this.tags, this.value); + return new ValueAndTagRewriteCell(clonedBaseCell, this.value, this.tags); } } @@ -1050,10 +1050,10 @@ public final class CellUtil { public Cell deepClone() { Cell clonedBaseCell = ((ExtendedCell) this.cell).deepClone(); if (clonedBaseCell instanceof ByteBufferCell) { - return new ValueAndTagRewriteByteBufferCell((ByteBufferCell) clonedBaseCell, this.tags, - this.value); + return new ValueAndTagRewriteByteBufferCell((ByteBufferCell) clonedBaseCell, this.value, + this.tags); } - return new ValueAndTagRewriteCell(clonedBaseCell, this.tags, this.value); + return new ValueAndTagRewriteCell(clonedBaseCell, this.value, this.tags); } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java index 7e08eca..578841e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java @@ -566,7 +566,6 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner case INCLUDE: case INCLUDE_AND_SEEK_NEXT_ROW: case INCLUDE_AND_SEEK_NEXT_COL: - Filter f = matcher.getFilter(); if (f != null) { cell = f.transformCell(cell);