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:38:01 UTC
svn commit: r1562583 [2/2] - in /hbase/branches/0.98:
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...
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java Wed Jan 29 20:38:00 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
@@ -157,7 +157,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);
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ReplicationProtbufUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ReplicationProtbufUtil.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ReplicationProtbufUtil.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ReplicationProtbufUtil.java Wed Jan 29 20:38:00 2014
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.NavigableMap;
import java.util.UUID;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellScanner;
@@ -45,7 +46,6 @@ import org.apache.hadoop.hbase.regionser
import org.apache.hadoop.hbase.util.Pair;
import com.google.protobuf.ServiceException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
@InterfaceAudience.Private
public class ReplicationProtbufUtil {
@@ -91,8 +91,8 @@ public class ReplicationProtbufUtil {
WALProtos.WALKey.Builder keyBuilder = entryBuilder.getKeyBuilder();
HLogKey key = entry.getKey();
keyBuilder.setEncodedRegionName(
- ZeroCopyLiteralByteString.wrap(key.getEncodedRegionName()));
- keyBuilder.setTableName(ZeroCopyLiteralByteString.wrap(key.getTablename().getName()));
+ HBaseZeroCopyByteString.wrap(key.getEncodedRegionName()));
+ keyBuilder.setTableName(HBaseZeroCopyByteString.wrap(key.getTablename().getName()));
keyBuilder.setLogSequenceNumber(key.getLogSeqNum());
keyBuilder.setWriteTime(key.getWriteTime());
if (key.getNonce() != HConstants.NO_NONCE) {
@@ -110,7 +110,7 @@ public class ReplicationProtbufUtil {
NavigableMap<byte[], Integer> scopes = key.getScopes();
if (scopes != null && !scopes.isEmpty()) {
for (Map.Entry<byte[], Integer> scope: scopes.entrySet()) {
- scopeBuilder.setFamily(ZeroCopyLiteralByteString.wrap(scope.getKey()));
+ scopeBuilder.setFamily(HBaseZeroCopyByteString.wrap(scope.getKey()));
WALProtos.ScopeType scopeType =
WALProtos.ScopeType.valueOf(scope.getValue().intValue());
scopeBuilder.setScopeType(scopeType);
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Jan 29 20:38:00 2014
@@ -50,6 +50,7 @@ import java.util.concurrent.locks.Reentr
import javax.management.ObjectName;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -238,7 +239,6 @@ import com.google.protobuf.Message;
import com.google.protobuf.RpcController;
import com.google.protobuf.ServiceException;
import com.google.protobuf.TextFormat;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* HRegionServer makes a set of HRegions available to clients. It checks in with
@@ -1330,7 +1330,7 @@ public class HRegionServer implements Cl
RegionLoad.Builder regionLoad = RegionLoad.newBuilder();
RegionSpecifier.Builder regionSpecifier = RegionSpecifier.newBuilder();
regionSpecifier.setType(RegionSpecifierType.REGION_NAME);
- regionSpecifier.setValue(ZeroCopyLiteralByteString.wrap(name));
+ regionSpecifier.setValue(HBaseZeroCopyByteString.wrap(name));
regionLoad.setRegionSpecifier(regionSpecifier.build())
.setStores(stores)
.setStorefiles(storefiles)
@@ -3994,7 +3994,7 @@ public class HRegionServer implements Cl
RollWALWriterResponse.Builder builder = RollWALWriterResponse.newBuilder();
if (regionsToFlush != null) {
for (byte[] region: regionsToFlush) {
- builder.addRegionToFlush(ZeroCopyLiteralByteString.wrap(region));
+ builder.addRegionToFlush(HBaseZeroCopyByteString.wrap(region));
}
}
return builder.build();
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java Wed Jan 29 20:38:00 2014
@@ -31,6 +31,7 @@ import java.util.NavigableMap;
import java.util.TreeMap;
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;
@@ -47,7 +48,6 @@ import org.apache.hadoop.io.WritableUtil
import com.google.common.annotations.VisibleForTesting;
import com.google.protobuf.ByteString;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* A Key for an entry in the change log.
@@ -443,8 +443,8 @@ public class HLogKey implements Writable
WALCellCodec.ByteStringCompressor compressor) throws IOException {
WALKey.Builder builder = WALKey.newBuilder();
if (compressionContext == null) {
- builder.setEncodedRegionName(ZeroCopyLiteralByteString.wrap(this.encodedRegionName));
- builder.setTableName(ZeroCopyLiteralByteString.wrap(this.tablename.getName()));
+ builder.setEncodedRegionName(HBaseZeroCopyByteString.wrap(this.encodedRegionName));
+ builder.setTableName(HBaseZeroCopyByteString.wrap(this.tablename.getName()));
} else {
builder.setEncodedRegionName(
compressor.compress(this.encodedRegionName, compressionContext.regionDict));
@@ -467,7 +467,7 @@ public class HLogKey implements Writable
}
if (scopes != null) {
for (Map.Entry<byte[], Integer> e : scopes.entrySet()) {
- ByteString family = (compressionContext == null) ? ZeroCopyLiteralByteString.wrap(e.getKey())
+ ByteString family = (compressionContext == null) ? HBaseZeroCopyByteString.wrap(e.getKey())
: compressor.compress(e.getKey(), compressionContext.familyDict);
builder.addScopes(FamilyScope.newBuilder()
.setFamily(family).setScopeType(ScopeType.valueOf(e.getValue())));
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogWriter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogWriter.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogWriter.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogWriter.java Wed Jan 29 20:38:00 2014
@@ -24,6 +24,7 @@ import java.security.SecureRandom;
import javax.crypto.spec.SecretKeySpec;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HConstants;
@@ -34,8 +35,6 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.security.EncryptionUtil;
import org.apache.hadoop.hbase.security.User;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
public class SecureProtobufLogWriter extends ProtobufLogWriter {
private static final Log LOG = LogFactory.getLog(SecureProtobufLogWriter.class);
@@ -58,11 +57,11 @@ public class SecureProtobufLogWriter ext
byte[] keyBytes = new byte[cipher.getKeyLength()];
rng.nextBytes(keyBytes);
Key key = new SecretKeySpec(keyBytes, cipher.getName());
- builder.setEncryptionKey(ZeroCopyLiteralByteString.wrap(EncryptionUtil.wrapKey(conf,
- conf.get(HConstants.CRYPTO_WAL_KEY_NAME_CONF_KEY,
- conf.get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY,
- User.getCurrent().getShortName())),
- key)));
+ builder.setEncryptionKey(HBaseZeroCopyByteString.wrap(EncryptionUtil.wrapKey(conf,
+ conf.get(HConstants.CRYPTO_WAL_KEY_NAME_CONF_KEY,
+ conf.get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY,
+ User.getCurrent().getShortName())),
+ key)));
// Set up the encryptor
encryptor = cipher.getEncryptor();
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java Wed Jan 29 20:38:00 2014
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlAttr
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlValue;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
@@ -35,8 +36,6 @@ import org.apache.hadoop.hbase.rest.Prot
import org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell;
import org.codehaus.jackson.annotate.JsonProperty;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
/**
* Representation of a cell. A cell is a single value associated a column and
* optional qualifier, and either the timestamp when it was stored or the user-
@@ -185,8 +184,8 @@ public class CellModel implements Protob
@Override
public byte[] createProtobufOutput() {
Cell.Builder builder = Cell.newBuilder();
- builder.setColumn(ZeroCopyLiteralByteString.wrap(getColumn()));
- builder.setData(ZeroCopyLiteralByteString.wrap(getValue()));
+ builder.setColumn(HBaseZeroCopyByteString.wrap(getColumn()));
+ builder.setData(HBaseZeroCopyByteString.wrap(getValue()));
if (hasUserTimestamp()) {
builder.setTimestamp(getTimestamp());
}
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellSetModel.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellSetModel.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellSetModel.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellSetModel.java Wed Jan 29 20:38:00 2014
@@ -29,14 +29,13 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.rest.ProtobufMessageHandler;
import org.apache.hadoop.hbase.rest.protobuf.generated.CellMessage.Cell;
import org.apache.hadoop.hbase.rest.protobuf.generated.CellSetMessage.CellSet;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
/**
* Representation of a grouping of cells. May contain cells from more than
* one row. Encapsulates RowModel and CellModel models.
@@ -115,11 +114,11 @@ public class CellSetModel implements Ser
CellSet.Builder builder = CellSet.newBuilder();
for (RowModel row: getRows()) {
CellSet.Row.Builder rowBuilder = CellSet.Row.newBuilder();
- rowBuilder.setKey(ZeroCopyLiteralByteString.wrap(row.getKey()));
+ rowBuilder.setKey(HBaseZeroCopyByteString.wrap(row.getKey()));
for (CellModel cell: row.getCells()) {
Cell.Builder cellBuilder = Cell.newBuilder();
- cellBuilder.setColumn(ZeroCopyLiteralByteString.wrap(cell.getColumn()));
- cellBuilder.setData(ZeroCopyLiteralByteString.wrap(cell.getValue()));
+ cellBuilder.setColumn(HBaseZeroCopyByteString.wrap(cell.getColumn()));
+ cellBuilder.setData(HBaseZeroCopyByteString.wrap(cell.getValue()));
if (cell.hasUserTimestamp()) {
cellBuilder.setTimestamp(cell.getTimestamp());
}
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java Wed Jan 29 20:38:00 2014
@@ -32,6 +32,7 @@ import javax.xml.bind.annotation.XmlAttr
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.client.Scan;
@@ -74,7 +75,6 @@ import org.apache.hadoop.hbase.util.Base
import org.apache.hadoop.hbase.util.Bytes;
import com.google.protobuf.ByteString;
-import com.google.protobuf.ZeroCopyLiteralByteString;
import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.api.json.JSONJAXBContext;
import com.sun.jersey.api.json.JSONMarshaller;
@@ -759,13 +759,13 @@ public class ScannerModel implements Pro
public byte[] createProtobufOutput() {
Scanner.Builder builder = Scanner.newBuilder();
if (!Bytes.equals(startRow, HConstants.EMPTY_START_ROW)) {
- builder.setStartRow(ZeroCopyLiteralByteString.wrap(startRow));
+ builder.setStartRow(HBaseZeroCopyByteString.wrap(startRow));
}
if (!Bytes.equals(endRow, HConstants.EMPTY_START_ROW)) {
- builder.setEndRow(ZeroCopyLiteralByteString.wrap(endRow));
+ builder.setEndRow(HBaseZeroCopyByteString.wrap(endRow));
}
for (byte[] column: columns) {
- builder.addColumns(ZeroCopyLiteralByteString.wrap(column));
+ builder.addColumns(HBaseZeroCopyByteString.wrap(column));
}
if (startTime != 0) {
builder.setStartTime(startTime);
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java Wed Jan 29 20:38:00 2014
@@ -29,13 +29,12 @@ import javax.xml.bind.annotation.XmlElem
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.rest.ProtobufMessageHandler;
import org.apache.hadoop.hbase.rest.protobuf.generated.StorageClusterStatusMessage.StorageClusterStatus;
import org.apache.hadoop.hbase.util.Bytes;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
/**
* Representation of the status of a storage cluster:
* <p>
@@ -722,7 +721,7 @@ public class StorageClusterStatusModel
for (Node.Region region: node.regions) {
StorageClusterStatus.Region.Builder regionBuilder =
StorageClusterStatus.Region.newBuilder();
- regionBuilder.setName(ZeroCopyLiteralByteString.wrap(region.name));
+ regionBuilder.setName(HBaseZeroCopyByteString.wrap(region.name));
regionBuilder.setStores(region.stores);
regionBuilder.setStorefiles(region.storefiles);
regionBuilder.setStorefileSizeMB(region.storefileSizeMB);
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableInfoModel.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableInfoModel.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableInfoModel.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableInfoModel.java Wed Jan 29 20:38:00 2014
@@ -28,12 +28,11 @@ import javax.xml.bind.annotation.XmlAttr
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.rest.ProtobufMessageHandler;
import org.apache.hadoop.hbase.rest.protobuf.generated.TableInfoMessage.TableInfo;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
/**
* Representation of a list of table regions.
*
@@ -135,8 +134,8 @@ public class TableInfoModel implements S
TableInfo.Region.Builder regionBuilder = TableInfo.Region.newBuilder();
regionBuilder.setName(aRegion.getName());
regionBuilder.setId(aRegion.getId());
- regionBuilder.setStartKey(ZeroCopyLiteralByteString.wrap(aRegion.getStartKey()));
- regionBuilder.setEndKey(ZeroCopyLiteralByteString.wrap(aRegion.getEndKey()));
+ regionBuilder.setStartKey(HBaseZeroCopyByteString.wrap(aRegion.getStartKey()));
+ regionBuilder.setEndKey(HBaseZeroCopyByteString.wrap(aRegion.getEndKey()));
regionBuilder.setLocation(aRegion.getLocation());
builder.addRegions(regionBuilder);
}
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java Wed Jan 29 20:38:00 2014
@@ -35,6 +35,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -116,7 +117,6 @@ import com.google.protobuf.ByteString;
import com.google.protobuf.RpcCallback;
import com.google.protobuf.RpcController;
import com.google.protobuf.Service;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* Coprocessor that has both the MasterObserver and RegionObserver implemented that supports in
@@ -1239,7 +1239,7 @@ public class VisibilityController extend
try {
List<String> labels = getUserAuthsFromLabelsTable(user);
for (String label : labels) {
- response.addAuth(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(label)));
+ response.addAuth(HBaseZeroCopyByteString.wrap(Bytes.toBytes(label)));
}
} catch (IOException e) {
ResponseConverter.setControllerException(controller, e);
Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java Wed Jan 29 20:38:00 2014
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.TagType;
@@ -34,7 +35,6 @@ import org.apache.hadoop.hbase.util.Byte
import org.apache.hadoop.util.ReflectionUtils;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* Utility method to support visibility
@@ -56,7 +56,7 @@ public class VisibilityUtils {
VisibilityLabelsRequest.Builder visReqBuilder = VisibilityLabelsRequest.newBuilder();
for (Entry<String, Integer> entry : existingLabels.entrySet()) {
VisibilityLabel.Builder visLabBuilder = VisibilityLabel.newBuilder();
- visLabBuilder.setLabel(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(entry.getKey())));
+ visLabBuilder.setLabel(HBaseZeroCopyByteString.wrap(Bytes.toBytes(entry.getKey())));
visLabBuilder.setOrdinal(entry.getValue());
visReqBuilder.addVisLabel(visLabBuilder.build());
}
@@ -72,7 +72,7 @@ public class VisibilityUtils {
MultiUserAuthorizations.Builder builder = MultiUserAuthorizations.newBuilder();
for (Entry<String, List<Integer>> entry : userAuths.entrySet()) {
UserAuthorizations.Builder userAuthsBuilder = UserAuthorizations.newBuilder();
- userAuthsBuilder.setUser(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(entry.getKey())));
+ userAuthsBuilder.setUser(HBaseZeroCopyByteString.wrap(Bytes.toBytes(entry.getKey())));
for (Integer label : entry.getValue()) {
userAuthsBuilder.addAuth(label);
}
Modified: hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java (original)
+++ hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java Wed Jan 29 20:38:00 2014
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.NavigableMap;
import java.util.TreeMap;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -59,7 +60,6 @@ import org.junit.experimental.categories
import com.google.protobuf.RpcController;
import com.google.protobuf.ServiceException;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* TestEndpoint: test cases to verify coprocessor Endpoint
@@ -125,9 +125,9 @@ public class TestCoprocessorEndpoint {
new BlockingRpcCallback<ColumnAggregationProtos.SumResponse>();
ColumnAggregationProtos.SumRequest.Builder builder =
ColumnAggregationProtos.SumRequest.newBuilder();
- builder.setFamily(ZeroCopyLiteralByteString.wrap(family));
+ builder.setFamily(HBaseZeroCopyByteString.wrap(family));
if (qualifier != null && qualifier.length > 0) {
- builder.setQualifier(ZeroCopyLiteralByteString.wrap(qualifier));
+ builder.setQualifier(HBaseZeroCopyByteString.wrap(qualifier));
}
instance.sum(null, builder.build(), rpcCallback);
return rpcCallback.get().getSum();
Modified: hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java (original)
+++ hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java Wed Jan 29 20:38:00 2014
@@ -33,6 +33,7 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
@@ -70,7 +71,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import com.google.protobuf.Message;
-import com.google.protobuf.ZeroCopyLiteralByteString;
import com.sun.org.apache.commons.logging.Log;
import com.sun.org.apache.commons.logging.LogFactory;
@@ -362,7 +362,7 @@ public class TestRowProcessorEndpoint {
public IncCounterProcessorRequest getRequestData() throws IOException {
IncCounterProcessorRequest.Builder builder = IncCounterProcessorRequest.newBuilder();
builder.setCounter(counter);
- builder.setRow(ZeroCopyLiteralByteString.wrap(row));
+ builder.setRow(HBaseZeroCopyByteString.wrap(row));
return builder.build();
}
@@ -441,8 +441,8 @@ public class TestRowProcessorEndpoint {
public FriendsOfFriendsProcessorRequest getRequestData() throws IOException {
FriendsOfFriendsProcessorRequest.Builder builder =
FriendsOfFriendsProcessorRequest.newBuilder();
- builder.setPerson(ZeroCopyLiteralByteString.wrap(person));
- builder.setRow(ZeroCopyLiteralByteString.wrap(row));
+ builder.setPerson(HBaseZeroCopyByteString.wrap(person));
+ builder.setRow(HBaseZeroCopyByteString.wrap(row));
builder.addAllResult(result);
FriendsOfFriendsProcessorRequest f = builder.build();
return f;
@@ -546,8 +546,8 @@ public class TestRowProcessorEndpoint {
@Override
public RowSwapProcessorRequest getRequestData() throws IOException {
RowSwapProcessorRequest.Builder builder = RowSwapProcessorRequest.newBuilder();
- builder.setRow1(ZeroCopyLiteralByteString.wrap(row1));
- builder.setRow2(ZeroCopyLiteralByteString.wrap(row2));
+ builder.setRow1(HBaseZeroCopyByteString.wrap(row1));
+ builder.setRow2(HBaseZeroCopyByteString.wrap(row2));
return builder.build();
}
@@ -606,7 +606,7 @@ public class TestRowProcessorEndpoint {
@Override
public TimeoutProcessorRequest getRequestData() throws IOException {
TimeoutProcessorRequest.Builder builder = TimeoutProcessorRequest.newBuilder();
- builder.setRow(ZeroCopyLiteralByteString.wrap(row));
+ builder.setRow(HBaseZeroCopyByteString.wrap(row));
return builder.build();
}
Modified: hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java (original)
+++ hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java Wed Jan 29 20:38:00 2014
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEqu
import java.io.IOException;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.client.Append;
@@ -43,7 +44,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import com.google.protobuf.ByteString;
-import com.google.protobuf.ZeroCopyLiteralByteString;
/**
* Class to test ProtobufUtil.
@@ -55,12 +55,12 @@ public class TestProtobufUtil {
NameBytesPair.Builder builder = NameBytesPair.newBuilder();
final String omg = "OMG!!!";
builder.setName("java.io.IOException");
- builder.setValue(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(omg)));
+ builder.setValue(HBaseZeroCopyByteString.wrap(Bytes.toBytes(omg)));
Throwable t = ProtobufUtil.toException(builder.build());
assertEquals(omg, t.getMessage());
builder.clear();
builder.setName("org.apache.hadoop.ipc.RemoteException");
- builder.setValue(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(omg)));
+ builder.setValue(HBaseZeroCopyByteString.wrap(Bytes.toBytes(omg)));
t = ProtobufUtil.toException(builder.build());
assertEquals(omg, t.getMessage());
}
@@ -204,10 +204,10 @@ public class TestProtobufUtil {
valueBuilder.setFamily(ByteString.copyFromUtf8("f1"));
QualifierValue.Builder qualifierBuilder = QualifierValue.newBuilder();
qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c1"));
- qualifierBuilder.setValue(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(11L)));
+ qualifierBuilder.setValue(HBaseZeroCopyByteString.wrap(Bytes.toBytes(11L)));
valueBuilder.addQualifierValue(qualifierBuilder.build());
qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c2"));
- qualifierBuilder.setValue(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(22L)));
+ qualifierBuilder.setValue(HBaseZeroCopyByteString.wrap(Bytes.toBytes(22L)));
valueBuilder.addQualifierValue(qualifierBuilder.build());
mutateBuilder.addColumnValue(valueBuilder.build());
Modified: hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java (original)
+++ hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java Wed Jan 29 20:38:00 2014
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTru
import java.io.IOException;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HConstants;
@@ -42,7 +43,7 @@ import org.junit.experimental.categories
import org.mockito.Mockito;
import com.google.protobuf.ByteString;
-import com.google.protobuf.ZeroCopyLiteralByteString;
+
/**
* Tests that verify certain RPCs get a higher QoS.
*/
@@ -70,12 +71,12 @@ public class TestPriorityRpc {
GetRequest.Builder getRequestBuilder = GetRequest.newBuilder();
RegionSpecifier.Builder regionSpecifierBuilder = RegionSpecifier.newBuilder();
regionSpecifierBuilder.setType(RegionSpecifierType.REGION_NAME);
- ByteString name = ZeroCopyLiteralByteString.wrap(HRegionInfo.FIRST_META_REGIONINFO.getRegionName());
+ ByteString name = HBaseZeroCopyByteString.wrap(HRegionInfo.FIRST_META_REGIONINFO.getRegionName());
regionSpecifierBuilder.setValue(name);
RegionSpecifier regionSpecifier = regionSpecifierBuilder.build();
getRequestBuilder.setRegion(regionSpecifier);
Get.Builder getBuilder = Get.newBuilder();
- getBuilder.setRow(ZeroCopyLiteralByteString.wrap("somerow".getBytes()));
+ getBuilder.setRow(HBaseZeroCopyByteString.wrap("somerow".getBytes()));
getRequestBuilder.setGet(getBuilder.build());
GetRequest getRequest = getRequestBuilder.build();
RequestHeader header = headerBuilder.build();
Modified: hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java?rev=1562583&r1=1562582&r2=1562583&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java (original)
+++ hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java Wed Jan 29 20:38:00 2014
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
+import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -50,8 +51,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import com.google.protobuf.ZeroCopyLiteralByteString;
-
@Category(MediumTests.class)
public class TestReplicationSink {
private static final Log LOG = LogFactory.getLog(TestReplicationSink.class);
@@ -262,9 +261,9 @@ public class TestReplicationSink {
uuidBuilder.setLeastSigBits(HConstants.DEFAULT_CLUSTER_ID.getLeastSignificantBits());
uuidBuilder.setMostSigBits(HConstants.DEFAULT_CLUSTER_ID.getMostSignificantBits());
keyBuilder.setClusterId(uuidBuilder.build());
- keyBuilder.setTableName(ZeroCopyLiteralByteString.wrap(table));
+ keyBuilder.setTableName(HBaseZeroCopyByteString.wrap(table));
keyBuilder.setWriteTime(now);
- keyBuilder.setEncodedRegionName(ZeroCopyLiteralByteString.wrap(HConstants.EMPTY_BYTE_ARRAY));
+ keyBuilder.setEncodedRegionName(HBaseZeroCopyByteString.wrap(HConstants.EMPTY_BYTE_ARRAY));
keyBuilder.setLogSequenceNumber(-1);
builder.setKey(keyBuilder.build());
cells.add(kv);