You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2014/01/29 21:31:32 UTC
svn commit: r1562576 [1/2] - in /hbase/trunk:
hbase-client/src/main/java/org/apache/hadoop/hbase/
hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/
hbase-client/src/main/java/org/apache/hadoop/hbase/filter/
hbase-client/src/main/ja...
Author: nkeywal
Date: Wed Jan 29 20:31:31 2014
New Revision: 1562576
URL: http://svn.apache.org/r1562576
Log:
HBASE-10431 Rename com.google.protobuf.ZeroCopyLiteralByteString
Added:
hbase/trunk/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java
Modified:
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionTransition.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/SecureBulkLoadClient.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlClient.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
hbase/trunk/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/codec/MessageCodec.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/Reference.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ReplicationProtbufUtil.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogWriter.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellSetModel.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableInfoModel.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java Wed Jan 29 20:31:31 2014
@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hbase.master.RegionState;
@@ -40,8 +41,6 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.VersionedWritable;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
/**
* Status information on the HBase cluster.
@@ -335,7 +334,7 @@ public class ClusterStatus extends Versi
ClusterStatusProtos.RegionState rs = rit.getValue().convert();
RegionSpecifier.Builder spec =
RegionSpecifier.newBuilder().setType(RegionSpecifierType.REGION_NAME);
- spec.setValue(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(rit.getKey())));
+ spec.setValue(HBaseZeroCopyByteString.wrap(Bytes.toBytes(rit.getKey())));
RegionInTransition pbRIT =
RegionInTransition.newBuilder().setSpec(spec.build()).setRegionState(rs).build();
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java Wed Jan 29 20:31:31 2014
@@ -19,8 +19,8 @@
package org.apache.hadoop.hbase;
import com.google.common.base.Preconditions;
+import com.google.protobuf.HBaseZeroCopyByteString;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -1225,11 +1225,11 @@ public class HColumnDescriptor implement
*/
public ColumnFamilySchema convert() {
ColumnFamilySchema.Builder builder = ColumnFamilySchema.newBuilder();
- builder.setName(ZeroCopyLiteralByteString.wrap(getName()));
+ builder.setName(HBaseZeroCopyByteString.wrap(getName()));
for (Map.Entry<ImmutableBytesWritable, ImmutableBytesWritable> e: this.values.entrySet()) {
BytesBytesPair.Builder aBuilder = BytesBytesPair.newBuilder();
- aBuilder.setFirst(ZeroCopyLiteralByteString.wrap(e.getKey().get()));
- aBuilder.setSecond(ZeroCopyLiteralByteString.wrap(e.getValue().get()));
+ aBuilder.setFirst(HBaseZeroCopyByteString.wrap(e.getKey().get()));
+ aBuilder.setSecond(HBaseZeroCopyByteString.wrap(e.getValue().get()));
builder.addAttributes(aBuilder.build());
}
for (Map.Entry<String, String> e : this.configuration.entrySet()) {
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java Wed Jan 29 20:31:31 2014
@@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -47,7 +48,6 @@ import org.apache.hadoop.hbase.util.Pair
import org.apache.hadoop.io.DataInputBuffer;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* HRegion information.
@@ -842,10 +842,10 @@ public class HRegionInfo implements Comp
builder.setTableName(ProtobufUtil.toProtoTableName(info.getTable()));
builder.setRegionId(info.getRegionId());
if (info.getStartKey() != null) {
- builder.setStartKey(ZeroCopyLiteralByteString.wrap(info.getStartKey()));
+ builder.setStartKey(HBaseZeroCopyByteString.wrap(info.getStartKey()));
}
if (info.getEndKey() != null) {
- builder.setEndKey(ZeroCopyLiteralByteString.wrap(info.getEndKey()));
+ builder.setEndKey(HBaseZeroCopyByteString.wrap(info.getEndKey()));
}
builder.setOffline(info.isOffline());
builder.setSplit(info.isSplit());
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java Wed Jan 29 20:31:31 2014
@@ -34,6 +34,7 @@ import java.util.TreeMap;
import java.util.TreeSet;
import java.util.regex.Matcher;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -54,7 +55,6 @@ import org.apache.hadoop.hbase.util.Writ
import org.apache.hadoop.io.WritableComparable;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* HTableDescriptor contains the details about an HBase table such as the descriptors of
@@ -1430,8 +1430,8 @@ public class HTableDescriptor implements
builder.setTableName(ProtobufUtil.toProtoTableName(getTableName()));
for (Map.Entry<ImmutableBytesWritable, ImmutableBytesWritable> e: this.values.entrySet()) {
BytesBytesPair.Builder aBuilder = BytesBytesPair.newBuilder();
- aBuilder.setFirst(ZeroCopyLiteralByteString.wrap(e.getKey().get()));
- aBuilder.setSecond(ZeroCopyLiteralByteString.wrap(e.getValue().get()));
+ aBuilder.setFirst(HBaseZeroCopyByteString.wrap(e.getKey().get()));
+ aBuilder.setSecond(HBaseZeroCopyByteString.wrap(e.getValue().get()));
builder.addAttributes(aBuilder.build());
}
for (HColumnDescriptor hcd: getColumnFamilies()) {
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionTransition.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionTransition.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionTransition.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionTransition.java Wed Jan 29 20:31:31 2014
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hbase;
+import com.google.protobuf.HBaseZeroCopyByteString;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
@@ -104,10 +104,10 @@ public class RegionTransition {
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.newBuilder().
setHostName(sn.getHostname()).setPort(sn.getPort()).setStartCode(sn.getStartcode()).build();
ZooKeeperProtos.RegionTransition.Builder builder = ZooKeeperProtos.RegionTransition.newBuilder().
- setEventTypeCode(type.getCode()).setRegionName(ZeroCopyLiteralByteString.wrap(regionName)).
+ setEventTypeCode(type.getCode()).setRegionName(HBaseZeroCopyByteString.wrap(regionName)).
setServerName(pbsn);
builder.setCreateTime(System.currentTimeMillis());
- if (payload != null) builder.setPayload(ZeroCopyLiteralByteString.wrap(payload));
+ if (payload != null) builder.setPayload(HBaseZeroCopyByteString.wrap(payload));
return new RegionTransition(builder.build());
}
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java Wed Jan 29 20:31:31 2014
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
@@ -30,8 +31,6 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg;
import org.apache.hadoop.hbase.util.Bytes;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
/**
* ColumnInterpreter for doing Aggregation's with BigDecimal columns. This class
* is required at the RegionServer also.
@@ -122,7 +121,7 @@ public class BigDecimalColumnInterpreter
private BigDecimalMsg getProtoForType(BigDecimal t) {
BigDecimalMsg.Builder builder = BigDecimalMsg.newBuilder();
- return builder.setBigdecimalMsg(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(t))).build();
+ return builder.setBigdecimalMsg(HBaseZeroCopyByteString.wrap(Bytes.toBytes(t))).build();
}
@Override
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/SecureBulkLoadClient.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/SecureBulkLoadClient.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/SecureBulkLoadClient.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/SecureBulkLoadClient.java Wed Jan 29 20:31:31 2014
@@ -21,8 +21,7 @@ package org.apache.hadoop.hbase.client.c
import static org.apache.hadoop.hbase.HConstants.EMPTY_START_ROW;
import static org.apache.hadoop.hbase.HConstants.LAST_ROW;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.ZeroCopyLiteralByteString;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.Path;
@@ -137,8 +136,8 @@ public class SecureBulkLoadClient {
if(userToken != null) {
protoDT =
SecureBulkLoadProtos.DelegationToken.newBuilder()
- .setIdentifier(ZeroCopyLiteralByteString.wrap(userToken.getIdentifier()))
- .setPassword(ZeroCopyLiteralByteString.wrap(userToken.getPassword()))
+ .setIdentifier(HBaseZeroCopyByteString.wrap(userToken.getIdentifier()))
+ .setPassword(HBaseZeroCopyByteString.wrap(userToken.getPassword()))
.setKind(userToken.getKind().toString())
.setService(userToken.getService().toString()).build();
}
@@ -147,7 +146,7 @@ public class SecureBulkLoadClient {
new ArrayList<ClientProtos.BulkLoadHFileRequest.FamilyPath>();
for(Pair<byte[], String> el: familyPaths) {
protoFamilyPaths.add(ClientProtos.BulkLoadHFileRequest.FamilyPath.newBuilder()
- .setFamily(ZeroCopyLiteralByteString.wrap(el.getFirst()))
+ .setFamily(HBaseZeroCopyByteString.wrap(el.getFirst()))
.setPath(el.getSecond()).build());
}
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ByteArrayComparable.java Wed Jan 29 20:31:31 2014
@@ -18,14 +18,13 @@
*/
package org.apache.hadoop.hbase.filter;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
import org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos;
import org.apache.hadoop.hbase.util.Bytes;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
/** Base class for byte array comparators */
@InterfaceAudience.Public
@@ -54,7 +53,7 @@ public abstract class ByteArrayComparabl
ComparatorProtos.ByteArrayComparable convert() {
ComparatorProtos.ByteArrayComparable.Builder builder =
ComparatorProtos.ByteArrayComparable.newBuilder();
- if (value != null) builder.setValue(ZeroCopyLiteralByteString.wrap(value));
+ if (value != null) builder.setValue(HBaseZeroCopyByteString.wrap(value));
return builder.build();
}
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java Wed Jan 29 20:31:31 2014
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.filter;
import java.util.ArrayList;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hbase.Cell;
@@ -30,7 +31,6 @@ import org.apache.hadoop.hbase.util.Byte
import com.google.common.base.Preconditions;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* A filter, based on the ColumnCountGetFilter, takes two arguments: limit and offset.
@@ -175,7 +175,7 @@ public class ColumnPaginationFilter exte
builder.setOffset(this.offset);
}
if (this.columnOffset != null) {
- builder.setColumnOffset(ZeroCopyLiteralByteString.wrap(this.columnOffset));
+ builder.setColumnOffset(HBaseZeroCopyByteString.wrap(this.columnOffset));
}
return builder.build().toByteArray();
}
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java Wed Jan 29 20:31:31 2014
@@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.filter;
import java.util.ArrayList;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hbase.Cell;
@@ -31,7 +32,6 @@ import org.apache.hadoop.hbase.util.Byte
import com.google.common.base.Preconditions;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* This filter is used for selecting only those keys with columns that matches
@@ -95,7 +95,7 @@ public class ColumnPrefixFilter extends
public byte [] toByteArray() {
FilterProtos.ColumnPrefixFilter.Builder builder =
FilterProtos.ColumnPrefixFilter.newBuilder();
- if (this.prefix != null) builder.setPrefix(ZeroCopyLiteralByteString.wrap(this.prefix));
+ if (this.prefix != null) builder.setPrefix(HBaseZeroCopyByteString.wrap(this.prefix));
return builder.build().toByteArray();
}
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java Wed Jan 29 20:31:31 2014
@@ -22,8 +22,8 @@ package org.apache.hadoop.hbase.filter;
import static org.apache.hadoop.hbase.util.Bytes.len;
import com.google.common.base.Preconditions;
+import com.google.protobuf.HBaseZeroCopyByteString;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -173,9 +173,9 @@ public class ColumnRangeFilter extends F
public byte [] toByteArray() {
FilterProtos.ColumnRangeFilter.Builder builder =
FilterProtos.ColumnRangeFilter.newBuilder();
- if (this.minColumn != null) builder.setMinColumn(ZeroCopyLiteralByteString.wrap(this.minColumn));
+ if (this.minColumn != null) builder.setMinColumn(HBaseZeroCopyByteString.wrap(this.minColumn));
builder.setMinColumnInclusive(this.minColumnInclusive);
- if (this.maxColumn != null) builder.setMaxColumn(ZeroCopyLiteralByteString.wrap(this.maxColumn));
+ if (this.maxColumn != null) builder.setMaxColumn(HBaseZeroCopyByteString.wrap(this.maxColumn));
builder.setMaxColumnInclusive(this.maxColumnInclusive);
return builder.build().toByteArray();
}
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java Wed Jan 29 20:31:31 2014
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hbase.Cell;
@@ -37,7 +38,6 @@ import org.apache.hadoop.hbase.util.Byte
import com.google.common.base.Preconditions;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* A filter for adding inter-column timestamp matching
@@ -225,10 +225,10 @@ public class DependentColumnFilter exten
FilterProtos.DependentColumnFilter.newBuilder();
builder.setCompareFilter(super.convert());
if (this.columnFamily != null) {
- builder.setColumnFamily(ZeroCopyLiteralByteString.wrap(this.columnFamily));
+ builder.setColumnFamily(HBaseZeroCopyByteString.wrap(this.columnFamily));
}
if (this.columnQualifier != null) {
- builder.setColumnQualifier(ZeroCopyLiteralByteString.wrap(this.columnQualifier));
+ builder.setColumnQualifier(HBaseZeroCopyByteString.wrap(this.columnQualifier));
}
builder.setDropDependentColumn(this.dropDependentColumn);
return builder.build().toByteArray();
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyValueMatchingQualifiersFilter.java Wed Jan 29 20:31:31 2014
@@ -19,8 +19,8 @@
package org.apache.hadoop.hbase.filter;
import com.google.protobuf.ByteString;
+import com.google.protobuf.HBaseZeroCopyByteString;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -89,7 +89,7 @@ public class FirstKeyValueMatchingQualif
FilterProtos.FirstKeyValueMatchingQualifiersFilter.Builder builder =
FilterProtos.FirstKeyValueMatchingQualifiersFilter.newBuilder();
for (byte[] qualifier : qualifiers) {
- if (qualifier != null) builder.addQualifiers(ZeroCopyLiteralByteString.wrap(qualifier));
+ if (qualifier != null) builder.addQualifiers(HBaseZeroCopyByteString.wrap(qualifier));
}
return builder.build().toByteArray();
}
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java Wed Jan 29 20:31:31 2014
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hbase.filter;
+import com.google.protobuf.HBaseZeroCopyByteString;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -147,8 +147,8 @@ public class FuzzyRowFilter extends Filt
FilterProtos.FuzzyRowFilter.newBuilder();
for (Pair<byte[], byte[]> fuzzyData : fuzzyKeysData) {
BytesBytesPair.Builder bbpBuilder = BytesBytesPair.newBuilder();
- bbpBuilder.setFirst(ZeroCopyLiteralByteString.wrap(fuzzyData.getFirst()));
- bbpBuilder.setSecond(ZeroCopyLiteralByteString.wrap(fuzzyData.getSecond()));
+ bbpBuilder.setFirst(HBaseZeroCopyByteString.wrap(fuzzyData.getFirst()));
+ bbpBuilder.setSecond(HBaseZeroCopyByteString.wrap(fuzzyData.getSecond()));
builder.addFuzzyKeysData(bbpBuilder);
}
return builder.build().toByteArray();
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java Wed Jan 29 20:31:31 2014
@@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.filter;
import java.util.ArrayList;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
@@ -29,7 +30,6 @@ import org.apache.hadoop.hbase.util.Byte
import com.google.common.base.Preconditions;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* A Filter that stops after the given row. There is no "RowStopFilter" because
@@ -86,7 +86,7 @@ public class InclusiveStopFilter extends
public byte [] toByteArray() {
FilterProtos.InclusiveStopFilter.Builder builder =
FilterProtos.InclusiveStopFilter.newBuilder();
- if (this.stopRowKey != null) builder.setStopRowKey(ZeroCopyLiteralByteString.wrap(this.stopRowKey));
+ if (this.stopRowKey != null) builder.setStopRowKey(HBaseZeroCopyByteString.wrap(this.stopRowKey));
return builder.build().toByteArray();
}
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java Wed Jan 29 20:31:31 2014
@@ -18,8 +18,8 @@
package org.apache.hadoop.hbase.filter;
+import com.google.protobuf.HBaseZeroCopyByteString;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -114,7 +114,7 @@ public class MultipleColumnPrefixFilter
FilterProtos.MultipleColumnPrefixFilter.Builder builder =
FilterProtos.MultipleColumnPrefixFilter.newBuilder();
for (byte [] element : sortedPrefixes) {
- if (element != null) builder.addSortedPrefixes(ZeroCopyLiteralByteString.wrap(element));
+ if (element != null) builder.addSortedPrefixes(HBaseZeroCopyByteString.wrap(element));
}
return builder.build().toByteArray();
}
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java Wed Jan 29 20:31:31 2014
@@ -20,8 +20,8 @@
package org.apache.hadoop.hbase.filter;
import com.google.common.base.Preconditions;
+import com.google.protobuf.HBaseZeroCopyByteString;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -91,7 +91,7 @@ public class PrefixFilter extends Filter
public byte [] toByteArray() {
FilterProtos.PrefixFilter.Builder builder =
FilterProtos.PrefixFilter.newBuilder();
- if (this.prefix != null) builder.setPrefix(ZeroCopyLiteralByteString.wrap(this.prefix));
+ if (this.prefix != null) builder.setPrefix(HBaseZeroCopyByteString.wrap(this.prefix));
return builder.build().toByteArray();
}
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java Wed Jan 29 20:31:31 2014
@@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.filter;
import java.io.IOException;
import java.util.ArrayList;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -40,7 +41,6 @@ import org.apache.hadoop.hbase.util.Byte
import com.google.common.base.Preconditions;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* This filter is used to filter cells based on value. It takes a {@link CompareFilter.CompareOp}
@@ -307,10 +307,10 @@ public class SingleColumnValueFilter ext
FilterProtos.SingleColumnValueFilter.Builder builder =
FilterProtos.SingleColumnValueFilter.newBuilder();
if (this.columnFamily != null) {
- builder.setColumnFamily(ZeroCopyLiteralByteString.wrap(this.columnFamily));
+ builder.setColumnFamily(HBaseZeroCopyByteString.wrap(this.columnFamily));
}
if (this.columnQualifier != null) {
- builder.setColumnQualifier(ZeroCopyLiteralByteString.wrap(this.columnQualifier));
+ builder.setColumnQualifier(HBaseZeroCopyByteString.wrap(this.columnQualifier));
}
HBaseProtos.CompareType compareOp = CompareType.valueOf(this.compareOp.name());
builder.setCompareOp(compareOp);
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java Wed Jan 29 20:31:31 2014
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.ipc;
import java.io.IOException;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -31,7 +32,6 @@ import org.apache.hadoop.hbase.protobuf.
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* Provides clients with an RPC connection to call coprocessor endpoint {@link com.google.protobuf.Service}s
@@ -61,7 +61,7 @@ public class MasterCoprocessorRpcChannel
final ClientProtos.CoprocessorServiceCall call =
ClientProtos.CoprocessorServiceCall.newBuilder()
- .setRow(ZeroCopyLiteralByteString.wrap(HConstants.EMPTY_BYTE_ARRAY))
+ .setRow(HBaseZeroCopyByteString.wrap(HConstants.EMPTY_BYTE_ARRAY))
.setServiceName(method.getService().getFullName())
.setMethodName(method.getName())
.setRequest(request.toByteString()).build();
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java Wed Jan 29 20:31:31 2014
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.ipc;
import java.io.IOException;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -34,7 +35,6 @@ import org.apache.hadoop.hbase.util.Byte
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* Provides clients with an RPC connection to call coprocessor endpoint {@link com.google.protobuf.Service}s
@@ -76,7 +76,7 @@ public class RegionCoprocessorRpcChannel
final ClientProtos.CoprocessorServiceCall call =
ClientProtos.CoprocessorServiceCall.newBuilder()
- .setRow(ZeroCopyLiteralByteString.wrap(row))
+ .setRow(HBaseZeroCopyByteString.wrap(row))
.setServiceName(method.getService().getFullName())
.setMethodName(method.getName())
.setRequest(request.toByteString()).build();
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java Wed Jan 29 20:31:31 2014
@@ -36,6 +36,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.NavigableSet;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
@@ -141,7 +142,6 @@ import com.google.protobuf.RpcChannel;
import com.google.protobuf.Service;
import com.google.protobuf.ServiceException;
import com.google.protobuf.TextFormat;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* Protobufs utility.
@@ -820,17 +820,17 @@ public final class ProtobufUtil {
NameBytesPair.Builder attributeBuilder = NameBytesPair.newBuilder();
for (Map.Entry<String, byte[]> attribute: attributes.entrySet()) {
attributeBuilder.setName(attribute.getKey());
- attributeBuilder.setValue(ZeroCopyLiteralByteString.wrap(attribute.getValue()));
+ attributeBuilder.setValue(HBaseZeroCopyByteString.wrap(attribute.getValue()));
scanBuilder.addAttribute(attributeBuilder.build());
}
}
byte[] startRow = scan.getStartRow();
if (startRow != null && startRow.length > 0) {
- scanBuilder.setStartRow(ZeroCopyLiteralByteString.wrap(startRow));
+ scanBuilder.setStartRow(HBaseZeroCopyByteString.wrap(startRow));
}
byte[] stopRow = scan.getStopRow();
if (stopRow != null && stopRow.length > 0) {
- scanBuilder.setStopRow(ZeroCopyLiteralByteString.wrap(stopRow));
+ scanBuilder.setStopRow(HBaseZeroCopyByteString.wrap(stopRow));
}
if (scan.hasFilter()) {
scanBuilder.setFilter(ProtobufUtil.toFilter(scan.getFilter()));
@@ -839,12 +839,12 @@ public final class ProtobufUtil {
Column.Builder columnBuilder = Column.newBuilder();
for (Map.Entry<byte[],NavigableSet<byte []>>
family: scan.getFamilyMap().entrySet()) {
- columnBuilder.setFamily(ZeroCopyLiteralByteString.wrap(family.getKey()));
+ columnBuilder.setFamily(HBaseZeroCopyByteString.wrap(family.getKey()));
NavigableSet<byte []> qualifiers = family.getValue();
columnBuilder.clearQualifier();
if (qualifiers != null && qualifiers.size() > 0) {
for (byte [] qualifier: qualifiers) {
- columnBuilder.addQualifier(ZeroCopyLiteralByteString.wrap(qualifier));
+ columnBuilder.addQualifier(HBaseZeroCopyByteString.wrap(qualifier));
}
}
scanBuilder.addColumn(columnBuilder.build());
@@ -952,7 +952,7 @@ public final class ProtobufUtil {
final Get get) throws IOException {
ClientProtos.Get.Builder builder =
ClientProtos.Get.newBuilder();
- builder.setRow(ZeroCopyLiteralByteString.wrap(get.getRow()));
+ builder.setRow(HBaseZeroCopyByteString.wrap(get.getRow()));
builder.setCacheBlocks(get.getCacheBlocks());
builder.setMaxVersions(get.getMaxVersions());
if (get.getFilter() != null) {
@@ -971,7 +971,7 @@ public final class ProtobufUtil {
NameBytesPair.Builder attributeBuilder = NameBytesPair.newBuilder();
for (Map.Entry<String, byte[]> attribute: attributes.entrySet()) {
attributeBuilder.setName(attribute.getKey());
- attributeBuilder.setValue(ZeroCopyLiteralByteString.wrap(attribute.getValue()));
+ attributeBuilder.setValue(HBaseZeroCopyByteString.wrap(attribute.getValue()));
builder.addAttribute(attributeBuilder.build());
}
}
@@ -980,11 +980,11 @@ public final class ProtobufUtil {
Map<byte[], NavigableSet<byte[]>> families = get.getFamilyMap();
for (Map.Entry<byte[], NavigableSet<byte[]>> family: families.entrySet()) {
NavigableSet<byte[]> qualifiers = family.getValue();
- columnBuilder.setFamily(ZeroCopyLiteralByteString.wrap(family.getKey()));
+ columnBuilder.setFamily(HBaseZeroCopyByteString.wrap(family.getKey()));
columnBuilder.clearQualifier();
if (qualifiers != null && qualifiers.size() > 0) {
for (byte[] qualifier: qualifiers) {
- columnBuilder.addQualifier(ZeroCopyLiteralByteString.wrap(qualifier));
+ columnBuilder.addQualifier(HBaseZeroCopyByteString.wrap(qualifier));
}
}
builder.addColumn(columnBuilder.build());
@@ -1013,7 +1013,7 @@ public final class ProtobufUtil {
*/
public static MutationProto toMutation(
final Increment increment, final MutationProto.Builder builder, long nonce) {
- builder.setRow(ZeroCopyLiteralByteString.wrap(increment.getRow()));
+ builder.setRow(HBaseZeroCopyByteString.wrap(increment.getRow()));
builder.setMutateType(MutationType.INCREMENT);
builder.setDurability(toDurability(increment.getDurability()));
if (nonce != HConstants.NO_NONCE) {
@@ -1030,18 +1030,18 @@ public final class ProtobufUtil {
ColumnValue.Builder columnBuilder = ColumnValue.newBuilder();
QualifierValue.Builder valueBuilder = QualifierValue.newBuilder();
for (Map.Entry<byte[], List<Cell>> family: increment.getFamilyCellMap().entrySet()) {
- columnBuilder.setFamily(ZeroCopyLiteralByteString.wrap(family.getKey()));
+ columnBuilder.setFamily(HBaseZeroCopyByteString.wrap(family.getKey()));
columnBuilder.clearQualifierValue();
List<Cell> values = family.getValue();
if (values != null && values.size() > 0) {
for (Cell cell: values) {
KeyValue kv = KeyValueUtil.ensureKeyValue(cell);
- valueBuilder.setQualifier(ZeroCopyLiteralByteString.wrap(
+ valueBuilder.setQualifier(HBaseZeroCopyByteString.wrap(
kv.getQualifierArray(), kv.getQualifierOffset(), kv.getQualifierLength()));
- valueBuilder.setValue(ZeroCopyLiteralByteString.wrap(
+ valueBuilder.setValue(HBaseZeroCopyByteString.wrap(
kv.getValueArray(), kv.getValueOffset(), kv.getValueLength()));
if (kv.getTagsLength() > 0) {
- valueBuilder.setTags(ZeroCopyLiteralByteString.wrap(kv.getTagsArray(),
+ valueBuilder.setTags(HBaseZeroCopyByteString.wrap(kv.getTagsArray(),
kv.getTagsOffset(), kv.getTagsLength()));
}
columnBuilder.addQualifierValue(valueBuilder.build());
@@ -1054,7 +1054,7 @@ public final class ProtobufUtil {
NameBytesPair.Builder attributeBuilder = NameBytesPair.newBuilder();
for (Map.Entry<String, byte[]> attribute : attributes.entrySet()) {
attributeBuilder.setName(attribute.getKey());
- attributeBuilder.setValue(ZeroCopyLiteralByteString.wrap(attribute.getValue()));
+ attributeBuilder.setValue(HBaseZeroCopyByteString.wrap(attribute.getValue()));
builder.addAttribute(attributeBuilder.build());
}
}
@@ -1095,12 +1095,12 @@ public final class ProtobufUtil {
QualifierValue.Builder valueBuilder = QualifierValue.newBuilder();
for (Map.Entry<byte[],List<Cell>> family: mutation.getFamilyCellMap().entrySet()) {
columnBuilder.clear();
- columnBuilder.setFamily(ZeroCopyLiteralByteString.wrap(family.getKey()));
+ columnBuilder.setFamily(HBaseZeroCopyByteString.wrap(family.getKey()));
for (Cell cell: family.getValue()) {
KeyValue kv = KeyValueUtil.ensureKeyValue(cell);
- valueBuilder.setQualifier(ZeroCopyLiteralByteString.wrap(
+ valueBuilder.setQualifier(HBaseZeroCopyByteString.wrap(
kv.getQualifierArray(), kv.getQualifierOffset(), kv.getQualifierLength()));
- valueBuilder.setValue(ZeroCopyLiteralByteString.wrap(
+ valueBuilder.setValue(HBaseZeroCopyByteString.wrap(
kv.getValueArray(), kv.getValueOffset(), kv.getValueLength()));
valueBuilder.setTimestamp(kv.getTimestamp());
if(cell.getTagsLength() > 0) {
@@ -1164,7 +1164,7 @@ public final class ProtobufUtil {
*/
private static MutationProto.Builder getMutationBuilderAndSetCommonFields(final MutationType type,
final Mutation mutation, MutationProto.Builder builder) {
- builder.setRow(ZeroCopyLiteralByteString.wrap(mutation.getRow()));
+ builder.setRow(HBaseZeroCopyByteString.wrap(mutation.getRow()));
builder.setMutateType(type);
builder.setDurability(toDurability(mutation.getDurability()));
builder.setTimestamp(mutation.getTimeStamp());
@@ -1173,7 +1173,7 @@ public final class ProtobufUtil {
NameBytesPair.Builder attributeBuilder = NameBytesPair.newBuilder();
for (Map.Entry<String, byte[]> attribute: attributes.entrySet()) {
attributeBuilder.setName(attribute.getKey());
- attributeBuilder.setValue(ZeroCopyLiteralByteString.wrap(attribute.getValue()));
+ attributeBuilder.setValue(HBaseZeroCopyByteString.wrap(attribute.getValue()));
builder.addAttribute(attributeBuilder.build());
}
}
@@ -1304,7 +1304,7 @@ public final class ProtobufUtil {
public static ComparatorProtos.Comparator toComparator(ByteArrayComparable comparator) {
ComparatorProtos.Comparator.Builder builder = ComparatorProtos.Comparator.newBuilder();
builder.setName(comparator.getClass().getName());
- builder.setSerializedComparator(ZeroCopyLiteralByteString.wrap(comparator.toByteArray()));
+ builder.setSerializedComparator(HBaseZeroCopyByteString.wrap(comparator.toByteArray()));
return builder.build();
}
@@ -1366,7 +1366,7 @@ public final class ProtobufUtil {
public static FilterProtos.Filter toFilter(Filter filter) throws IOException {
FilterProtos.Filter.Builder builder = FilterProtos.Filter.newBuilder();
builder.setName(filter.getClass().getName());
- builder.setSerializedFilter(ZeroCopyLiteralByteString.wrap(filter.toByteArray()));
+ builder.setSerializedFilter(HBaseZeroCopyByteString.wrap(filter.toByteArray()));
return builder.build();
}
@@ -1855,10 +1855,10 @@ public final class ProtobufUtil {
AccessControlProtos.TablePermission.newBuilder();
builder.setTableName(ProtobufUtil.toProtoTableName(tablePerm.getTableName()));
if (tablePerm.hasFamily()) {
- builder.setFamily(ZeroCopyLiteralByteString.wrap(tablePerm.getFamily()));
+ builder.setFamily(HBaseZeroCopyByteString.wrap(tablePerm.getFamily()));
}
if (tablePerm.hasQualifier()) {
- builder.setQualifier(ZeroCopyLiteralByteString.wrap(tablePerm.getQualifier()));
+ builder.setQualifier(HBaseZeroCopyByteString.wrap(tablePerm.getQualifier()));
}
Permission.Action actions[] = perm.getActions();
if (actions != null) {
@@ -1954,7 +1954,7 @@ public final class ProtobufUtil {
*/
public static AccessControlProtos.UserPermission toUserPermission(UserPermission perm) {
return AccessControlProtos.UserPermission.newBuilder()
- .setUser(ZeroCopyLiteralByteString.wrap(perm.getUser()))
+ .setUser(HBaseZeroCopyByteString.wrap(perm.getUser()))
.setPermission(toPermission(perm))
.build();
}
@@ -2226,8 +2226,8 @@ public final class ProtobufUtil {
*/
public static AuthenticationProtos.Token toToken(Token<AuthenticationTokenIdentifier> token) {
AuthenticationProtos.Token.Builder builder = AuthenticationProtos.Token.newBuilder();
- builder.setIdentifier(ZeroCopyLiteralByteString.wrap(token.getIdentifier()));
- builder.setPassword(ZeroCopyLiteralByteString.wrap(token.getPassword()));
+ builder.setIdentifier(HBaseZeroCopyByteString.wrap(token.getIdentifier()));
+ builder.setPassword(HBaseZeroCopyByteString.wrap(token.getPassword()));
if (token.getService() != null) {
builder.setService(ByteString.copyFromUtf8(token.getService().toString()));
}
@@ -2324,16 +2324,16 @@ public final class ProtobufUtil {
// Doing this is going to kill us if we do it for all data passed.
// St.Ack 20121205
CellProtos.Cell.Builder kvbuilder = CellProtos.Cell.newBuilder();
- kvbuilder.setRow(ZeroCopyLiteralByteString.wrap(kv.getRowArray(), kv.getRowOffset(),
- kv.getRowLength()));
- kvbuilder.setFamily(ZeroCopyLiteralByteString.wrap(kv.getFamilyArray(),
- kv.getFamilyOffset(), kv.getFamilyLength()));
- kvbuilder.setQualifier(ZeroCopyLiteralByteString.wrap(kv.getQualifierArray(),
- kv.getQualifierOffset(), kv.getQualifierLength()));
+ kvbuilder.setRow(HBaseZeroCopyByteString.wrap(kv.getRowArray(), kv.getRowOffset(),
+ kv.getRowLength()));
+ kvbuilder.setFamily(HBaseZeroCopyByteString.wrap(kv.getFamilyArray(),
+ kv.getFamilyOffset(), kv.getFamilyLength()));
+ kvbuilder.setQualifier(HBaseZeroCopyByteString.wrap(kv.getQualifierArray(),
+ kv.getQualifierOffset(), kv.getQualifierLength()));
kvbuilder.setCellType(CellProtos.CellType.valueOf(kv.getTypeByte()));
kvbuilder.setTimestamp(kv.getTimestamp());
- kvbuilder.setValue(ZeroCopyLiteralByteString.wrap(kv.getValueArray(), kv.getValueOffset(),
- kv.getValueLength()));
+ kvbuilder.setValue(HBaseZeroCopyByteString.wrap(kv.getValueArray(), kv.getValueOffset(),
+ kv.getValueLength()));
return kvbuilder.build();
}
@@ -2411,9 +2411,9 @@ public final class ProtobufUtil {
// input / output paths are relative to the store dir
// store dir is relative to region dir
CompactionDescriptor.Builder builder = CompactionDescriptor.newBuilder()
- .setTableName(ZeroCopyLiteralByteString.wrap(info.getTableName()))
- .setEncodedRegionName(ZeroCopyLiteralByteString.wrap(info.getEncodedNameAsBytes()))
- .setFamilyName(ZeroCopyLiteralByteString.wrap(family))
+ .setTableName(HBaseZeroCopyByteString.wrap(info.getTableName()))
+ .setEncodedRegionName(HBaseZeroCopyByteString.wrap(info.getEncodedNameAsBytes()))
+ .setFamilyName(HBaseZeroCopyByteString.wrap(family))
.setStoreHomeDir(storeDir.getName()); //make relative
for (Path inputPath : inputPaths) {
builder.addCompactionInput(inputPath.getName()); //relative path
@@ -2490,8 +2490,8 @@ public final class ProtobufUtil {
public static HBaseProtos.TableName toProtoTableName(TableName tableName) {
return HBaseProtos.TableName.newBuilder()
- .setNamespace(ZeroCopyLiteralByteString.wrap(tableName.getNamespace()))
- .setQualifier(ZeroCopyLiteralByteString.wrap(tableName.getQualifier())).build();
+ .setNamespace(HBaseZeroCopyByteString.wrap(tableName.getNamespace()))
+ .setQualifier(HBaseZeroCopyByteString.wrap(tableName.getQualifier())).build();
}
public static TableName[] getTableNameArray(List<HBaseProtos.TableName> tableNamesList) {
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java Wed Jan 29 20:31:31 2014
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.protobuf
import java.io.IOException;
import java.util.List;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.CellScannable;
import org.apache.hadoop.hbase.HConstants;
@@ -102,7 +103,6 @@ import org.apache.hadoop.hbase.util.Pair
import org.apache.hadoop.hbase.util.Triple;
import com.google.protobuf.ByteString;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* Helper utility to build protocol buffer requests,
@@ -134,10 +134,10 @@ public final class RequestConverter {
builder.setRegion(region);
Column.Builder columnBuilder = Column.newBuilder();
- columnBuilder.setFamily(ZeroCopyLiteralByteString.wrap(family));
+ columnBuilder.setFamily(HBaseZeroCopyByteString.wrap(family));
ClientProtos.Get.Builder getBuilder =
ClientProtos.Get.newBuilder();
- getBuilder.setRow(ZeroCopyLiteralByteString.wrap(row));
+ getBuilder.setRow(HBaseZeroCopyByteString.wrap(row));
getBuilder.addColumn(columnBuilder.build());
getBuilder.setClosestRowBefore(true);
builder.setGet(getBuilder.build());
@@ -182,14 +182,14 @@ public final class RequestConverter {
builder.setRegion(region);
MutationProto.Builder mutateBuilder = MutationProto.newBuilder();
- mutateBuilder.setRow(ZeroCopyLiteralByteString.wrap(row));
+ mutateBuilder.setRow(HBaseZeroCopyByteString.wrap(row));
mutateBuilder.setMutateType(MutationType.INCREMENT);
mutateBuilder.setDurability(ProtobufUtil.toDurability(durability));
ColumnValue.Builder columnBuilder = ColumnValue.newBuilder();
- columnBuilder.setFamily(ZeroCopyLiteralByteString.wrap(family));
+ columnBuilder.setFamily(HBaseZeroCopyByteString.wrap(family));
QualifierValue.Builder valueBuilder = QualifierValue.newBuilder();
- valueBuilder.setValue(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(amount)));
- valueBuilder.setQualifier(ZeroCopyLiteralByteString.wrap(qualifier));
+ valueBuilder.setValue(HBaseZeroCopyByteString.wrap(Bytes.toBytes(amount)));
+ valueBuilder.setQualifier(HBaseZeroCopyByteString.wrap(qualifier));
columnBuilder.addQualifierValue(valueBuilder.build());
mutateBuilder.addColumnValue(columnBuilder.build());
if (nonce != HConstants.NO_NONCE) {
@@ -492,7 +492,7 @@ public final class RequestConverter {
builder.setRegion(region);
FamilyPath.Builder familyPathBuilder = FamilyPath.newBuilder();
for (Pair<byte[], String> familyPath: familyPaths) {
- familyPathBuilder.setFamily(ZeroCopyLiteralByteString.wrap(familyPath.getFirst()));
+ familyPathBuilder.setFamily(HBaseZeroCopyByteString.wrap(familyPath.getFirst()));
familyPathBuilder.setPath(familyPath.getSecond());
builder.addFamilyPath(familyPathBuilder.build());
}
@@ -660,7 +660,7 @@ public final class RequestConverter {
RegionSpecifier region = buildRegionSpecifier(
RegionSpecifierType.REGION_NAME, regionName);
builder.setRegion(region);
- builder.addFamily(ZeroCopyLiteralByteString.wrap(family));
+ builder.addFamily(HBaseZeroCopyByteString.wrap(family));
return builder.build();
}
@@ -806,7 +806,7 @@ public final class RequestConverter {
RegionSpecifierType.REGION_NAME, regionName);
builder.setRegion(region);
if (splitPoint != null) {
- builder.setSplitPoint(ZeroCopyLiteralByteString.wrap(splitPoint));
+ builder.setSplitPoint(HBaseZeroCopyByteString.wrap(splitPoint));
}
return builder.build();
}
@@ -846,7 +846,7 @@ public final class RequestConverter {
builder.setRegion(region);
builder.setMajor(major);
if (family != null) {
- builder.setFamily(ZeroCopyLiteralByteString.wrap(family));
+ builder.setFamily(HBaseZeroCopyByteString.wrap(family));
}
return builder.build();
}
@@ -905,7 +905,7 @@ public final class RequestConverter {
public static RegionSpecifier buildRegionSpecifier(
final RegionSpecifierType type, final byte[] value) {
RegionSpecifier.Builder regionBuilder = RegionSpecifier.newBuilder();
- regionBuilder.setValue(ZeroCopyLiteralByteString.wrap(value));
+ regionBuilder.setValue(HBaseZeroCopyByteString.wrap(value));
regionBuilder.setType(type);
return regionBuilder.build();
}
@@ -926,9 +926,9 @@ public final class RequestConverter {
final ByteArrayComparable comparator,
final CompareType compareType) throws IOException {
Condition.Builder builder = Condition.newBuilder();
- builder.setRow(ZeroCopyLiteralByteString.wrap(row));
- builder.setFamily(ZeroCopyLiteralByteString.wrap(family));
- builder.setQualifier(ZeroCopyLiteralByteString.wrap(qualifier));
+ builder.setRow(HBaseZeroCopyByteString.wrap(row));
+ builder.setFamily(HBaseZeroCopyByteString.wrap(family));
+ builder.setQualifier(HBaseZeroCopyByteString.wrap(qualifier));
builder.setComparator(ProtobufUtil.toComparator(comparator));
builder.setCompareType(compareType);
return builder.build();
@@ -960,7 +960,7 @@ public final class RequestConverter {
final TableName tableName, final byte [] columnName) {
DeleteColumnRequest.Builder builder = DeleteColumnRequest.newBuilder();
builder.setTableName(ProtobufUtil.toProtoTableName((tableName)));
- builder.setColumnName(ZeroCopyLiteralByteString.wrap(columnName));
+ builder.setColumnName(HBaseZeroCopyByteString.wrap(columnName));
return builder.build();
}
@@ -1100,7 +1100,7 @@ public final class RequestConverter {
builder.setTableSchema(hTableDesc.convert());
if (splitKeys != null) {
for (byte [] splitKey : splitKeys) {
- builder.addSplitKeys(ZeroCopyLiteralByteString.wrap(splitKey));
+ builder.addSplitKeys(HBaseZeroCopyByteString.wrap(splitKey));
}
}
return builder.build();
@@ -1253,7 +1253,7 @@ public final class RequestConverter {
public static GetLastFlushedSequenceIdRequest buildGetLastFlushedSequenceIdRequest(
byte[] regionName) {
return GetLastFlushedSequenceIdRequest.newBuilder().setRegionName(
- ZeroCopyLiteralByteString.wrap(regionName)).build();
+ HBaseZeroCopyByteString.wrap(regionName)).build();
}
/**
@@ -1308,10 +1308,10 @@ public final class RequestConverter {
permissionBuilder.setTableName(ProtobufUtil.toProtoTableName(tableName));
if (family != null) {
- permissionBuilder.setFamily(ZeroCopyLiteralByteString.wrap(family));
+ permissionBuilder.setFamily(HBaseZeroCopyByteString.wrap(family));
}
if (qualifier != null) {
- permissionBuilder.setQualifier(ZeroCopyLiteralByteString.wrap(qualifier));
+ permissionBuilder.setQualifier(HBaseZeroCopyByteString.wrap(qualifier));
}
ret.setType(AccessControlProtos.Permission.Type.Table)
.setTablePermission(permissionBuilder);
@@ -1404,10 +1404,10 @@ public final class RequestConverter {
permissionBuilder.setTableName(ProtobufUtil.toProtoTableName(tableName));
}
if (family != null) {
- permissionBuilder.setFamily(ZeroCopyLiteralByteString.wrap(family));
+ permissionBuilder.setFamily(HBaseZeroCopyByteString.wrap(family));
}
if (qualifier != null) {
- permissionBuilder.setQualifier(ZeroCopyLiteralByteString.wrap(qualifier));
+ permissionBuilder.setQualifier(HBaseZeroCopyByteString.wrap(qualifier));
}
ret.setType(AccessControlProtos.Permission.Type.Table)
.setTablePermission(permissionBuilder);
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java Wed Jan 29 20:31:31 2014
@@ -26,6 +26,7 @@ import java.security.SecureRandom;
import javax.crypto.spec.SecretKeySpec;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
@@ -35,8 +36,6 @@ import org.apache.hadoop.hbase.io.crypto
import org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos;
import org.apache.hadoop.hbase.util.Bytes;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
/**
* Some static utility methods for encryption uses in hbase-client.
*/
@@ -84,15 +83,15 @@ public class EncryptionUtil {
if (cipher.getIvLength() > 0) {
iv = new byte[cipher.getIvLength()];
RNG.nextBytes(iv);
- builder.setIv(ZeroCopyLiteralByteString.wrap(iv));
+ builder.setIv(HBaseZeroCopyByteString.wrap(iv));
}
byte[] keyBytes = key.getEncoded();
builder.setLength(keyBytes.length);
- builder.setHash(ZeroCopyLiteralByteString.wrap(Encryption.hash128(keyBytes)));
+ builder.setHash(HBaseZeroCopyByteString.wrap(Encryption.hash128(keyBytes)));
ByteArrayOutputStream out = new ByteArrayOutputStream();
Encryption.encryptWithSubjectKey(out, new ByteArrayInputStream(keyBytes), subject,
conf, cipher, iv);
- builder.setData(ZeroCopyLiteralByteString.wrap(out.toByteArray()));
+ builder.setData(HBaseZeroCopyByteString.wrap(out.toByteArray()));
// Build and return the protobuf message
out.reset();
builder.build().writeDelimitedTo(out);
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlClient.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlClient.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlClient.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlClient.java Wed Jan 29 20:31:31 2014
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.security
import java.io.IOException;
import java.util.Map;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
@@ -39,7 +40,6 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeResponse;
import com.google.protobuf.ByteString;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* Utility client for doing access control admin operations.
@@ -86,10 +86,10 @@ public class AccessControlClient {
permissionBuilder.setTableName(ProtobufUtil.toProtoTableName(tableName));
if (family != null) {
- permissionBuilder.setFamily(ZeroCopyLiteralByteString.wrap(family));
+ permissionBuilder.setFamily(HBaseZeroCopyByteString.wrap(family));
}
if (qual != null) {
- permissionBuilder.setQualifier(ZeroCopyLiteralByteString.wrap(qual));
+ permissionBuilder.setQualifier(HBaseZeroCopyByteString.wrap(qual));
}
ret.setType(AccessControlProtos.Permission.Type.Table).setTablePermission(
permissionBuilder);
@@ -150,10 +150,10 @@ public class AccessControlClient {
permissionBuilder.setTableName(ProtobufUtil.toProtoTableName(tableName));
}
if (family != null) {
- permissionBuilder.setFamily(ZeroCopyLiteralByteString.wrap(family));
+ permissionBuilder.setFamily(HBaseZeroCopyByteString.wrap(family));
}
if (qualifier != null) {
- permissionBuilder.setQualifier(ZeroCopyLiteralByteString.wrap(qualifier));
+ permissionBuilder.setQualifier(HBaseZeroCopyByteString.wrap(qualifier));
}
ret.setType(AccessControlProtos.Permission.Type.Table).setTablePermission(
permissionBuilder);
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityClient.java Wed Jan 29 20:31:31 2014
@@ -22,6 +22,7 @@ import static org.apache.hadoop.hbase.se
import java.io.IOException;
import java.util.Map;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
@@ -40,7 +41,6 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.util.Bytes;
import com.google.protobuf.ServiceException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* Utility client for doing visibility labels admin operations.
@@ -86,7 +86,7 @@ public class VisibilityClient {
for (String label : labels) {
if (label.length() > 0) {
VisibilityLabel.Builder newBuilder = VisibilityLabel.newBuilder();
- newBuilder.setLabel(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(label)));
+ newBuilder.setLabel(HBaseZeroCopyByteString.wrap(Bytes.toBytes(label)));
builder.addVisLabel(newBuilder.build());
}
}
@@ -137,7 +137,7 @@ public class VisibilityClient {
public GetAuthsResponse call(VisibilityLabelsService service) throws IOException {
GetAuthsRequest.Builder getAuthReqBuilder = GetAuthsRequest.newBuilder();
- getAuthReqBuilder.setUser(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(user)));
+ getAuthReqBuilder.setUser(HBaseZeroCopyByteString.wrap(Bytes.toBytes(user)));
service.getAuths(controller, getAuthReqBuilder.build(), rpcCallback);
return rpcCallback.get();
}
@@ -179,10 +179,10 @@ public class VisibilityClient {
public VisibilityLabelsResponse call(VisibilityLabelsService service) throws IOException {
SetAuthsRequest.Builder setAuthReqBuilder = SetAuthsRequest.newBuilder();
- setAuthReqBuilder.setUser(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(user)));
+ setAuthReqBuilder.setUser(HBaseZeroCopyByteString.wrap(Bytes.toBytes(user)));
for (String auth : auths) {
if (auth.length() > 0) {
- setAuthReqBuilder.addAuth(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(auth)));
+ setAuthReqBuilder.addAuth(HBaseZeroCopyByteString.wrap(Bytes.toBytes(auth)));
}
}
if (setOrClear) {
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java Wed Jan 29 20:31:31 2014
@@ -35,6 +35,7 @@ import java.util.Properties;
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -70,7 +71,6 @@ import org.apache.zookeeper.proto.SetDat
import org.apache.zookeeper.server.ZooKeeperSaslServer;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* Internal HBase utility class for ZooKeeper.
@@ -1947,7 +1947,7 @@ public class ZKUtil {
for (Map.Entry<byte[], Long> e : storeSequenceIds.entrySet()){
byte[] columnFamilyName = e.getKey();
Long curSeqId = e.getValue();
- storeSequenceIdBuilder.setFamilyName(ZeroCopyLiteralByteString.wrap(columnFamilyName));
+ storeSequenceIdBuilder.setFamilyName(HBaseZeroCopyByteString.wrap(columnFamilyName));
storeSequenceIdBuilder.setSequenceId(curSeqId);
regionSequenceIdsBuilder.addStoreSequenceId(storeSequenceIdBuilder.build());
storeSequenceIdBuilder.clear();
Modified: hbase/trunk/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java (original)
+++ hbase/trunk/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java Wed Jan 29 20:31:31 2014
@@ -33,6 +33,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -84,7 +85,6 @@ import com.google.common.base.Stopwatch;
import com.google.protobuf.ByteString;
import com.google.protobuf.RpcController;
import com.google.protobuf.ServiceException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* Test client behavior w/o setting up a cluster.
@@ -510,7 +510,7 @@ public class TestClientNoCluster extends
if (max <= 0) break;
if (++count > max) break;
HRegionInfo hri = e.getValue().getFirst();
- ByteString row = ZeroCopyLiteralByteString.wrap(hri.getRegionName());
+ ByteString row = HBaseZeroCopyByteString.wrap(hri.getRegionName());
resultBuilder.clear();
resultBuilder.addCell(getRegionInfo(row, hri));
resultBuilder.addCell(getServer(row, e.getValue().getSecond()));
@@ -565,11 +565,11 @@ public class TestClientNoCluster extends
}
private final static ByteString CATALOG_FAMILY_BYTESTRING =
- ZeroCopyLiteralByteString.wrap(HConstants.CATALOG_FAMILY);
+ HBaseZeroCopyByteString.wrap(HConstants.CATALOG_FAMILY);
private final static ByteString REGIONINFO_QUALIFIER_BYTESTRING =
- ZeroCopyLiteralByteString.wrap(HConstants.REGIONINFO_QUALIFIER);
+ HBaseZeroCopyByteString.wrap(HConstants.REGIONINFO_QUALIFIER);
private final static ByteString SERVER_QUALIFIER_BYTESTRING =
- ZeroCopyLiteralByteString.wrap(HConstants.SERVER_QUALIFIER);
+ HBaseZeroCopyByteString.wrap(HConstants.SERVER_QUALIFIER);
static CellProtos.Cell.Builder getBaseCellBuilder(final ByteString row) {
CellProtos.Cell.Builder cellBuilder = CellProtos.Cell.newBuilder();
@@ -582,7 +582,7 @@ public class TestClientNoCluster extends
static CellProtos.Cell getRegionInfo(final ByteString row, final HRegionInfo hri) {
CellProtos.Cell.Builder cellBuilder = getBaseCellBuilder(row);
cellBuilder.setQualifier(REGIONINFO_QUALIFIER_BYTESTRING);
- cellBuilder.setValue(ZeroCopyLiteralByteString.wrap(hri.toByteArray()));
+ cellBuilder.setValue(HBaseZeroCopyByteString.wrap(hri.toByteArray()));
return cellBuilder.build();
}
@@ -595,9 +595,9 @@ public class TestClientNoCluster extends
static CellProtos.Cell getStartCode(final ByteString row) {
CellProtos.Cell.Builder cellBuilder = getBaseCellBuilder(row);
- cellBuilder.setQualifier(ZeroCopyLiteralByteString.wrap(HConstants.STARTCODE_QUALIFIER));
+ cellBuilder.setQualifier(HBaseZeroCopyByteString.wrap(HConstants.STARTCODE_QUALIFIER));
// TODO:
- cellBuilder.setValue(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(META_SERVERNAME.getStartcode())));
+ cellBuilder.setValue(HBaseZeroCopyByteString.wrap(Bytes.toBytes(META_SERVERNAME.getStartcode())));
return cellBuilder.build();
}
Added: hbase/trunk/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java?rev=1562576&view=auto
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java (added)
+++ hbase/trunk/hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java Wed Jan 29 20:31:31 2014
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.protobuf; // This is a lie.
+
+/**
+ * Helper class to extract byte arrays from {@link ByteString} without copy.
+ * <p>
+ * Without this protobufs would force us to copy every single byte array out
+ * of the objects de-serialized from the wire (which already do one copy, on
+ * top of the copies the JVM does to go from kernel buffer to C buffer and
+ * from C buffer to JVM buffer).
+ *
+ * @since 0.96.1
+ */
+public final class HBaseZeroCopyByteString extends LiteralByteString {
+ // Gotten from AsyncHBase code base with permission.
+ /** Private constructor so this class cannot be instantiated. */
+ private HBaseZeroCopyByteString() {
+ super(null);
+ throw new UnsupportedOperationException("Should never be here.");
+ }
+
+ /**
+ * Wraps a byte array in a {@link ByteString} without copying it.
+ */
+ public static ByteString wrap(final byte[] array) {
+ return new LiteralByteString(array);
+ }
+
+ /**
+ * Wraps a subset of a byte array in a {@link ByteString} without copying it.
+ */
+ public static ByteString wrap(final byte[] array, int offset, int length) {
+ return new BoundedByteString(array, offset, length);
+ }
+
+ // TODO:
+ // ZeroCopyLiteralByteString.wrap(this.buf, 0, this.count);
+
+ /**
+ * Extracts the byte array from the given {@link ByteString} without copy.
+ * @param buf A buffer from which to extract the array. This buffer must be
+ * actually an instance of a {@code LiteralByteString}.
+ */
+ public static byte[] zeroCopyGetBytes(final ByteString buf) {
+ if (buf instanceof LiteralByteString) {
+ return ((LiteralByteString) buf).bytes;
+ }
+ throw new UnsupportedOperationException("Need a LiteralByteString, got a "
+ + buf.getClass().getName());
+ }
+
+}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/codec/MessageCodec.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/codec/MessageCodec.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/codec/MessageCodec.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/codec/MessageCodec.java Wed Jan 29 20:31:31 2014
@@ -21,14 +21,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.protobuf.generated.CellProtos;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
/**
* Codec that just writes out Cell as a protobuf Cell Message. Does not write the mvcc stamp.
* Use a different codec if you want that in the stream.
@@ -46,15 +44,15 @@ public class MessageCodec implements Cod
CellProtos.Cell.Builder builder = CellProtos.Cell.newBuilder();
// This copies bytes from Cell to ByteString. I don't see anyway around the copy.
// ByteString is final.
- builder.setRow(ZeroCopyLiteralByteString.wrap(cell.getRowArray(), cell.getRowOffset(),
+ builder.setRow(HBaseZeroCopyByteString.wrap(cell.getRowArray(), cell.getRowOffset(),
cell.getRowLength()));
- builder.setFamily(ZeroCopyLiteralByteString.wrap(cell.getFamilyArray(), cell.getFamilyOffset(),
+ builder.setFamily(HBaseZeroCopyByteString.wrap(cell.getFamilyArray(), cell.getFamilyOffset(),
cell.getFamilyLength()));
- builder.setQualifier(ZeroCopyLiteralByteString.wrap(cell.getQualifierArray(),
- cell.getQualifierOffset(), cell.getQualifierLength()));
+ builder.setQualifier(HBaseZeroCopyByteString.wrap(cell.getQualifierArray(),
+ cell.getQualifierOffset(), cell.getQualifierLength()));
builder.setTimestamp(cell.getTimestamp());
builder.setCellType(CellProtos.CellType.valueOf(cell.getTypeByte()));
- builder.setValue(ZeroCopyLiteralByteString.wrap(cell.getValueArray(), cell.getValueOffset(),
+ builder.setValue(HBaseZeroCopyByteString.wrap(cell.getValueArray(), cell.getValueOffset(),
cell.getValueLength()));
CellProtos.Cell pbcell = builder.build();
pbcell.writeDelimitedTo(this.out);
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/Reference.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/Reference.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/Reference.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/Reference.java Wed Jan 29 20:31:31 2014
@@ -24,6 +24,7 @@ import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
@@ -33,9 +34,6 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.protobuf.generated.FSProtos;
import org.apache.hadoop.hbase.util.Bytes;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
/**
* A reference to the top or bottom half of a store file where 'bottom' is the first half
* of the file containing the keys that sort lowest and 'top' is the second half
@@ -195,7 +193,7 @@ public class Reference {
FSProtos.Reference.Builder builder = FSProtos.Reference.newBuilder();
builder.setRange(isTopFileRegion(getFileRegion())?
FSProtos.Reference.Range.TOP: FSProtos.Reference.Range.BOTTOM);
- builder.setSplitkey(ZeroCopyLiteralByteString.wrap(getSplitKey()));
+ builder.setSplitkey(HBaseZeroCopyByteString.wrap(getSplitKey()));
return builder.build();
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java Wed Jan 29 20:31:31 2014
@@ -26,6 +26,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.hbase.KeyValue;
@@ -34,8 +35,6 @@ import org.apache.hadoop.hbase.io.compre
import org.apache.hadoop.hbase.protobuf.generated.HFileProtos;
import org.apache.hadoop.hbase.util.Bytes;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
/**
* The {@link HFile} has a fixed trailer which contains offsets to other
* variable parts of the file. Also includes basic metadata on this file. The
@@ -206,7 +205,7 @@ public class FixedFileTrailer {
.setComparatorClassName(comparatorClassName)
.setCompressionCodec(compressionCodec.ordinal());
if (encryptionKey != null) {
- builder.setEncryptionKey(ZeroCopyLiteralByteString.wrap(encryptionKey));
+ builder.setEncryptionKey(HBaseZeroCopyByteString.wrap(encryptionKey));
}
// We need this extra copy unfortunately to determine the final size of the
// delimited output, see use of baos.size() below.
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java Wed Jan 29 20:31:31 2014
@@ -40,6 +40,7 @@ import java.util.concurrent.BlockingQueu
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -69,7 +70,6 @@ import org.apache.hadoop.io.Writable;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* File format for hbase.
@@ -739,8 +739,8 @@ public class HFile {
HFileProtos.FileInfoProto.Builder builder = HFileProtos.FileInfoProto.newBuilder();
for (Map.Entry<byte [], byte[]> e: this.map.entrySet()) {
HBaseProtos.BytesBytesPair.Builder bbpBuilder = HBaseProtos.BytesBytesPair.newBuilder();
- bbpBuilder.setFirst(ZeroCopyLiteralByteString.wrap(e.getKey()));
- bbpBuilder.setSecond(ZeroCopyLiteralByteString.wrap(e.getValue()));
+ bbpBuilder.setFirst(HBaseZeroCopyByteString.wrap(e.getKey()));
+ bbpBuilder.setSecond(HBaseZeroCopyByteString.wrap(e.getValue()));
builder.addMapEntry(bbpBuilder.build());
}
out.write(ProtobufUtil.PB_MAGIC);
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java?rev=1562576&r1=1562575&r2=1562576&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java Wed Jan 29 20:31:31 2014
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -69,7 +70,6 @@ import org.apache.hadoop.mapreduce.Recor
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import com.google.common.annotations.VisibleForTesting;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* TableSnapshotInputFormat allows a MapReduce job to run over a table snapshot. The job
@@ -160,7 +160,7 @@ public class TableSnapshotInputFormat ex
MapReduceProtos.TableSnapshotRegionSplit.newBuilder()
.setRegion(RegionSpecifier.newBuilder()
.setType(RegionSpecifierType.ENCODED_REGION_NAME)
- .setValue(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(regionName))).build());
+ .setValue(HBaseZeroCopyByteString.wrap(Bytes.toBytes(regionName))).build());
for (String location : locations) {
builder.addLocations(location);