You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/04/29 19:35:30 UTC
hbase git commit: HBASE-13594 MultiRowRangeFilter shouldn't call
HBaseZeroCopyByteString.wrap() directly
Repository: hbase
Updated Branches:
refs/heads/branch-1 64a42698a -> 20b6c3188
HBASE-13594 MultiRowRangeFilter shouldn't call HBaseZeroCopyByteString.wrap() directly
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/20b6c318
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/20b6c318
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/20b6c318
Branch: refs/heads/branch-1
Commit: 20b6c318809f3a2aea35c1d2d7faacfa7315a84e
Parents: 64a4269
Author: tedyu <yu...@gmail.com>
Authored: Wed Apr 29 10:35:45 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Wed Apr 29 10:35:45 2015 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/filter/MultiRowRangeFilter.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/20b6c318/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
index bd880a0..4005f38 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.java
@@ -22,16 +22,16 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValueUtil;
+import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
import org.apache.hadoop.hbase.protobuf.generated.FilterProtos;
+import org.apache.hadoop.hbase.util.ByteStringer;
import org.apache.hadoop.hbase.util.Bytes;
-import com.google.protobuf.HBaseZeroCopyByteString;
import com.google.protobuf.InvalidProtocolBufferException;
/**
@@ -144,10 +144,10 @@ public class MultiRowRangeFilter extends FilterBase {
if (range != null) {
FilterProtos.RowRange.Builder rangebuilder = FilterProtos.RowRange.newBuilder();
if (range.startRow != null)
- rangebuilder.setStartRow(HBaseZeroCopyByteString.wrap(range.startRow));
+ rangebuilder.setStartRow(ByteStringer.wrap(range.startRow));
rangebuilder.setStartRowInclusive(range.startRowInclusive);
if (range.stopRow != null)
- rangebuilder.setStopRow(HBaseZeroCopyByteString.wrap(range.stopRow));
+ rangebuilder.setStopRow(ByteStringer.wrap(range.stopRow));
rangebuilder.setStopRowInclusive(range.stopRowInclusive);
range.isScan = Bytes.equals(range.startRow, range.stopRow) ? 1 : 0;
builder.addRowRangeList(rangebuilder.build());