PHOENIX-1996 Use BytesStringer instead of ZeroCopyByteString
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/286ff26d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/286ff26d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/286ff26d Branch: refs/heads/calcite Commit: 286ff26d82b2638dc5d3db850fa6f4537ab6153f Parents: c2fed1d Author: Nick Dimiduk <ndimi...@apache.org> Authored: Wed May 20 14:17:47 2015 -0700 Committer: Nick Dimiduk <ndimi...@apache.org> Committed: Thu May 21 09:25:34 2015 -0700 ---------------------------------------------------------------------- .../apache/phoenix/cache/ServerCacheClient.java | 10 +++---- .../phoenix/coprocessor/MetaDataProtocol.java | 9 +++---- .../org/apache/phoenix/parse/PFunction.java | 5 ++-- .../apache/phoenix/protobuf/ProtobufUtil.java | 4 +-- .../query/ConnectionQueryServicesImpl.java | 18 ++++++------- .../org/apache/phoenix/schema/PColumnImpl.java | 8 +++--- .../org/apache/phoenix/schema/PTableImpl.java | 28 ++++++++++---------- 7 files changed, 40 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/286ff26d/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java index 1233e1c..9718709 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java @@ -44,6 +44,7 @@ import org.apache.hadoop.hbase.client.coprocessor.Batch; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.ipc.BlockingRpcCallback; import org.apache.hadoop.hbase.ipc.ServerRpcController; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.compile.ScanRanges; import org.apache.phoenix.coprocessor.ServerCachingProtocol.ServerCacheFactory; @@ -68,7 +69,6 @@ import org.apache.phoenix.util.SQLCloseables; import org.apache.phoenix.util.ScanUtil; import com.google.common.collect.ImmutableSet; -import com.google.protobuf.HBaseZeroCopyByteString; /** * @@ -194,9 +194,9 @@ public class ServerCacheClient { new BlockingRpcCallback<AddServerCacheResponse>(); AddServerCacheRequest.Builder builder = AddServerCacheRequest.newBuilder(); if(connection.getTenantId() != null){ - builder.setTenantId(HBaseZeroCopyByteString.wrap(connection.getTenantId().getBytes())); + builder.setTenantId(ByteStringer.wrap(connection.getTenantId().getBytes())); } - builder.setCacheId(HBaseZeroCopyByteString.wrap(cacheId)); + builder.setCacheId(ByteStringer.wrap(cacheId)); builder.setCachePtr(org.apache.phoenix.protobuf.ProtobufUtil.toProto(cachePtr)); ServerCacheFactoryProtos.ServerCacheFactory.Builder svrCacheFactoryBuider = ServerCacheFactoryProtos.ServerCacheFactory.newBuilder(); svrCacheFactoryBuider.setClassName(cacheFactory.getClass().getName()); @@ -307,9 +307,9 @@ public class ServerCacheClient { new BlockingRpcCallback<RemoveServerCacheResponse>(); RemoveServerCacheRequest.Builder builder = RemoveServerCacheRequest.newBuilder(); if(connection.getTenantId() != null){ - builder.setTenantId(HBaseZeroCopyByteString.wrap(connection.getTenantId().getBytes())); + builder.setTenantId(ByteStringer.wrap(connection.getTenantId().getBytes())); } - builder.setCacheId(HBaseZeroCopyByteString.wrap(cacheId)); + builder.setCacheId(ByteStringer.wrap(cacheId)); instance.removeServerCache(controller, builder.build(), rpcCallback); if(controller.getFailedOn() != null) { throw controller.getFailedOn(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/286ff26d/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java index 2cca4bc..3867e00 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.phoenix.coprocessor.generated.MetaDataProtos; import org.apache.phoenix.coprocessor.generated.PFunctionProtos; import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataResponse; @@ -34,8 +35,6 @@ import org.apache.phoenix.util.ByteUtil; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; -import com.google.protobuf.HBaseZeroCopyByteString; - /** * @@ -224,14 +223,14 @@ public abstract class MetaDataProtocol extends MetaDataService { } if (result.getTableNamesToDelete() != null) { for (byte[] tableName : result.tableNamesToDelete) { - builder.addTablesToDelete(HBaseZeroCopyByteString.wrap(tableName)); + builder.addTablesToDelete(ByteStringer.wrap(tableName)); } } if(result.getColumnName() != null){ - builder.setColumnName(HBaseZeroCopyByteString.wrap(result.getColumnName())); + builder.setColumnName(ByteStringer.wrap(result.getColumnName())); } if(result.getFamilyName() != null){ - builder.setFamilyName(HBaseZeroCopyByteString.wrap(result.getFamilyName())); + builder.setFamilyName(ByteStringer.wrap(result.getFamilyName())); } } return builder.build(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/286ff26d/phoenix-core/src/main/java/org/apache/phoenix/parse/PFunction.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/parse/PFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/parse/PFunction.java index 351bec7..f4bac35 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/parse/PFunction.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/parse/PFunction.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.List; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.phoenix.coprocessor.generated.PFunctionProtos; import org.apache.phoenix.coprocessor.generated.PFunctionProtos.PFunctionArg; import org.apache.phoenix.expression.LiteralExpression; @@ -31,8 +32,6 @@ import org.apache.phoenix.schema.PNameFactory; import org.apache.phoenix.schema.PTableKey; import org.apache.phoenix.util.SizedUtil; -import com.google.protobuf.HBaseZeroCopyByteString; - public class PFunction implements PMetaDataEntity { private PName tenantId = null; @@ -193,7 +192,7 @@ public class PFunction implements PMetaDataEntity { public static PFunctionProtos.PFunction toProto(PFunction function) { PFunctionProtos.PFunction.Builder builder = PFunctionProtos.PFunction.newBuilder(); if(function.getTenantId() != null){ - builder.setTenantId(HBaseZeroCopyByteString.wrap(function.getTenantId().getBytes())); + builder.setTenantId(ByteStringer.wrap(function.getTenantId().getBytes())); } builder.setFunctionName(function.getFunctionName()); builder.setClassname(function.getClassName()); http://git-wip-us.apache.org/repos/asf/phoenix/blob/286ff26d/phoenix-core/src/main/java/org/apache/phoenix/protobuf/ProtobufUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/protobuf/ProtobufUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/protobuf/ProtobufUtil.java index f4a60bc..5df0492 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/protobuf/ProtobufUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/protobuf/ProtobufUtil.java @@ -30,10 +30,10 @@ import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.ipc.ServerRpcController; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.util.StringUtils; import com.google.protobuf.ByteString; -import com.google.protobuf.HBaseZeroCopyByteString; import com.google.protobuf.RpcController; import org.apache.phoenix.coprocessor.generated.MetaDataProtos; import org.apache.phoenix.coprocessor.generated.ServerCachingProtos; @@ -131,7 +131,7 @@ public class ProtobufUtil { public static ServerCachingProtos.ImmutableBytesWritable toProto(ImmutableBytesWritable w) { ServerCachingProtos.ImmutableBytesWritable.Builder builder = ServerCachingProtos.ImmutableBytesWritable.newBuilder(); - builder.setByteArray(HBaseZeroCopyByteString.wrap(w.get())); + builder.setByteArray(ByteStringer.wrap(w.get())); builder.setOffset(w.getOffset()); builder.setLength(w.getLength()); return builder.build(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/286ff26d/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java index 30b43d5..c86ea48 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java @@ -65,6 +65,7 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto; import org.apache.hadoop.hbase.regionserver.IndexHalfStoreFileReaderGenerator; import org.apache.hadoop.hbase.regionserver.LocalIndexSplitter; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.VersionInfo; @@ -165,7 +166,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.protobuf.HBaseZeroCopyByteString; public class ConnectionQueryServicesImpl extends DelegateQueryServices implements ConnectionQueryServices { @@ -1281,9 +1281,9 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement BlockingRpcCallback<MetaDataResponse> rpcCallback = new BlockingRpcCallback<MetaDataResponse>(); GetTableRequest.Builder builder = GetTableRequest.newBuilder(); - builder.setTenantId(HBaseZeroCopyByteString.wrap(tenantIdBytes)); - builder.setSchemaName(HBaseZeroCopyByteString.wrap(schemaBytes)); - builder.setTableName(HBaseZeroCopyByteString.wrap(tableBytes)); + builder.setTenantId(ByteStringer.wrap(tenantIdBytes)); + builder.setSchemaName(ByteStringer.wrap(schemaBytes)); + builder.setTableName(ByteStringer.wrap(tableBytes)); builder.setTableTimestamp(tableTimestamp); builder.setClientTimestamp(clientTimestamp); @@ -2353,9 +2353,9 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement ServerRpcController controller = new ServerRpcController(); BlockingRpcCallback<ClearTableFromCacheResponse> rpcCallback = new BlockingRpcCallback<ClearTableFromCacheResponse>(); ClearTableFromCacheRequest.Builder builder = ClearTableFromCacheRequest.newBuilder(); - builder.setTenantId(HBaseZeroCopyByteString.wrap(tenantId)); - builder.setTableName(HBaseZeroCopyByteString.wrap(tableName)); - builder.setSchemaName(HBaseZeroCopyByteString.wrap(schemaName)); + builder.setTenantId(ByteStringer.wrap(tenantId)); + builder.setTableName(ByteStringer.wrap(tableName)); + builder.setSchemaName(ByteStringer.wrap(schemaName)); builder.setClientTimestamp(clientTS); instance.clearTableFromCache(controller, builder.build(), rpcCallback); if (controller.getFailedOn() != null) { throw controller.getFailedOn(); } @@ -2639,9 +2639,9 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement BlockingRpcCallback<MetaDataResponse> rpcCallback = new BlockingRpcCallback<MetaDataResponse>(); GetFunctionsRequest.Builder builder = GetFunctionsRequest.newBuilder(); - builder.setTenantId(HBaseZeroCopyByteString.wrap(tenantIdBytes)); + builder.setTenantId(ByteStringer.wrap(tenantIdBytes)); for(Pair<byte[], Long> function: functions) { - builder.addFunctionNames(HBaseZeroCopyByteString.wrap(function.getFirst())); + builder.addFunctionNames(ByteStringer.wrap(function.getFirst())); builder.addFunctionTimestamps(function.getSecond().longValue()); } builder.setClientTimestamp(clientTimestamp); http://git-wip-us.apache.org/repos/asf/phoenix/blob/286ff26d/phoenix-core/src/main/java/org/apache/phoenix/schema/PColumnImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PColumnImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PColumnImpl.java index ac044df..4efb145 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PColumnImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PColumnImpl.java @@ -17,13 +17,13 @@ */ package org.apache.phoenix.schema; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.phoenix.coprocessor.generated.PTableProtos; import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.schema.types.PDataType; import org.apache.phoenix.util.SizedUtil; import com.google.common.base.Preconditions; -import com.google.protobuf.HBaseZeroCopyByteString; public class PColumnImpl implements PColumn { private PName name; @@ -238,9 +238,9 @@ public class PColumnImpl implements PColumn { public static PTableProtos.PColumn toProto(PColumn column) { PTableProtos.PColumn.Builder builder = PTableProtos.PColumn.newBuilder(); - builder.setColumnNameBytes(HBaseZeroCopyByteString.wrap(column.getName().getBytes())); + builder.setColumnNameBytes(ByteStringer.wrap(column.getName().getBytes())); if (column.getFamilyName() != null) { - builder.setFamilyNameBytes(HBaseZeroCopyByteString.wrap(column.getFamilyName().getBytes())); + builder.setFamilyNameBytes(ByteStringer.wrap(column.getFamilyName().getBytes())); } builder.setDataType(column.getDataType().getSqlTypeName()); if (column.getMaxLength() != null) { @@ -256,7 +256,7 @@ public class PColumnImpl implements PColumn { builder.setArraySize(column.getArraySize()); } if (column.getViewConstant() != null) { - builder.setViewConstant(HBaseZeroCopyByteString.wrap(column.getViewConstant())); + builder.setViewConstant(ByteStringer.wrap(column.getViewConstant())); } builder.setViewReferenced(column.isViewReferenced()); http://git-wip-us.apache.org/repos/asf/phoenix/blob/286ff26d/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java index bf4420c..9a2ae7f 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java @@ -39,6 +39,7 @@ import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; +import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.coprocessor.generated.PGuidePostsProtos; import org.apache.phoenix.coprocessor.generated.PGuidePostsProtos.PGuidePosts; @@ -71,7 +72,6 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.protobuf.HBaseZeroCopyByteString; import com.sun.istack.NotNull; /** @@ -984,10 +984,10 @@ public class PTableImpl implements PTable { public static PTableProtos.PTable toProto(PTable table) { PTableProtos.PTable.Builder builder = PTableProtos.PTable.newBuilder(); if(table.getTenantId() != null){ - builder.setTenantId(HBaseZeroCopyByteString.wrap(table.getTenantId().getBytes())); + builder.setTenantId(ByteStringer.wrap(table.getTenantId().getBytes())); } - builder.setSchemaNameBytes(HBaseZeroCopyByteString.wrap(table.getSchemaName().getBytes())); - builder.setTableNameBytes(HBaseZeroCopyByteString.wrap(table.getTableName().getBytes())); + builder.setSchemaNameBytes(ByteStringer.wrap(table.getSchemaName().getBytes())); + builder.setTableNameBytes(ByteStringer.wrap(table.getTableName().getBytes())); builder.setTableType(ProtobufUtil.toPTableTypeProto(table.getType())); if (table.getType() == PTableType.INDEX) { if(table.getIndexState() != null) { @@ -997,14 +997,14 @@ public class PTableImpl implements PTable { builder.setViewIndexId(table.getViewIndexId()); } if(table.getIndexType() != null) { - builder.setIndexType(HBaseZeroCopyByteString.wrap(new byte[]{table.getIndexType().getSerializedValue()})); + builder.setIndexType(ByteStringer.wrap(new byte[]{table.getIndexType().getSerializedValue()})); } } builder.setSequenceNumber(table.getSequenceNumber()); builder.setTimeStamp(table.getTimeStamp()); PName tmp = table.getPKName(); if (tmp != null) { - builder.setPkNameBytes(HBaseZeroCopyByteString.wrap(tmp.getBytes())); + builder.setPkNameBytes(ByteStringer.wrap(tmp.getBytes())); } Integer bucketNum = table.getBucketNum(); int offset = 0; @@ -1029,14 +1029,14 @@ public class PTableImpl implements PTable { for (Map.Entry<byte[], GuidePostsInfo> entry : table.getTableStats().getGuidePosts().entrySet()) { PTableProtos.PTableStats.Builder statsBuilder = PTableProtos.PTableStats.newBuilder(); - statsBuilder.setKey(HBaseZeroCopyByteString.wrap(entry.getKey())); + statsBuilder.setKey(ByteStringer.wrap(entry.getKey())); for (byte[] stat : entry.getValue().getGuidePosts()) { - statsBuilder.addValues(HBaseZeroCopyByteString.wrap(stat)); + statsBuilder.addValues(ByteStringer.wrap(stat)); } statsBuilder.setGuidePostsByteCount(entry.getValue().getByteCount()); PGuidePostsProtos.PGuidePosts.Builder guidePstsBuilder = PGuidePostsProtos.PGuidePosts.newBuilder(); for (byte[] stat : entry.getValue().getGuidePosts()) { - guidePstsBuilder.addGuidePosts(HBaseZeroCopyByteString.wrap(stat)); + guidePstsBuilder.addGuidePosts(ByteStringer.wrap(stat)); } guidePstsBuilder.setByteCount(entry.getValue().getByteCount()); guidePstsBuilder.setRowCount(entry.getValue().getRowCount()); @@ -1046,21 +1046,21 @@ public class PTableImpl implements PTable { builder.setStatsTimeStamp(table.getTableStats().getTimestamp()); if (table.getParentName() != null) { - builder.setDataTableNameBytes(HBaseZeroCopyByteString.wrap(table.getParentTableName().getBytes())); + builder.setDataTableNameBytes(ByteStringer.wrap(table.getParentTableName().getBytes())); } if (table.getDefaultFamilyName()!= null) { - builder.setDefaultFamilyName(HBaseZeroCopyByteString.wrap(table.getDefaultFamilyName().getBytes())); + builder.setDefaultFamilyName(ByteStringer.wrap(table.getDefaultFamilyName().getBytes())); } builder.setDisableWAL(table.isWALDisabled()); builder.setMultiTenant(table.isMultiTenant()); builder.setStoreNulls(table.getStoreNulls()); if(table.getType() == PTableType.VIEW){ - builder.setViewType(HBaseZeroCopyByteString.wrap(new byte[]{table.getViewType().getSerializedValue()})); - builder.setViewStatement(HBaseZeroCopyByteString.wrap(PVarchar.INSTANCE.toBytes(table.getViewStatement()))); + builder.setViewType(ByteStringer.wrap(new byte[]{table.getViewType().getSerializedValue()})); + builder.setViewStatement(ByteStringer.wrap(PVarchar.INSTANCE.toBytes(table.getViewStatement()))); } if(table.getType() == PTableType.VIEW || table.getViewIndexId() != null){ for (int i = 0; i < table.getPhysicalNames().size(); i++) { - builder.addPhysicalNames(HBaseZeroCopyByteString.wrap(table.getPhysicalNames().get(i).getBytes())); + builder.addPhysicalNames(ByteStringer.wrap(table.getPhysicalNames().get(i).getBytes())); } }
