hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [6/6] hbase git commit: HBASE-18995 Move methods that are for internal usage from CellUtil to Private util class (Ramkrishna Vasudevan)
Date Sat, 28 Oct 2017 00:49:18 GMT
HBASE-18995 Move methods that are for internal usage from CellUtil to Private util class (Ramkrishna
Vasudevan)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f6c2490b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f6c2490b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f6c2490b

Branch: refs/heads/master
Commit: f6c2490b82968f33e7d7db0b96896eebdf745e19
Parents: 4dee4a8
Author: Michael Stack <stack@apache.org>
Authored: Fri Oct 27 17:48:55 2017 -0700
Committer: Michael Stack <stack@apache.org>
Committed: Fri Oct 27 17:48:55 2017 -0700

----------------------------------------------------------------------
 .../client/AllowPartialScanResultCache.java     |    2 +-
 .../hbase/client/BatchScanResultCache.java      |    2 +-
 .../hadoop/hbase/client/ConnectionUtils.java    |    8 +-
 .../org/apache/hadoop/hbase/client/Delete.java  |    3 +-
 .../apache/hadoop/hbase/client/Increment.java   |    2 +-
 .../apache/hadoop/hbase/client/Mutation.java    |    5 +-
 .../org/apache/hadoop/hbase/client/Put.java     |    2 +-
 .../org/apache/hadoop/hbase/client/Result.java  |    8 +-
 .../BigDecimalColumnInterpreter.java            |    3 +-
 .../coprocessor/DoubleColumnInterpreter.java    |    4 +-
 .../coprocessor/LongColumnInterpreter.java      |    4 +-
 .../hbase/filter/ColumnPaginationFilter.java    |    3 +-
 .../hadoop/hbase/filter/ColumnPrefixFilter.java |    4 +-
 .../hadoop/hbase/filter/ColumnRangeFilter.java  |    3 +-
 .../hadoop/hbase/filter/CompareFilter.java      |   18 +-
 .../hadoop/hbase/filter/FuzzyRowFilter.java     |    3 +-
 .../hbase/filter/MultiRowRangeFilter.java       |    3 +-
 .../filter/MultipleColumnPrefixFilter.java      |    3 +-
 .../hbase/filter/SingleColumnValueFilter.java   |    3 +-
 .../hadoop/hbase/filter/TimestampsFilter.java   |    6 +-
 .../hadoop/hbase/filter/TestComparators.java    |   37 +-
 .../hadoop/hbase/ipc/TestCellBlockBuilder.java  |    3 +-
 .../java/org/apache/hadoop/hbase/CellUtil.java  | 3987 ++++--------------
 .../hadoop/hbase/IndividualBytesFieldCell.java  |    3 +-
 .../java/org/apache/hadoop/hbase/KeyValue.java  |    4 +-
 .../apache/hadoop/hbase/KeyValueTestUtil.java   |    2 +-
 .../org/apache/hadoop/hbase/KeyValueUtil.java   |    4 +-
 .../java/org/apache/hadoop/hbase/TagUtil.java   |    2 +-
 .../io/encoding/BufferedDataBlockEncoder.java   |    7 +-
 .../hbase/io/encoding/DiffKeyDeltaEncoder.java  |   14 +-
 .../hbase/io/encoding/FastDiffDeltaEncoder.java |   18 +-
 .../hadoop/hbase/io/encoding/NoneEncoder.java   |    4 +-
 .../io/encoding/PrefixKeyDeltaEncoder.java      |   16 +-
 .../hbase/io/encoding/RowIndexSeekerV1.java     |    5 +-
 .../hadoop/hbase/util/RowBloomHashKey.java      |    3 +-
 .../hadoop/hbase/util/RowColBloomHashKey.java   |    5 +-
 .../hadoop/hbase/TestByteBufferKeyValue.java    |    4 +-
 .../apache/hadoop/hbase/TestCellComparator.java |   15 +-
 .../org/apache/hadoop/hbase/TestCellUtil.java   |   97 +-
 .../org/apache/hadoop/hbase/TestKeyValue.java   |    4 +-
 .../hbase/mapreduce/CellSerialization.java      |    7 +-
 .../hadoop/hbase/mapreduce/CellSortReducer.java |    4 +-
 .../hbase/mapreduce/HFileOutputFormat2.java     |    6 +-
 .../apache/hadoop/hbase/mapreduce/Import.java   |   16 +-
 .../mapreduce/TableSnapshotInputFormatImpl.java |    8 +-
 .../hadoop/hbase/mapreduce/WALPlayer.java       |    2 +-
 .../apache/hadoop/hbase/util/MapReduceCell.java |   17 +-
 .../hbase/mapreduce/TestHFileOutputFormat2.java |    2 +-
 .../hbase/mapreduce/TestImportExport.java       |    3 +-
 .../TestImportTSVWithOperationAttributes.java   |    4 +-
 .../TestImportTSVWithVisibilityLabels.java      |    4 +-
 .../hadoop/hbase/mapreduce/TestImportTsv.java   |    4 +-
 .../hadoop/hbase/mapreduce/TestSyncTable.java   |    2 +-
 .../codec/prefixtree/PrefixTreeSeeker.java      |    3 +-
 .../decode/PrefixTreeArrayScanner.java          |    3 +-
 .../decode/PrefixTreeArraySearcher.java         |    7 +-
 .../codec/prefixtree/decode/PrefixTreeCell.java |    4 +-
 .../prefixtree/encode/PrefixTreeEncoder.java    |    9 +-
 .../codec/prefixtree/row/BaseTestRowData.java   |    2 +-
 .../prefixtree/row/TestPrefixTreeSearcher.java  |    3 +-
 .../hbase/client/ClientSideRegionScanner.java   |    3 +-
 .../hbase/client/TableSnapshotScanner.java      |    3 +-
 .../hadoop/hbase/io/HalfStoreFileReader.java    |   13 +-
 .../io/hfile/CompoundBloomFilterWriter.java     |    4 +-
 .../hadoop/hbase/io/hfile/HFileBlockIndex.java  |    5 +-
 .../hbase/io/hfile/HFilePrettyPrinter.java      |    3 +-
 .../hadoop/hbase/io/hfile/HFileReaderImpl.java  |   10 +-
 .../hadoop/hbase/io/hfile/HFileWriterImpl.java  |   15 +-
 .../hbase/mob/DefaultMobStoreCompactor.java     |    3 +-
 .../org/apache/hadoop/hbase/mob/MobUtils.java   |   11 +-
 .../hbase/protobuf/ReplicationProtbufUtil.java  |    4 +-
 .../hadoop/hbase/regionserver/HRegion.java      |   44 +-
 .../hbase/regionserver/HRegionFileSystem.java   |    6 +-
 .../hbase/regionserver/MutableSegment.java      |    3 +-
 .../hbase/regionserver/RSRpcServices.java       |    9 +-
 .../regionserver/ReversedKeyValueHeap.java      |    2 +-
 .../regionserver/ReversedRegionScannerImpl.java |    3 +-
 .../regionserver/ReversedStoreScanner.java      |    2 +-
 .../hadoop/hbase/regionserver/Segment.java      |    4 +-
 .../hbase/regionserver/SegmentScanner.java      |    8 +-
 .../hbase/regionserver/StoreFileReader.java     |    8 +-
 .../hbase/regionserver/StoreFileScanner.java    |   17 +-
 .../hbase/regionserver/StoreFileWriter.java     |    3 +-
 .../hadoop/hbase/regionserver/StoreScanner.java |   10 +-
 .../regionserver/StripeMultiFileWriter.java     |    3 +-
 .../hbase/regionserver/TimeRangeTracker.java    |    3 +-
 .../regionserver/compactions/Compactor.java     |    8 +-
 .../querymatcher/ExplicitColumnTracker.java     |    5 +-
 .../MajorCompactionScanQueryMatcher.java        |    3 +-
 .../MinorCompactionScanQueryMatcher.java        |    3 +-
 .../querymatcher/NewVersionBehaviorTracker.java |    8 +-
 .../NormalUserScanQueryMatcher.java             |    3 +-
 .../querymatcher/ScanQueryMatcher.java          |   21 +-
 .../querymatcher/ScanWildcardColumnTracker.java |    3 +-
 .../StripeCompactionScanQueryMatcher.java       |    3 +-
 .../querymatcher/UserScanQueryMatcher.java      |    3 +-
 .../hbase/regionserver/wal/AbstractFSWAL.java   |    4 +-
 .../hbase/regionserver/wal/FSWALEntry.java      |    3 +-
 .../regionserver/wal/SecureWALCellCodec.java    |   12 +-
 .../hbase/regionserver/wal/WALCellCodec.java    |   13 +-
 .../regionserver/ReplicationSink.java           |    2 +-
 .../security/access/AccessControlFilter.java    |    5 +-
 .../security/access/AccessControlLists.java     |    3 +-
 .../hbase/security/access/AccessController.java |   11 +-
 .../DefaultVisibilityLabelServiceImpl.java      |   11 +-
 .../visibility/VisibilityController.java        |   21 +-
 .../visibility/VisibilityLabelFilter.java       |    8 +-
 .../VisibilityReplicationEndpoint.java          |    3 +-
 .../security/visibility/VisibilityUtils.java    |    7 +-
 .../hadoop/hbase/util/RowColBloomContext.java   |    5 +-
 .../hadoop/hbase/wal/DisabledWALProvider.java   |    4 +-
 .../org/apache/hadoop/hbase/wal/WALEdit.java    |    5 +-
 .../hadoop/hbase/wal/WALPrettyPrinter.java      |    3 +-
 .../apache/hadoop/hbase/wal/WALSplitter.java    |    2 +-
 .../hadoop/hbase/HBaseTestingUtility.java       |    2 +-
 .../hbase/TestPartialResultsFromClientSide.java |    2 +-
 ...TestServerSideScanMetricsFromClientSide.java |    2 +-
 .../apache/hadoop/hbase/TestTagRewriteCell.java |    4 +-
 .../hbase/client/TestAsyncTableScanMetrics.java |    4 +-
 .../hadoop/hbase/client/TestFromClientSide.java |    7 +-
 .../apache/hadoop/hbase/filter/TestFilter.java  |   18 +-
 .../io/encoding/TestDataBlockEncoders.java      |   13 +-
 .../io/encoding/TestPrefixTreeEncoding.java     |   10 +-
 .../encoding/TestSeekToBlockWithEncoders.java   |    4 +-
 .../apache/hadoop/hbase/io/hfile/TestHFile.java |   41 +-
 .../hbase/io/hfile/TestHFileBlockIndex.java     |    7 +-
 .../io/hfile/TestScannerFromBucketCache.java    |   16 +-
 .../hadoop/hbase/io/hfile/TestSeekTo.java       |    4 +-
 .../TestSplitTableRegionProcedure.java          |    2 +-
 .../hbase/regionserver/TestBlocksRead.java      |    2 +-
 .../hbase/regionserver/TestDefaultMemStore.java |    4 +-
 .../hadoop/hbase/regionserver/TestHRegion.java  |   21 +-
 .../hadoop/hbase/regionserver/TestHStore.java   |    9 +-
 .../hbase/regionserver/TestHStoreFile.java      |    7 +-
 .../hbase/regionserver/TestKeepDeletes.java     |   13 +-
 .../regionserver/TestMultiColumnScanner.java    |    5 +-
 .../hbase/regionserver/TestRecoveredEdits.java  |    4 +-
 .../hadoop/hbase/regionserver/TestScanner.java  |    6 +-
 .../regionserver/TestSeekOptimizations.java     |    3 +-
 .../TestStoreFileRefresherChore.java            |    2 +-
 .../hbase/regionserver/TestStoreScanner.java    |   12 +-
 .../hadoop/hbase/regionserver/TestTags.java     |    4 +-
 .../querymatcher/TestUserScanQueryMatcher.java  |    4 +-
 .../ExpAsStringVisibilityLabelServiceImpl.java  |    3 +-
 .../TestVisibilityLabelsReplication.java        |    3 +-
 .../apache/hadoop/hbase/util/HFileTestUtil.java |    5 +-
 .../hbase/util/TestCoprocessorScanPolicy.java   |    2 +-
 .../hadoop/hbase/thrift2/ThriftUtilities.java   |    3 +-
 148 files changed, 1490 insertions(+), 3572 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AllowPartialScanResultCache.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AllowPartialScanResultCache.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AllowPartialScanResultCache.java
index aa79132..8d21994 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AllowPartialScanResultCache.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AllowPartialScanResultCache.java
@@ -69,7 +69,7 @@ class AllowPartialScanResultCache implements ScanResultCache {
     if (i == results.length) {
       return EMPTY_RESULT_ARRAY;
     }
-    if (lastResultPartial && !CellUtil.matchingRow(lastCell, results[0].getRow()))
{
+    if (lastResultPartial && !CellUtil.matchingRows(lastCell, results[0].getRow()))
{
       // there is a row change, so increase numberOfCompleteRows
       numberOfCompleteRows++;
     }

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BatchScanResultCache.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BatchScanResultCache.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BatchScanResultCache.java
index 5759a3e..3b27298 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BatchScanResultCache.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BatchScanResultCache.java
@@ -135,7 +135,7 @@ public class BatchScanResultCache implements ScanResultCache {
           // there is a row change
           regroupedResults.add(createCompletedResult());
         }
-      } else if (lastResultPartial && !CellUtil.matchingRow(lastCell, result.getRow()))
{
+      } else if (lastResultPartial && !CellUtil.matchingRows(lastCell, result.getRow()))
{
         // As for batched scan we may return partial results to user if we reach the batch
limit, so
         // here we need to use lastCell to determine if there is row change and increase
         // numberOfCompleteRows.

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
index 4f22402..5e0e3b7 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
@@ -40,9 +40,9 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellComparatorImpl;
-import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.hadoop.hbase.MasterNotRunningException;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableName;
@@ -320,7 +320,7 @@ public final class ConnectionUtils {
     long estimatedHeapSizeOfResult = 0;
     // We don't make Iterator here
     for (Cell cell : rs.rawCells()) {
-      estimatedHeapSizeOfResult += CellUtil.estimatedHeapSizeOf(cell);
+      estimatedHeapSizeOfResult += PrivateCellUtil.estimatedHeapSizeOf(cell);
     }
     return estimatedHeapSizeOfResult;
   }
@@ -331,7 +331,7 @@ public final class ConnectionUtils {
       return result;
     }
     // not the same row
-    if (!CellUtil.matchingRow(keepCellsAfter, result.getRow(), 0, result.getRow().length))
{
+    if (!PrivateCellUtil.matchingRows(keepCellsAfter, result.getRow(), 0, result.getRow().length))
{
       return result;
     }
     Cell[] rawCells = result.rawCells();
@@ -462,7 +462,7 @@ public final class ConnectionUtils {
     long resultSize = 0;
     for (Result rr : rrs) {
       for (Cell cell : rr.rawCells()) {
-        resultSize += CellUtil.estimatedSerializedSizeOf(cell);
+        resultSize += PrivateCellUtil.estimatedSerializedSizeOf(cell);
       }
     }
     scanMetrics.countOfBytesInResults.addAndGet(resultSize);

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
index 68aa381..27116a5 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
@@ -20,7 +20,6 @@
 package org.apache.hadoop.hbase.client;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
@@ -175,7 +174,7 @@ public class Delete extends Mutation implements Comparable<Row>
{
       throw new IOException("The recently added KeyValue is not of type "
           + "delete. Rowkey: " + Bytes.toStringBinary(this.row));
     }
-    if (!CellUtil.matchingRow(kv, this.row)) {
+    if (!CellUtil.matchingRows(kv, this.row)) {
       throw new WrongRowIOException("The row in " + kv.toString() +
         " doesn't match the original one " +  Bytes.toStringBinary(this.row));
     }

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java
index 7a5ae01..d9cfea7 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java
@@ -96,7 +96,7 @@ public class Increment extends Mutation implements Comparable<Row>
{
     byte [] family = CellUtil.cloneFamily(cell);
     List<Cell> list = getCellList(family);
     //Checking that the row of the kv is the same as the put
-    if (!CellUtil.matchingRow(cell, this.row)) {
+    if (!CellUtil.matchingRows(cell, this.row)) {
       throw new WrongRowIOException("The row in " + cell +
         " doesn't match the original one " +  Bytes.toStringBinary(this.row));
     }

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
index 426cf2a..dd2c2f0 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
@@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.CellScannable;
 import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.Tag;
 import org.apache.hadoop.hbase.TagUtil;
@@ -225,7 +226,7 @@ public abstract class Mutation extends OperationWithAttributes implements
Row, C
                 c.getQualifierLength()));
     stringMap.put("timestamp", c.getTimestamp());
     stringMap.put("vlen", c.getValueLength());
-    List<Tag> tags = CellUtil.getTags(c);
+    List<Tag> tags = PrivateCellUtil.getTags(c);
     if (tags != null) {
       List<String> tagsString = new ArrayList<>(tags.size());
       for (Tag t : tags) {
@@ -437,7 +438,7 @@ public abstract class Mutation extends OperationWithAttributes implements
Row, C
           size * ClassSize.REFERENCE);
 
       for(Cell cell : entry.getValue()) {
-        heapsize += CellUtil.estimatedHeapSizeOf(cell);
+        heapsize += PrivateCellUtil.estimatedHeapSizeOf(cell);
       }
     }
     heapsize += getAttributeSize();

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java
index 9ee6555..94c6a98 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java
@@ -318,7 +318,7 @@ public class Put extends Mutation implements HeapSize, Comparable<Row>
{
     byte [] family = CellUtil.cloneFamily(kv);
     List<Cell> list = getCellList(family);
     //Checking that the row of the kv is the same as the put
-    if (!CellUtil.matchingRow(kv, this.row)) {
+    if (!CellUtil.matchingRows(kv, this.row)) {
       throw new WrongRowIOException("The row in " + kv.toString() +
         " doesn't match the original one " +  Bytes.toStringBinary(this.row));
     }

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
index c238aee..cc21ec8 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
@@ -40,6 +40,7 @@ import org.apache.hadoop.hbase.CellScannable;
 import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.KeyValueUtil;
 import org.apache.yetus.audience.InterfaceAudience;
@@ -297,7 +298,7 @@ public class Result implements CellScannable, CellScanner {
     byte[] familyNotNull = notNullBytes(family);
     byte[] qualifierNotNull = notNullBytes(qualifier);
     Cell searchTerm =
-        CellUtil.createFirstOnRow(kvs[0].getRowArray(),
+        PrivateCellUtil.createFirstOnRow(kvs[0].getRowArray(),
             kvs[0].getRowOffset(), kvs[0].getRowLength(),
             familyNotNull, 0, (byte)familyNotNull.length,
             qualifierNotNull, 0, qualifierNotNull.length);
@@ -408,7 +409,8 @@ public class Result implements CellScannable, CellScanner {
     if (pos == -1) {
       return null;
     }
-    if (CellUtil.matchingColumn(kvs[pos], family, foffset, flength, qualifier, qoffset, qlength))
{
+    if (PrivateCellUtil.matchingColumn(kvs[pos], family, foffset, flength, qualifier, qoffset,
+      qlength)) {
       return kvs[pos];
     }
     return null;
@@ -858,7 +860,7 @@ public class Result implements CellScannable, CellScanner {
       return size;
     }
     for (Cell c : result.rawCells()) {
-      size += CellUtil.estimatedHeapSizeOf(c);
+      size += PrivateCellUtil.estimatedHeapSizeOf(c);
     }
     return size;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java
index 31162ac..fb7dcd1 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java
@@ -25,6 +25,7 @@ import java.math.RoundingMode;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseInterfaceAudience;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.yetus.audience.InterfaceStability;
 import org.apache.hadoop.hbase.coprocessor.ColumnInterpreter;
@@ -49,7 +50,7 @@ public class BigDecimalColumnInterpreter extends ColumnInterpreter<BigDecimal,
B
     if (kv == null || CellUtil.cloneValue(kv) == null) {
       return null;
     }
-    return CellUtil.getValueAsBigDecimal(kv).setScale(2, RoundingMode.HALF_EVEN);
+    return PrivateCellUtil.getValueAsBigDecimal(kv).setScale(2, RoundingMode.HALF_EVEN);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java
index b484664..fbcfa59 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.hbase.client.coprocessor;
 import java.io.IOException;
 
 import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseInterfaceAudience;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.yetus.audience.InterfaceStability;
 import org.apache.hadoop.hbase.coprocessor.ColumnInterpreter;
@@ -48,7 +48,7 @@ public class DoubleColumnInterpreter extends ColumnInterpreter<Double,
Double,
       throws IOException {
     if (c == null || c.getValueLength() != Bytes.SIZEOF_DOUBLE)
       return null;
-    return CellUtil.getValueAsDouble(c);
+    return PrivateCellUtil.getValueAsDouble(c);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java
index 553ce2c..18b3c5b 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.hbase.client.coprocessor;
 import java.io.IOException;
 
 import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseInterfaceAudience;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.yetus.audience.InterfaceStability;
 import org.apache.hadoop.hbase.coprocessor.ColumnInterpreter;
@@ -47,7 +47,7 @@ public class LongColumnInterpreter extends ColumnInterpreter<Long, Long,
       throws IOException {
     if (kv == null || kv.getValueLength() != Bytes.SIZEOF_LONG)
       return null;
-    return CellUtil.getValueAsLong(kv);
+    return PrivateCellUtil.getValueAsLong(kv);
   }
 
    @Override

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java
index f61f418..0ab8f1a 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
@@ -147,7 +148,7 @@ public class ColumnPaginationFilter extends FilterBase {
 
   @Override
   public Cell getNextCellHint(Cell cell) {
-    return CellUtil.createFirstOnRowCol(cell, columnOffset, 0, columnOffset.length);
+    return PrivateCellUtil.createFirstOnRowCol(cell, columnOffset, 0, columnOffset.length);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java
index e571bb3..393f66d 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 
 import org.apache.hadoop.hbase.ByteBufferCell;
 import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
@@ -152,7 +152,7 @@ public class ColumnPrefixFilter extends FilterBase {
 
   @Override
   public Cell getNextCellHint(Cell cell) {
-    return CellUtil.createFirstOnRowCol(cell, prefix, 0, prefix.length);
+    return PrivateCellUtil.createFirstOnRowCol(cell, prefix, 0, prefix.length);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
index e3da170..2cd360f 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
@@ -224,7 +225,7 @@ public class ColumnRangeFilter extends FilterBase {
 
   @Override
   public Cell getNextCellHint(Cell cell) {
-    return CellUtil.createFirstOnRowCol(cell, this.minColumn, 0, len(this.minColumn));
+    return PrivateCellUtil.createFirstOnRowCol(cell, this.minColumn, 0, len(this.minColumn));
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
index 8145f01..cbf2b0d 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
@@ -23,8 +23,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 
 import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.CompareOperator;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
@@ -137,7 +137,7 @@ public abstract class CompareFilter extends FilterBase {
     if (compareOp == CompareOp.NO_OP) {
       return true;
     }
-    int compareResult = CellUtil.compareRow(cell, comparator);
+    int compareResult = PrivateCellUtil.compareRow(cell, comparator);
     return compare(compareOp, compareResult);
   }
 
@@ -146,7 +146,7 @@ public abstract class CompareFilter extends FilterBase {
     if (op == CompareOperator.NO_OP) {
       return true;
     }
-    int compareResult = CellUtil.compareRow(cell, comparator);
+    int compareResult = PrivateCellUtil.compareRow(cell, comparator);
     return compare(op, compareResult);
   }
 
@@ -160,7 +160,7 @@ public abstract class CompareFilter extends FilterBase {
     if (compareOp == CompareOp.NO_OP) {
       return true;
     }
-    int compareResult = CellUtil.compareFamily(cell, comparator);
+    int compareResult = PrivateCellUtil.compareFamily(cell, comparator);
     return compare(compareOp, compareResult);
   }
 
@@ -169,7 +169,7 @@ public abstract class CompareFilter extends FilterBase {
     if (op == CompareOperator.NO_OP) {
       return true;
     }
-    int compareResult = CellUtil.compareFamily(cell, comparator);
+    int compareResult = PrivateCellUtil.compareFamily(cell, comparator);
     return compare(op, compareResult);
   }
 
@@ -184,7 +184,7 @@ public abstract class CompareFilter extends FilterBase {
     if (compareOp == CompareOp.NO_OP) {
       return true;
     }
-    int compareResult = CellUtil.compareQualifier(cell, comparator);
+    int compareResult = PrivateCellUtil.compareQualifier(cell, comparator);
     return compare(compareOp, compareResult);
   }
 
@@ -194,7 +194,7 @@ public abstract class CompareFilter extends FilterBase {
     if (op == CompareOperator.NO_OP) {
       return true;
     }
-    int compareResult = CellUtil.compareQualifier(cell, comparator);
+    int compareResult = PrivateCellUtil.compareQualifier(cell, comparator);
     return compare(op, compareResult);
   }
 
@@ -209,7 +209,7 @@ public abstract class CompareFilter extends FilterBase {
     if (compareOp == CompareOp.NO_OP) {
       return true;
     }
-    int compareResult = CellUtil.compareValue(cell, comparator);
+    int compareResult = PrivateCellUtil.compareValue(cell, comparator);
     return compare(compareOp, compareResult);
   }
 
@@ -218,7 +218,7 @@ public abstract class CompareFilter extends FilterBase {
     if (op == CompareOperator.NO_OP) {
       return true;
     }
-    int compareResult = CellUtil.compareValue(cell, comparator);
+    int compareResult = PrivateCellUtil.compareValue(cell, comparator);
     return compare(op, compareResult);
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
index 62099e4..79c3193 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
@@ -26,6 +26,7 @@ import java.util.PriorityQueue;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellComparatorImpl;
 import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
@@ -187,7 +188,7 @@ public class FuzzyRowFilter extends FilterBase {
       return null;
     }
     byte[] nextRowKey = tracker.nextRow();
-    return CellUtil.createFirstOnRow(nextRowKey, 0, (short) nextRowKey.length);
+    return PrivateCellUtil.createFirstOnRow(nextRowKey, 0, (short) nextRowKey.length);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/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 a3f4159..d025349 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
@@ -24,6 +24,7 @@ import java.util.List;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
@@ -138,7 +139,7 @@ public class MultiRowRangeFilter extends FilterBase {
   @Override
   public Cell getNextCellHint(Cell currentKV) {
     // skip to the next range's start row
-    return CellUtil.createFirstOnRow(range.startRow, 0,
+    return PrivateCellUtil.createFirstOnRow(range.startRow, 0,
         (short) range.startRow.length);
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java
index 83d56a3..88af4f4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java
@@ -24,6 +24,7 @@ import java.util.TreeSet;
 
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
@@ -164,7 +165,7 @@ public class MultipleColumnPrefixFilter extends FilterBase {
 
   @Override
   public Cell getNextCellHint(Cell cell) {
-    return CellUtil.createFirstOnRowCol(cell, hint, 0, hint.length);
+    return PrivateCellUtil.createFirstOnRowCol(cell, hint, 0, hint.length);
   }
 
   public TreeSet<byte []> createTreeSet() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java
index a66c209..498b58f 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.CompareOperator;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
@@ -273,7 +274,7 @@ public class SingleColumnValueFilter extends FilterBase {
   }
 
   private boolean filterColumnValue(final Cell cell) {
-    int compareResult = CellUtil.compareValue(cell, this.comparator);
+    int compareResult = PrivateCellUtil.compareValue(cell, this.comparator);
     return CompareFilter.compare(this.op, compareResult);
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java
index 491d2ed..2742c7f 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java
@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.TreeSet;
 
 import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
@@ -150,14 +150,14 @@ public class TimestampsFilter extends FilterBase {
       // but it's always better to be extra safe and protect against future
       // behavioral changes.
 
-      return CellUtil.createLastOnRowCol(currentCell);
+      return PrivateCellUtil.createLastOnRowCol(currentCell);
     }
 
     // Since we know the nextTimestampObject isn't null here there must still be
     // timestamps that can be included. Cast the Long to a long and return the
     // a cell with the current row/cf/col and the next found timestamp.
     long nextTimestamp = nextTimestampObject;
-    return CellUtil.createFirstOnRowColTS(currentCell, nextTimestamp);
+    return PrivateCellUtil.createFirstOnRowColTS(currentCell, nextTimestamp);
   }
 
   public static Filter createFilterFromArguments(ArrayList<byte []> filterArguments)
{

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestComparators.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestComparators.java
b/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestComparators.java
index f640c5e..e3a6927 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestComparators.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestComparators.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.hbase.ByteBufferKeyValue;
 
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -53,44 +54,44 @@ public class TestComparators {
     ByteBuffer buffer = ByteBuffer.wrap(kv.getBuffer());
     Cell bbCell = new ByteBufferKeyValue(buffer, 0, buffer.remaining());
     ByteArrayComparable comparable = new BinaryComparator(r1);
-    assertEquals(0, CellUtil.compareRow(bbCell, comparable));
-    assertEquals(0, CellUtil.compareRow(kv, comparable));
+    assertEquals(0, PrivateCellUtil.compareRow(bbCell, comparable));
+    assertEquals(0, PrivateCellUtil.compareRow(kv, comparable));
     kv = new KeyValue(r0, f, q1, v1);
     buffer = ByteBuffer.wrap(kv.getBuffer());
     bbCell = new ByteBufferKeyValue(buffer, 0, buffer.remaining());
-    assertTrue(CellUtil.compareRow(bbCell, comparable) > 0);
-    assertTrue(CellUtil.compareRow(kv, comparable) > 0);
+    assertTrue(PrivateCellUtil.compareRow(bbCell, comparable) > 0);
+    assertTrue(PrivateCellUtil.compareRow(kv, comparable) > 0);
     kv = new KeyValue(r2, f, q1, v1);
     buffer = ByteBuffer.wrap(kv.getBuffer());
     bbCell = new ByteBufferKeyValue(buffer, 0, buffer.remaining());
-    assertTrue(CellUtil.compareRow(bbCell, comparable) < 0);
-    assertTrue(CellUtil.compareRow(kv, comparable) < 0);
+    assertTrue(PrivateCellUtil.compareRow(bbCell, comparable) < 0);
+    assertTrue(PrivateCellUtil.compareRow(kv, comparable) < 0);
     // Qualifier compare
     comparable = new BinaryPrefixComparator(Bytes.toBytes("qual"));
-    assertEquals(0, CellUtil.compareQualifier(bbCell, comparable));
-    assertEquals(0, CellUtil.compareQualifier(kv, comparable));
+    assertEquals(0, PrivateCellUtil.compareQualifier(bbCell, comparable));
+    assertEquals(0, PrivateCellUtil.compareQualifier(kv, comparable));
     kv = new KeyValue(r2, f, q2, v1);
     buffer = ByteBuffer.wrap(kv.getBuffer());
     bbCell = new ByteBufferKeyValue(buffer, 0, buffer.remaining());
-    assertEquals(0, CellUtil.compareQualifier(bbCell, comparable));
-    assertEquals(0, CellUtil.compareQualifier(kv, comparable));
+    assertEquals(0, PrivateCellUtil.compareQualifier(bbCell, comparable));
+    assertEquals(0, PrivateCellUtil.compareQualifier(kv, comparable));
     kv = new KeyValue(r2, f, q3, v1);
     buffer = ByteBuffer.wrap(kv.getBuffer());
     bbCell = new ByteBufferKeyValue(buffer, 0, buffer.remaining());
-    assertTrue(CellUtil.compareQualifier(bbCell, comparable) < 0);
-    assertTrue(CellUtil.compareQualifier(kv, comparable) < 0);
+    assertTrue(PrivateCellUtil.compareQualifier(bbCell, comparable) < 0);
+    assertTrue(PrivateCellUtil.compareQualifier(kv, comparable) < 0);
     // Value compare
     comparable = new LongComparator(l1);
-    assertEquals(0, CellUtil.compareValue(bbCell, comparable));
-    assertEquals(0, CellUtil.compareValue(kv, comparable));
+    assertEquals(0, PrivateCellUtil.compareValue(bbCell, comparable));
+    assertEquals(0, PrivateCellUtil.compareValue(kv, comparable));
     kv = new KeyValue(r1, f, q1, v2);
     buffer = ByteBuffer.wrap(kv.getBuffer());
     bbCell = new ByteBufferKeyValue(buffer, 0, buffer.remaining());
-    assertTrue(CellUtil.compareValue(bbCell, comparable) < 0);
-    assertTrue(CellUtil.compareValue(kv, comparable) < 0);
+    assertTrue(PrivateCellUtil.compareValue(bbCell, comparable) < 0);
+    assertTrue(PrivateCellUtil.compareValue(kv, comparable) < 0);
     // Family compare
     comparable = new SubstringComparator("cf");
-    assertEquals(0, CellUtil.compareFamily(bbCell, comparable));
-    assertEquals(0, CellUtil.compareFamily(kv, comparable));
+    assertEquals(0, PrivateCellUtil.compareFamily(bbCell, comparable));
+    assertEquals(0, PrivateCellUtil.compareFamily(kv, comparable));
   }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/f6c2490b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestCellBlockBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestCellBlockBuilder.java
b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestCellBlockBuilder.java
index 164bc85..6fdb864 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestCellBlockBuilder.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestCellBlockBuilder.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.codec.Codec;
 import org.apache.hadoop.hbase.codec.KeyValueCodec;
@@ -91,7 +92,7 @@ public class TestCellBlockBuilder {
   static CellScanner getSizedCellScanner(final Cell[] cells) {
     int size = -1;
     for (Cell cell : cells) {
-      size += CellUtil.estimatedSerializedSizeOf(cell);
+      size += PrivateCellUtil.estimatedSerializedSizeOf(cell);
     }
     final int totalSize = ClassSize.align(size);
     final CellScanner cellScanner = CellUtil.createCellScanner(cells);


Mime
View raw message