Revert "HBASE-15130 Backport 0.98 Scan different TimeRange for each column family"
This reverts commit 5db9aba3a339b9f7e5eced21c6da32951e116763. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3c46a46d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3c46a46d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3c46a46d Branch: refs/heads/0.98 Commit: 3c46a46dd6ed9979b931084a9d83673523c2659f Parents: e412095 Author: Andrew Purtell <[email protected]> Authored: Tue Mar 8 16:14:14 2016 -0800 Committer: Andrew Purtell <[email protected]> Committed: Tue Mar 8 16:14:14 2016 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/client/Get.java | 17 - .../org/apache/hadoop/hbase/client/Query.java | 42 - .../org/apache/hadoop/hbase/client/Scan.java | 12 - .../hadoop/hbase/protobuf/ProtobufUtil.java | 104 +- .../org/apache/hadoop/hbase/io/TimeRange.java | 16 +- .../hbase/protobuf/generated/ClientProtos.java | 965 ++----------------- .../hbase/protobuf/generated/HBaseProtos.java | 717 +------------- hbase-protocol/src/main/protobuf/Client.proto | 2 - hbase-protocol/src/main/protobuf/HBase.proto | 6 - .../hbase/regionserver/KeyValueScanner.java | 5 +- .../hadoop/hbase/regionserver/MemStore.java | 17 +- .../regionserver/NonLazyKeyValueScanner.java | 3 +- .../hbase/regionserver/ScanQueryMatcher.java | 7 +- .../hadoop/hbase/regionserver/StoreFile.java | 7 +- .../hbase/regionserver/StoreFileScanner.java | 16 +- .../hadoop/hbase/regionserver/StoreScanner.java | 2 +- .../hbase/io/hfile/TestHFileWriterV2.java | 2 +- .../regionserver/TestCompoundBloomFilter.java | 12 +- .../hadoop/hbase/regionserver/TestMemStore.java | 36 +- .../hbase/regionserver/TestStoreFile.java | 58 +- 20 files changed, 214 insertions(+), 1832 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3c46a46d/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java index 590aa5a..0abc09d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java @@ -120,10 +120,6 @@ public class Get extends Query for (Map.Entry<String, byte[]> attr : get.getAttributesMap().entrySet()) { setAttribute(attr.getKey(), attr.getValue()); } - for (Map.Entry<byte[], TimeRange> entry : get.getColumnFamilyTimeRange().entrySet()) { - TimeRange tr = entry.getValue(); - setColumnFamilyTimeRange(entry.getKey(), tr.getMin(), tr.getMax()); - } } public boolean isCheckExistenceOnly() { @@ -231,19 +227,6 @@ public class Get extends Query } /** - * Get versions of columns only within the specified timestamp range and column family, - * [cf, minStamp, maxStamp). - * @param cf the column family to restrict - * @param minStamp minimum timestamp value, inclusive - * @param maxStamp maximum timestamp value, exclusive - * @throws IOException if invalid time range - * @return this for invocation chaining - */ - public Get setColumnFamilyTimeRange(byte[] cf, long minStamp, long maxStamp) { - return (Get) super.setColumnFamilyTimeRange(cf, minStamp, maxStamp); - } - - /* * Set the maximum number of values to return per row per Column Family * @param limit the maximum number of values returned / row / CF * @return this for invocation chaining http://git-wip-us.apache.org/repos/asf/hbase/blob/3c46a46d/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java index 79762ac..423e401 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java @@ -17,15 +17,12 @@ */ package org.apache.hadoop.hbase.client; -import java.io.IOException; import java.util.Map; -import com.google.common.collect.Maps; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.filter.Filter; -import org.apache.hadoop.hbase.io.TimeRange; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.security.access.AccessControlConstants; import org.apache.hadoop.hbase.security.access.Permission; @@ -34,14 +31,12 @@ import org.apache.hadoop.hbase.security.visibility.VisibilityConstants; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; -import org.apache.hadoop.hbase.util.Bytes; @InterfaceAudience.Public @InterfaceStability.Evolving public abstract class Query extends OperationWithAttributes { private static final String ISOLATION_LEVEL = "_isolationlevel_"; protected Filter filter = null; - protected Map<byte[], TimeRange> colFamTimeRangeMap = null; /** * @return Filter @@ -51,33 +46,6 @@ public abstract class Query extends OperationWithAttributes { } /** - * Get versions of columns only within the specified timestamp range, - * [minStamp, maxStamp) on a per CF bases. Note, default maximum versions to return is 1. If - * your time range spans more than one version and you want all versions - * returned, up the number of versions beyond the default. - * Column Family time ranges take precedence over the global time range. - * - * @param cf the column family for which you want to restrict - * @param minStamp minimum timestamp value, inclusive - * @param maxStamp maximum timestamp value, exclusive - * @return this - * @see Scan#setMaxVersions() - * @see Scan#setMaxVersions(int) - */ - - public Query setColumnFamilyTimeRange(byte[] cf, long minStamp, long maxStamp) { - if (this.colFamTimeRangeMap == null) { - this.colFamTimeRangeMap = Maps.newTreeMap(Bytes.BYTES_COMPARATOR); - } - try { - colFamTimeRangeMap.put(cf, new TimeRange(minStamp, maxStamp)); - return this; - } catch (IOException ioe) { - throw new IllegalArgumentException(ioe); - } - } - - /** * Apply the specified server-side filter when performing the Query. * Only {@link Filter#filterKeyValue(Cell)} is called AFTER all tests * for ttl, column match, deletes and max versions have been run. @@ -182,14 +150,4 @@ public abstract class Query extends OperationWithAttributes { return attr == null ? IsolationLevel.READ_COMMITTED : IsolationLevel.fromBytes(attr); } - - /** - * @return Map<byte[], TimeRange> a map of column families to time ranges - */ - public Map<byte[], TimeRange> getColumnFamilyTimeRange() { - if (this.colFamTimeRangeMap == null) { - this.colFamTimeRangeMap = Maps.newTreeMap(Bytes.BYTES_COMPARATOR); - } - return this.colFamTimeRangeMap; - } } http://git-wip-us.apache.org/repos/asf/hbase/blob/3c46a46d/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java index 6264a72..f1fede5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java @@ -234,10 +234,6 @@ public class Scan extends Query { for (Map.Entry<String, byte[]> attr : scan.getAttributesMap().entrySet()) { setAttribute(attr.getKey(), attr.getValue()); } - for (Map.Entry<byte[], TimeRange> entry : scan.getColumnFamilyTimeRange().entrySet()) { - TimeRange tr = entry.getValue(); - setColumnFamilyTimeRange(entry.getKey(), tr.getMin(), tr.getMax()); - } } /** @@ -258,10 +254,6 @@ public class Scan extends Query { for (Map.Entry<String, byte[]> attr : get.getAttributesMap().entrySet()) { setAttribute(attr.getKey(), attr.getValue()); } - for (Map.Entry<byte[], TimeRange> entry : get.getColumnFamilyTimeRange().entrySet()) { - TimeRange tr = entry.getValue(); - setColumnFamilyTimeRange(entry.getKey(), tr.getMin(), tr.getMax()); - } } public boolean isGetScan() { @@ -324,10 +316,6 @@ public class Scan extends Query { return this; } - @Override public Scan setColumnFamilyTimeRange(byte[] cf, long minStamp, long maxStamp) { - return (Scan) super.setColumnFamilyTimeRange(cf, minStamp, maxStamp); - } - /** * Get versions of columns with the specified timestamp. Note, default maximum * versions to return is 1. If your time range spans more than one version http://git-wip-us.apache.org/repos/asf/hbase/blob/3c46a46d/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java index 7e41955..15c937e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java @@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.protobuf; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.google.protobuf.ByteString; import com.google.protobuf.CodedInputStream; import com.google.protobuf.InvalidProtocolBufferException; @@ -439,16 +438,17 @@ public final class ProtobufUtil { if (proto.hasStoreOffset()) { get.setRowOffsetPerColumnFamily(proto.getStoreOffset()); } - if (proto.getCfTimeRangeCount() > 0) { - for (HBaseProtos.ColumnFamilyTimeRange cftr : proto.getCfTimeRangeList()) { - TimeRange timeRange = protoToTimeRange(cftr.getTimeRange()); - get.setColumnFamilyTimeRange(cftr.getColumnFamily().toByteArray(), - timeRange.getMin(), timeRange.getMax()); - } - } if (proto.hasTimeRange()) { - TimeRange timeRange = protoToTimeRange(proto.getTimeRange()); - get.setTimeRange(timeRange.getMin(), timeRange.getMax()); + HBaseProtos.TimeRange timeRange = proto.getTimeRange(); + long minStamp = 0; + long maxStamp = Long.MAX_VALUE; + if (timeRange.hasFrom()) { + minStamp = timeRange.getFrom(); + } + if (timeRange.hasTo()) { + maxStamp = timeRange.getTo(); + } + get.setTimeRange(minStamp, maxStamp); } if (proto.hasFilter()) { FilterProtos.Filter filter = proto.getFilter(); @@ -833,12 +833,6 @@ public final class ProtobufUtil { scanBuilder.setLoadColumnFamiliesOnDemand(loadColumnFamiliesOnDemand.booleanValue()); } scanBuilder.setMaxVersions(scan.getMaxVersions()); - for (Entry<byte[], TimeRange> cftr : scan.getColumnFamilyTimeRange().entrySet()) { - HBaseProtos.ColumnFamilyTimeRange.Builder b = HBaseProtos.ColumnFamilyTimeRange.newBuilder(); - b.setColumnFamily(ByteString.copyFrom(cftr.getKey())); - b.setTimeRange(timeRangeToProto(cftr.getValue())); - scanBuilder.addCfTimeRange(b); - } TimeRange timeRange = scan.getTimeRange(); if (!timeRange.isAllTime()) { HBaseProtos.TimeRange.Builder timeRangeBuilder = @@ -930,16 +924,17 @@ public final class ProtobufUtil { if (proto.hasLoadColumnFamiliesOnDemand()) { scan.setLoadColumnFamiliesOnDemand(proto.getLoadColumnFamiliesOnDemand()); } - if (proto.getCfTimeRangeCount() > 0) { - for (HBaseProtos.ColumnFamilyTimeRange cftr : proto.getCfTimeRangeList()) { - TimeRange timeRange = protoToTimeRange(cftr.getTimeRange()); - scan.setColumnFamilyTimeRange(cftr.getColumnFamily().toByteArray(), - timeRange.getMin(), timeRange.getMax()); - } - } if (proto.hasTimeRange()) { - TimeRange timeRange = protoToTimeRange(proto.getTimeRange()); - scan.setTimeRange(timeRange.getMin(), timeRange.getMax()); + HBaseProtos.TimeRange timeRange = proto.getTimeRange(); + long minStamp = 0; + long maxStamp = Long.MAX_VALUE; + if (timeRange.hasFrom()) { + minStamp = timeRange.getFrom(); + } + if (timeRange.hasTo()) { + maxStamp = timeRange.getTo(); + } + scan.setTimeRange(minStamp, maxStamp); } if (proto.hasFilter()) { FilterProtos.Filter filter = proto.getFilter(); @@ -995,12 +990,6 @@ public final class ProtobufUtil { if (get.getFilter() != null) { builder.setFilter(ProtobufUtil.toFilter(get.getFilter())); } - for (Entry<byte[], TimeRange> cftr : get.getColumnFamilyTimeRange().entrySet()) { - HBaseProtos.ColumnFamilyTimeRange.Builder b = HBaseProtos.ColumnFamilyTimeRange.newBuilder(); - b.setColumnFamily(ByteString.copyFrom(cftr.getKey())); - b.setTimeRange(timeRangeToProto(cftr.getValue())); - builder.addCfTimeRange(b); - } TimeRange timeRange = get.getTimeRange(); if (!timeRange.isAllTime()) { HBaseProtos.TimeRange.Builder timeRangeBuilder = @@ -1874,7 +1863,7 @@ public final class ProtobufUtil { final HRegionInfo region_a, final HRegionInfo region_b, final boolean forcible) throws IOException { MergeRegionsRequest request = RequestConverter.buildMergeRegionsRequest( - region_a.getRegionName(), region_b.getRegionName(), forcible); + region_a.getRegionName(), region_b.getRegionName(),forcible); try { admin.mergeRegions(null, request); } catch (ServiceException se) { @@ -2232,8 +2221,8 @@ public final class ProtobufUtil { permActions.add(ProtobufUtil.toPermissionAction(a)); } AccessControlProtos.RevokeRequest request = RequestConverter. - buildRevokeRequest(userShortName, - permActions.toArray(new AccessControlProtos.Permission.Action[actions.length])); + buildRevokeRequest(userShortName, permActions.toArray( + new AccessControlProtos.Permission.Action[actions.length])); protocol.revoke(null, request); } @@ -2260,8 +2249,8 @@ public final class ProtobufUtil { permActions.add(ProtobufUtil.toPermissionAction(a)); } AccessControlProtos.RevokeRequest request = RequestConverter. - buildRevokeRequest(userShortName, tableName, f, q, - permActions.toArray(new AccessControlProtos.Permission.Action[actions.length])); + buildRevokeRequest(userShortName, tableName, f, q, permActions.toArray( + new AccessControlProtos.Permission.Action[actions.length])); protocol.revoke(null, request); } @@ -2285,8 +2274,8 @@ public final class ProtobufUtil { permActions.add(ProtobufUtil.toPermissionAction(a)); } AccessControlProtos.RevokeRequest request = RequestConverter. - buildRevokeRequest(userShortName, namespace, - permActions.toArray(new AccessControlProtos.Permission.Action[actions.length])); + buildRevokeRequest(userShortName, namespace, permActions.toArray( + new AccessControlProtos.Permission.Action[actions.length])); protocol.revoke(null, request); } @@ -2514,9 +2503,12 @@ public final class ProtobufUtil { public static Cell toCell(final CellProtos.Cell cell) { // Doing this is going to kill us if we do it for all data passed. // St.Ack 20121205 - return CellUtil.createCell(cell.getRow().toByteArray(), cell.getFamily().toByteArray(), - cell.getQualifier().toByteArray(), cell.getTimestamp(), - (byte) cell.getCellType().getNumber(), cell.getValue().toByteArray()); + return CellUtil.createCell(cell.getRow().toByteArray(), + cell.getFamily().toByteArray(), + cell.getQualifier().toByteArray(), + cell.getTimestamp(), + (byte)cell.getCellType().getNumber(), + cell.getValue().toByteArray()); } public static HBaseProtos.NamespaceDescriptor toProtoNamespaceDescriptor(NamespaceDescriptor ns) { @@ -2976,34 +2968,4 @@ public final class ProtobufUtil { } return scList; } - private static HBaseProtos.TimeRange.Builder timeRangeToProto(TimeRange timeRange) { - HBaseProtos.TimeRange.Builder timeRangeBuilder = - HBaseProtos.TimeRange.newBuilder(); - timeRangeBuilder.setFrom(timeRange.getMin()); - timeRangeBuilder.setTo(timeRange.getMax()); - return timeRangeBuilder; - } - - private static TimeRange protoToTimeRange(HBaseProtos.TimeRange timeRange) throws IOException { - long minStamp = 0; - long maxStamp = Long.MAX_VALUE; - if (timeRange.hasFrom()) { - minStamp = timeRange.getFrom(); - } - if (timeRange.hasTo()) { - maxStamp = timeRange.getTo(); - } - return new TimeRange(minStamp, maxStamp); - } - - private static Map<byte[], TimeRange> convert(List<HBaseProtos.ColumnFamilyTimeRange> cftrs) - throws IOException { - Map<byte[], TimeRange> result = Maps.newTreeMap(Bytes.BYTES_COMPARATOR); - for (HBaseProtos.ColumnFamilyTimeRange cftr : cftrs) { - HBaseProtos.TimeRange tr = cftr.getTimeRange(); - result.put(cftr.getColumnFamily().toByteArray(), new TimeRange(tr.getFrom(), tr.getTo())); - } - return result; - } - } http://git-wip-us.apache.org/repos/asf/hbase/blob/3c46a46d/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TimeRange.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TimeRange.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TimeRange.java index 10e8efb..86f3540 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TimeRange.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TimeRange.java @@ -43,9 +43,7 @@ public class TimeRange { /** * Default constructor. * Represents interval [0, Long.MAX_VALUE) (allTime) - * @deprecated This is made @InterfaceAudience.Private in the 2.0 line and above */ - @Deprecated public TimeRange() { allTime = true; } @@ -53,9 +51,7 @@ public class TimeRange { /** * Represents interval [minStamp, Long.MAX_VALUE) * @param minStamp the minimum timestamp value, inclusive - * @deprecated This is made @InterfaceAudience.Private in the 2.0 line and above */ - @Deprecated public TimeRange(long minStamp) { this.minStamp = minStamp; } @@ -63,9 +59,7 @@ public class TimeRange { /** * Represents interval [minStamp, Long.MAX_VALUE) * @param minStamp the minimum timestamp value, inclusive - * @deprecated This is made @InterfaceAudience.Private in the 2.0 line and above */ - @Deprecated public TimeRange(byte [] minStamp) { this.minStamp = Bytes.toLong(minStamp); } @@ -74,12 +68,10 @@ public class TimeRange { * Represents interval [minStamp, maxStamp) * @param minStamp the minimum timestamp, inclusive * @param maxStamp the maximum timestamp, exclusive - * @throws IllegalArgumentException if either <0, - * @throws IOException if max smaller than min. - * @deprecated This is made @InterfaceAudience.Private in the 2.0 line and above + * @throws IOException */ - @Deprecated - public TimeRange(long minStamp, long maxStamp) throws IOException { + public TimeRange(long minStamp, long maxStamp) + throws IOException { if (minStamp < 0 || maxStamp < 0) { throw new IllegalArgumentException("Timestamp cannot be negative. minStamp:" + minStamp + ", maxStamp" + maxStamp); @@ -96,9 +88,7 @@ public class TimeRange { * @param minStamp the minimum timestamp, inclusive * @param maxStamp the maximum timestamp, exclusive * @throws IOException - * @deprecated This is made @InterfaceAudience.Private in the 2.0 line and above */ - @Deprecated public TimeRange(byte [] minStamp, byte [] maxStamp) throws IOException { this(Bytes.toLong(minStamp), Bytes.toLong(maxStamp)); http://git-wip-us.apache.org/repos/asf/hbase/blob/3c46a46d/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java ---------------------------------------------------------------------- diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java index 2274cf6..805aadb 100644 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java +++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java @@ -1858,31 +1858,6 @@ public final class ClientProtos { * </pre> */ boolean getClosestRowBefore(); - - // repeated .ColumnFamilyTimeRange cf_time_range = 13; - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> - getCfTimeRangeList(); - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange getCfTimeRange(int index); - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - int getCfTimeRangeCount(); - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder> - getCfTimeRangeOrBuilderList(); - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder getCfTimeRangeOrBuilder( - int index); } /** * Protobuf type {@code Get} @@ -2020,14 +1995,6 @@ public final class ClientProtos { closestRowBefore_ = input.readBool(); break; } - case 106: { - if (!((mutable_bitField0_ & 0x00000800) == 0x00000800)) { - cfTimeRange_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange>(); - mutable_bitField0_ |= 0x00000800; - } - cfTimeRange_.add(input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.PARSER, extensionRegistry)); - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -2042,9 +2009,6 @@ public final class ClientProtos { if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { attribute_ = java.util.Collections.unmodifiableList(attribute_); } - if (((mutable_bitField0_ & 0x00000800) == 0x00000800)) { - cfTimeRange_ = java.util.Collections.unmodifiableList(cfTimeRange_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -2325,42 +2289,6 @@ public final class ClientProtos { return closestRowBefore_; } - // repeated .ColumnFamilyTimeRange cf_time_range = 13; - public static final int CF_TIME_RANGE_FIELD_NUMBER = 13; - private java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> cfTimeRange_; - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> getCfTimeRangeList() { - return cfTimeRange_; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder> - getCfTimeRangeOrBuilderList() { - return cfTimeRange_; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public int getCfTimeRangeCount() { - return cfTimeRange_.size(); - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange getCfTimeRange(int index) { - return cfTimeRange_.get(index); - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder getCfTimeRangeOrBuilder( - int index) { - return cfTimeRange_.get(index); - } - private void initFields() { row_ = com.google.protobuf.ByteString.EMPTY; column_ = java.util.Collections.emptyList(); @@ -2373,7 +2301,6 @@ public final class ClientProtos { storeOffset_ = 0; existenceOnly_ = false; closestRowBefore_ = false; - cfTimeRange_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2402,12 +2329,6 @@ public final class ClientProtos { return false; } } - for (int i = 0; i < getCfTimeRangeCount(); i++) { - if (!getCfTimeRange(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } memoizedIsInitialized = 1; return true; } @@ -2448,9 +2369,6 @@ public final class ClientProtos { if (((bitField0_ & 0x00000100) == 0x00000100)) { output.writeBool(11, closestRowBefore_); } - for (int i = 0; i < cfTimeRange_.size(); i++) { - output.writeMessage(13, cfTimeRange_.get(i)); - } getUnknownFields().writeTo(output); } @@ -2504,10 +2422,6 @@ public final class ClientProtos { size += com.google.protobuf.CodedOutputStream .computeBoolSize(11, closestRowBefore_); } - for (int i = 0; i < cfTimeRange_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, cfTimeRange_.get(i)); - } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -2580,8 +2494,6 @@ public final class ClientProtos { result = result && (getClosestRowBefore() == other.getClosestRowBefore()); } - result = result && getCfTimeRangeList() - .equals(other.getCfTimeRangeList()); result = result && getUnknownFields().equals(other.getUnknownFields()); return result; @@ -2639,10 +2551,6 @@ public final class ClientProtos { hash = (37 * hash) + CLOSEST_ROW_BEFORE_FIELD_NUMBER; hash = (53 * hash) + hashBoolean(getClosestRowBefore()); } - if (getCfTimeRangeCount() > 0) { - hash = (37 * hash) + CF_TIME_RANGE_FIELD_NUMBER; - hash = (53 * hash) + getCfTimeRangeList().hashCode(); - } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -2756,7 +2664,6 @@ public final class ClientProtos { getAttributeFieldBuilder(); getFilterFieldBuilder(); getTimeRangeFieldBuilder(); - getCfTimeRangeFieldBuilder(); } } private static Builder create() { @@ -2803,12 +2710,6 @@ public final class ClientProtos { bitField0_ = (bitField0_ & ~0x00000200); closestRowBefore_ = false; bitField0_ = (bitField0_ & ~0x00000400); - if (cfTimeRangeBuilder_ == null) { - cfTimeRange_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000800); - } else { - cfTimeRangeBuilder_.clear(); - } return this; } @@ -2899,15 +2800,6 @@ public final class ClientProtos { to_bitField0_ |= 0x00000100; } result.closestRowBefore_ = closestRowBefore_; - if (cfTimeRangeBuilder_ == null) { - if (((bitField0_ & 0x00000800) == 0x00000800)) { - cfTimeRange_ = java.util.Collections.unmodifiableList(cfTimeRange_); - bitField0_ = (bitField0_ & ~0x00000800); - } - result.cfTimeRange_ = cfTimeRange_; - } else { - result.cfTimeRange_ = cfTimeRangeBuilder_.build(); - } result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -3003,32 +2895,6 @@ public final class ClientProtos { if (other.hasClosestRowBefore()) { setClosestRowBefore(other.getClosestRowBefore()); } - if (cfTimeRangeBuilder_ == null) { - if (!other.cfTimeRange_.isEmpty()) { - if (cfTimeRange_.isEmpty()) { - cfTimeRange_ = other.cfTimeRange_; - bitField0_ = (bitField0_ & ~0x00000800); - } else { - ensureCfTimeRangeIsMutable(); - cfTimeRange_.addAll(other.cfTimeRange_); - } - onChanged(); - } - } else { - if (!other.cfTimeRange_.isEmpty()) { - if (cfTimeRangeBuilder_.isEmpty()) { - cfTimeRangeBuilder_.dispose(); - cfTimeRangeBuilder_ = null; - cfTimeRange_ = other.cfTimeRange_; - bitField0_ = (bitField0_ & ~0x00000800); - cfTimeRangeBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getCfTimeRangeFieldBuilder() : null; - } else { - cfTimeRangeBuilder_.addAllMessages(other.cfTimeRange_); - } - } - } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -3056,12 +2922,6 @@ public final class ClientProtos { return false; } } - for (int i = 0; i < getCfTimeRangeCount(); i++) { - if (!getCfTimeRange(i).isInitialized()) { - - return false; - } - } return true; } @@ -4072,246 +3932,6 @@ public final class ClientProtos { return this; } - // repeated .ColumnFamilyTimeRange cf_time_range = 13; - private java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> cfTimeRange_ = - java.util.Collections.emptyList(); - private void ensureCfTimeRangeIsMutable() { - if (!((bitField0_ & 0x00000800) == 0x00000800)) { - cfTimeRange_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange>(cfTimeRange_); - bitField0_ |= 0x00000800; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder> cfTimeRangeBuilder_; - - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> getCfTimeRangeList() { - if (cfTimeRangeBuilder_ == null) { - return java.util.Collections.unmodifiableList(cfTimeRange_); - } else { - return cfTimeRangeBuilder_.getMessageList(); - } - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public int getCfTimeRangeCount() { - if (cfTimeRangeBuilder_ == null) { - return cfTimeRange_.size(); - } else { - return cfTimeRangeBuilder_.getCount(); - } - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange getCfTimeRange(int index) { - if (cfTimeRangeBuilder_ == null) { - return cfTimeRange_.get(index); - } else { - return cfTimeRangeBuilder_.getMessage(index); - } - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public Builder setCfTimeRange( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange value) { - if (cfTimeRangeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureCfTimeRangeIsMutable(); - cfTimeRange_.set(index, value); - onChanged(); - } else { - cfTimeRangeBuilder_.setMessage(index, value); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public Builder setCfTimeRange( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder builderForValue) { - if (cfTimeRangeBuilder_ == null) { - ensureCfTimeRangeIsMutable(); - cfTimeRange_.set(index, builderForValue.build()); - onChanged(); - } else { - cfTimeRangeBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public Builder addCfTimeRange(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange value) { - if (cfTimeRangeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureCfTimeRangeIsMutable(); - cfTimeRange_.add(value); - onChanged(); - } else { - cfTimeRangeBuilder_.addMessage(value); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public Builder addCfTimeRange( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange value) { - if (cfTimeRangeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureCfTimeRangeIsMutable(); - cfTimeRange_.add(index, value); - onChanged(); - } else { - cfTimeRangeBuilder_.addMessage(index, value); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public Builder addCfTimeRange( - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder builderForValue) { - if (cfTimeRangeBuilder_ == null) { - ensureCfTimeRangeIsMutable(); - cfTimeRange_.add(builderForValue.build()); - onChanged(); - } else { - cfTimeRangeBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public Builder addCfTimeRange( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder builderForValue) { - if (cfTimeRangeBuilder_ == null) { - ensureCfTimeRangeIsMutable(); - cfTimeRange_.add(index, builderForValue.build()); - onChanged(); - } else { - cfTimeRangeBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public Builder addAllCfTimeRange( - java.lang.Iterable<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> values) { - if (cfTimeRangeBuilder_ == null) { - ensureCfTimeRangeIsMutable(); - super.addAll(values, cfTimeRange_); - onChanged(); - } else { - cfTimeRangeBuilder_.addAllMessages(values); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public Builder clearCfTimeRange() { - if (cfTimeRangeBuilder_ == null) { - cfTimeRange_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000800); - onChanged(); - } else { - cfTimeRangeBuilder_.clear(); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public Builder removeCfTimeRange(int index) { - if (cfTimeRangeBuilder_ == null) { - ensureCfTimeRangeIsMutable(); - cfTimeRange_.remove(index); - onChanged(); - } else { - cfTimeRangeBuilder_.remove(index); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder getCfTimeRangeBuilder( - int index) { - return getCfTimeRangeFieldBuilder().getBuilder(index); - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder getCfTimeRangeOrBuilder( - int index) { - if (cfTimeRangeBuilder_ == null) { - return cfTimeRange_.get(index); } else { - return cfTimeRangeBuilder_.getMessageOrBuilder(index); - } - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder> - getCfTimeRangeOrBuilderList() { - if (cfTimeRangeBuilder_ != null) { - return cfTimeRangeBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(cfTimeRange_); - } - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder addCfTimeRangeBuilder() { - return getCfTimeRangeFieldBuilder().addBuilder( - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.getDefaultInstance()); - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder addCfTimeRangeBuilder( - int index) { - return getCfTimeRangeFieldBuilder().addBuilder( - index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.getDefaultInstance()); - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 13;</code> - */ - public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder> - getCfTimeRangeBuilderList() { - return getCfTimeRangeFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder> - getCfTimeRangeFieldBuilder() { - if (cfTimeRangeBuilder_ == null) { - cfTimeRangeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder>( - cfTimeRange_, - ((bitField0_ & 0x00000800) == 0x00000800), - getParentForChildren(), - isClean()); - cfTimeRange_ = null; - } - return cfTimeRangeBuilder_; - } - // @@protoc_insertion_point(builder_scope:Get) } @@ -13730,31 +13350,6 @@ public final class ClientProtos { * <code>optional uint32 caching = 17;</code> */ int getCaching(); - - // repeated .ColumnFamilyTimeRange cf_time_range = 19; - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> - getCfTimeRangeList(); - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange getCfTimeRange(int index); - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - int getCfTimeRangeCount(); - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder> - getCfTimeRangeOrBuilderList(); - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder getCfTimeRangeOrBuilder( - int index); } /** * Protobuf type {@code Scan} @@ -13920,14 +13515,6 @@ public final class ClientProtos { caching_ = input.readUInt32(); break; } - case 154: { - if (!((mutable_bitField0_ & 0x00010000) == 0x00010000)) { - cfTimeRange_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange>(); - mutable_bitField0_ |= 0x00010000; - } - cfTimeRange_.add(input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.PARSER, extensionRegistry)); - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -13942,9 +13529,6 @@ public final class ClientProtos { if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { attribute_ = java.util.Collections.unmodifiableList(attribute_); } - if (((mutable_bitField0_ & 0x00010000) == 0x00010000)) { - cfTimeRange_ = java.util.Collections.unmodifiableList(cfTimeRange_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -14293,42 +13877,6 @@ public final class ClientProtos { return caching_; } - // repeated .ColumnFamilyTimeRange cf_time_range = 19; - public static final int CF_TIME_RANGE_FIELD_NUMBER = 19; - private java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> cfTimeRange_; - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> getCfTimeRangeList() { - return cfTimeRange_; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder> - getCfTimeRangeOrBuilderList() { - return cfTimeRange_; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public int getCfTimeRangeCount() { - return cfTimeRange_.size(); - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange getCfTimeRange(int index) { - return cfTimeRange_.get(index); - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder getCfTimeRangeOrBuilder( - int index) { - return cfTimeRange_.get(index); - } - private void initFields() { column_ = java.util.Collections.emptyList(); attribute_ = java.util.Collections.emptyList(); @@ -14346,7 +13894,6 @@ public final class ClientProtos { small_ = false; reversed_ = false; caching_ = 0; - cfTimeRange_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -14371,12 +13918,6 @@ public final class ClientProtos { return false; } } - for (int i = 0; i < getCfTimeRangeCount(); i++) { - if (!getCfTimeRange(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } memoizedIsInitialized = 1; return true; } @@ -14432,9 +13973,6 @@ public final class ClientProtos { if (((bitField0_ & 0x00002000) == 0x00002000)) { output.writeUInt32(17, caching_); } - for (int i = 0; i < cfTimeRange_.size(); i++) { - output.writeMessage(19, cfTimeRange_.get(i)); - } getUnknownFields().writeTo(output); } @@ -14508,10 +14046,6 @@ public final class ClientProtos { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(17, caching_); } - for (int i = 0; i < cfTimeRange_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(19, cfTimeRange_.get(i)); - } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -14609,8 +14143,6 @@ public final class ClientProtos { result = result && (getCaching() == other.getCaching()); } - result = result && getCfTimeRangeList() - .equals(other.getCfTimeRangeList()); result = result && getUnknownFields().equals(other.getUnknownFields()); return result; @@ -14688,10 +14220,6 @@ public final class ClientProtos { hash = (37 * hash) + CACHING_FIELD_NUMBER; hash = (53 * hash) + getCaching(); } - if (getCfTimeRangeCount() > 0) { - hash = (37 * hash) + CF_TIME_RANGE_FIELD_NUMBER; - hash = (53 * hash) + getCfTimeRangeList().hashCode(); - } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -14808,7 +14336,6 @@ public final class ClientProtos { getAttributeFieldBuilder(); getFilterFieldBuilder(); getTimeRangeFieldBuilder(); - getCfTimeRangeFieldBuilder(); } } private static Builder create() { @@ -14865,12 +14392,6 @@ public final class ClientProtos { bitField0_ = (bitField0_ & ~0x00004000); caching_ = 0; bitField0_ = (bitField0_ & ~0x00008000); - if (cfTimeRangeBuilder_ == null) { - cfTimeRange_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00010000); - } else { - cfTimeRangeBuilder_.clear(); - } return this; } @@ -14981,15 +14502,6 @@ public final class ClientProtos { to_bitField0_ |= 0x00002000; } result.caching_ = caching_; - if (cfTimeRangeBuilder_ == null) { - if (((bitField0_ & 0x00010000) == 0x00010000)) { - cfTimeRange_ = java.util.Collections.unmodifiableList(cfTimeRange_); - bitField0_ = (bitField0_ & ~0x00010000); - } - result.cfTimeRange_ = cfTimeRange_; - } else { - result.cfTimeRange_ = cfTimeRangeBuilder_.build(); - } result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -15100,32 +14612,6 @@ public final class ClientProtos { if (other.hasCaching()) { setCaching(other.getCaching()); } - if (cfTimeRangeBuilder_ == null) { - if (!other.cfTimeRange_.isEmpty()) { - if (cfTimeRange_.isEmpty()) { - cfTimeRange_ = other.cfTimeRange_; - bitField0_ = (bitField0_ & ~0x00010000); - } else { - ensureCfTimeRangeIsMutable(); - cfTimeRange_.addAll(other.cfTimeRange_); - } - onChanged(); - } - } else { - if (!other.cfTimeRange_.isEmpty()) { - if (cfTimeRangeBuilder_.isEmpty()) { - cfTimeRangeBuilder_.dispose(); - cfTimeRangeBuilder_ = null; - cfTimeRange_ = other.cfTimeRange_; - bitField0_ = (bitField0_ & ~0x00010000); - cfTimeRangeBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getCfTimeRangeFieldBuilder() : null; - } else { - cfTimeRangeBuilder_.addAllMessages(other.cfTimeRange_); - } - } - } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -15149,12 +14635,6 @@ public final class ClientProtos { return false; } } - for (int i = 0; i < getCfTimeRangeCount(); i++) { - if (!getCfTimeRange(i).isInitialized()) { - - return false; - } - } return true; } @@ -16309,246 +15789,6 @@ public final class ClientProtos { return this; } - // repeated .ColumnFamilyTimeRange cf_time_range = 19; - private java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> cfTimeRange_ = - java.util.Collections.emptyList(); - private void ensureCfTimeRangeIsMutable() { - if (!((bitField0_ & 0x00010000) == 0x00010000)) { - cfTimeRange_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange>(cfTimeRange_); - bitField0_ |= 0x00010000; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder> cfTimeRangeBuilder_; - - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> getCfTimeRangeList() { - if (cfTimeRangeBuilder_ == null) { - return java.util.Collections.unmodifiableList(cfTimeRange_); - } else { - return cfTimeRangeBuilder_.getMessageList(); - } - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public int getCfTimeRangeCount() { - if (cfTimeRangeBuilder_ == null) { - return cfTimeRange_.size(); - } else { - return cfTimeRangeBuilder_.getCount(); - } - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange getCfTimeRange(int index) { - if (cfTimeRangeBuilder_ == null) { - return cfTimeRange_.get(index); - } else { - return cfTimeRangeBuilder_.getMessage(index); - } - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public Builder setCfTimeRange( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange value) { - if (cfTimeRangeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureCfTimeRangeIsMutable(); - cfTimeRange_.set(index, value); - onChanged(); - } else { - cfTimeRangeBuilder_.setMessage(index, value); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public Builder setCfTimeRange( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder builderForValue) { - if (cfTimeRangeBuilder_ == null) { - ensureCfTimeRangeIsMutable(); - cfTimeRange_.set(index, builderForValue.build()); - onChanged(); - } else { - cfTimeRangeBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public Builder addCfTimeRange(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange value) { - if (cfTimeRangeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureCfTimeRangeIsMutable(); - cfTimeRange_.add(value); - onChanged(); - } else { - cfTimeRangeBuilder_.addMessage(value); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public Builder addCfTimeRange( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange value) { - if (cfTimeRangeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureCfTimeRangeIsMutable(); - cfTimeRange_.add(index, value); - onChanged(); - } else { - cfTimeRangeBuilder_.addMessage(index, value); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public Builder addCfTimeRange( - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder builderForValue) { - if (cfTimeRangeBuilder_ == null) { - ensureCfTimeRangeIsMutable(); - cfTimeRange_.add(builderForValue.build()); - onChanged(); - } else { - cfTimeRangeBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public Builder addCfTimeRange( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder builderForValue) { - if (cfTimeRangeBuilder_ == null) { - ensureCfTimeRangeIsMutable(); - cfTimeRange_.add(index, builderForValue.build()); - onChanged(); - } else { - cfTimeRangeBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public Builder addAllCfTimeRange( - java.lang.Iterable<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange> values) { - if (cfTimeRangeBuilder_ == null) { - ensureCfTimeRangeIsMutable(); - super.addAll(values, cfTimeRange_); - onChanged(); - } else { - cfTimeRangeBuilder_.addAllMessages(values); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public Builder clearCfTimeRange() { - if (cfTimeRangeBuilder_ == null) { - cfTimeRange_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00010000); - onChanged(); - } else { - cfTimeRangeBuilder_.clear(); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public Builder removeCfTimeRange(int index) { - if (cfTimeRangeBuilder_ == null) { - ensureCfTimeRangeIsMutable(); - cfTimeRange_.remove(index); - onChanged(); - } else { - cfTimeRangeBuilder_.remove(index); - } - return this; - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder getCfTimeRangeBuilder( - int index) { - return getCfTimeRangeFieldBuilder().getBuilder(index); - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder getCfTimeRangeOrBuilder( - int index) { - if (cfTimeRangeBuilder_ == null) { - return cfTimeRange_.get(index); } else { - return cfTimeRangeBuilder_.getMessageOrBuilder(index); - } - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder> - getCfTimeRangeOrBuilderList() { - if (cfTimeRangeBuilder_ != null) { - return cfTimeRangeBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(cfTimeRange_); - } - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder addCfTimeRangeBuilder() { - return getCfTimeRangeFieldBuilder().addBuilder( - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.getDefaultInstance()); - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder addCfTimeRangeBuilder( - int index) { - return getCfTimeRangeFieldBuilder().addBuilder( - index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.getDefaultInstance()); - } - /** - * <code>repeated .ColumnFamilyTimeRange cf_time_range = 19;</code> - */ - public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder> - getCfTimeRangeBuilderList() { - return getCfTimeRangeFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder> - getCfTimeRangeFieldBuilder() { - if (cfTimeRangeBuilder_ == null) { - cfTimeRangeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRange.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilyTimeRangeOrBuilder>( - cfTimeRange_, - ((bitField0_ & 0x00010000) == 0x00010000), - getParentForChildren(), - isClean()); - cfTimeRange_ = null; - } - return cfTimeRangeBuilder_; - } - // @@protoc_insertion_point(builder_scope:Scan) } @@ -32616,7 +31856,7 @@ public final class ClientProtos { "o\032\nCell.proto\032\020Comparator.proto\"\037\n\016Autho" + "rizations\022\r\n\005label\030\001 \003(\t\"$\n\016CellVisibili" + "ty\022\022\n\nexpression\030\001 \002(\t\"+\n\006Column\022\016\n\006fami" + - "ly\030\001 \002(\014\022\021\n\tqualifier\030\002 \003(\014\"\330\002\n\003Get\022\013\n\003r" + + "ly\030\001 \002(\014\022\021\n\tqualifier\030\002 \003(\014\"\251\002\n\003Get\022\013\n\003r" + "ow\030\001 \002(\014\022\027\n\006column\030\002 \003(\0132\007.Column\022!\n\tatt" + "ribute\030\003 \003(\0132\016.NameBytesPair\022\027\n\006filter\030\004" + " \001(\0132\007.Filter\022\036\n\ntime_range\030\005 \001(\0132\n.Time" + @@ -32624,107 +31864,104 @@ public final class ClientProtos { "blocks\030\007 \001(\010:\004true\022\023\n\013store_limit\030\010 \001(\r\022", "\024\n\014store_offset\030\t \001(\r\022\035\n\016existence_only\030" + "\n \001(\010:\005false\022!\n\022closest_row_before\030\013 \001(\010" + - ":\005false\022-\n\rcf_time_range\030\r \003(\0132\026.ColumnF" + - "amilyTimeRange\"L\n\006Result\022\023\n\004cell\030\001 \003(\0132\005" + - ".Cell\022\035\n\025associated_cell_count\030\002 \001(\005\022\016\n\006" + - "exists\030\003 \001(\010\"A\n\nGetRequest\022 \n\006region\030\001 \002" + - "(\0132\020.RegionSpecifier\022\021\n\003get\030\002 \002(\0132\004.Get\"" + - "&\n\013GetResponse\022\027\n\006result\030\001 \001(\0132\007.Result\"" + - "\200\001\n\tCondition\022\013\n\003row\030\001 \002(\014\022\016\n\006family\030\002 \002" + - "(\014\022\021\n\tqualifier\030\003 \002(\014\022\"\n\014compare_type\030\004 ", - "\002(\0162\014.CompareType\022\037\n\ncomparator\030\005 \002(\0132\013." + - "Comparator\"\265\006\n\rMutationProto\022\013\n\003row\030\001 \001(" + - "\014\0220\n\013mutate_type\030\002 \001(\0162\033.MutationProto.M" + - "utationType\0220\n\014column_value\030\003 \003(\0132\032.Muta" + - "tionProto.ColumnValue\022\021\n\ttimestamp\030\004 \001(\004" + - "\022!\n\tattribute\030\005 \003(\0132\016.NameBytesPair\022:\n\nd" + - "urability\030\006 \001(\0162\031.MutationProto.Durabili" + - "ty:\013USE_DEFAULT\022\036\n\ntime_range\030\007 \001(\0132\n.Ti" + - "meRange\022\035\n\025associated_cell_count\030\010 \001(\005\022\r" + - "\n\005nonce\030\t \001(\004\032\347\001\n\013ColumnValue\022\016\n\006family\030", - "\001 \002(\014\022B\n\017qualifier_value\030\002 \003(\0132).Mutatio" + - "nProto.ColumnValue.QualifierValue\032\203\001\n\016Qu" + - "alifierValue\022\021\n\tqualifier\030\001 \001(\014\022\r\n\005value" + - "\030\002 \001(\014\022\021\n\ttimestamp\030\003 \001(\004\022.\n\013delete_type" + - "\030\004 \001(\0162\031.MutationProto.DeleteType\022\014\n\004tag" + - "s\030\005 \001(\014\"W\n\nDurability\022\017\n\013USE_DEFAULT\020\000\022\014" + - "\n\010SKIP_WAL\020\001\022\r\n\tASYNC_WAL\020\002\022\014\n\010SYNC_WAL\020" + - "\003\022\r\n\tFSYNC_WAL\020\004\">\n\014MutationType\022\n\n\006APPE" + - "ND\020\000\022\r\n\tINCREMENT\020\001\022\007\n\003PUT\020\002\022\n\n\006DELETE\020\003" + - "\"p\n\nDeleteType\022\026\n\022DELETE_ONE_VERSION\020\000\022\034", - "\n\030DELETE_MULTIPLE_VERSIONS\020\001\022\021\n\rDELETE_F" + - "AMILY\020\002\022\031\n\025DELETE_FAMILY_VERSION\020\003\"\207\001\n\rM" + - "utateRequest\022 \n\006region\030\001 \002(\0132\020.RegionSpe" + - "cifier\022 \n\010mutation\030\002 \002(\0132\016.MutationProto" + - "\022\035\n\tcondition\030\003 \001(\0132\n.Condition\022\023\n\013nonce" + - "_group\030\004 \001(\004\"<\n\016MutateResponse\022\027\n\006result" + - "\030\001 \001(\0132\007.Result\022\021\n\tprocessed\030\002 \001(\010\"\275\003\n\004S" + - "can\022\027\n\006column\030\001 \003(\0132\007.Column\022!\n\tattribut" + - "e\030\002 \003(\0132\016.NameBytesPair\022\021\n\tstart_row\030\003 \001" + - "(\014\022\020\n\010stop_row\030\004 \001(\014\022\027\n\006filter\030\005 \001(\0132\007.F", - "ilter\022\036\n\ntime_range\030\006 \001(\0132\n.TimeRange\022\027\n" + - "\014max_versions\030\007 \001(\r:\0011\022\032\n\014cache_blocks\030\010" + - " \001(\010:\004true\022\022\n\nbatch_size\030\t \001(\r\022\027\n\017max_re" + - "sult_size\030\n \001(\004\022\023\n\013store_limit\030\013 \001(\r\022\024\n\014" + - "store_offset\030\014 \001(\r\022&\n\036load_column_famili" + - "es_on_demand\030\r \001(\010\022\r\n\005small\030\016 \001(\010\022\027\n\010rev" + - "ersed\030\017 \001(\010:\005false\022\017\n\007caching\030\021 \001(\r\022-\n\rc" + - "f_time_range\030\023 \003(\0132\026.ColumnFamilyTimeRan" + - "ge\"\264\001\n\013ScanRequest\022 \n\006region\030\001 \001(\0132\020.Reg" + - "ionSpecifier\022\023\n\004scan\030\002 \001(\0132\005.Scan\022\022\n\nsca", - "nner_id\030\003 \001(\004\022\026\n\016number_of_rows\030\004 \001(\r\022\025\n" + - "\rclose_scanner\030\005 \001(\010\022\025\n\rnext_call_seq\030\006 " + - "\001(\004\022\024\n\005renew\030\n \001(\010:\005false\"\231\001\n\014ScanRespon" + - "se\022\030\n\020cells_per_result\030\001 \003(\r\022\022\n\nscanner_" + - "id\030\002 \001(\004\022\024\n\014more_results\030\003 \001(\010\022\013\n\003ttl\030\004 " + - "\001(\r\022\030\n\007results\030\005 \003(\0132\007.Result\022\036\n\026more_re" + - "sults_in_region\030\010 \001(\010\"\263\001\n\024BulkLoadHFileR" + - "equest\022 \n\006region\030\001 \002(\0132\020.RegionSpecifier" + - "\0225\n\013family_path\030\002 \003(\0132 .BulkLoadHFileReq" + - "uest.FamilyPath\022\026\n\016assign_seq_num\030\003 \001(\010\032", - "*\n\nFamilyPath\022\016\n\006family\030\001 \002(\014\022\014\n\004path\030\002 " + - "\002(\t\"\'\n\025BulkLoadHFileResponse\022\016\n\006loaded\030\001" + - " \002(\010\"a\n\026CoprocessorServiceCall\022\013\n\003row\030\001 " + - "\002(\014\022\024\n\014service_name\030\002 \002(\t\022\023\n\013method_name" + - "\030\003 \002(\t\022\017\n\007request\030\004 \002(\014\"9\n\030CoprocessorSe" + - "rviceResult\022\035\n\005value\030\001 \001(\0132\016.NameBytesPa" + - "ir\"d\n\031CoprocessorServiceRequest\022 \n\006regio" + - "n\030\001 \002(\0132\020.RegionSpecifier\022%\n\004call\030\002 \002(\0132" + - "\027.CoprocessorServiceCall\"]\n\032CoprocessorS" + - "erviceResponse\022 \n\006region\030\001 \002(\0132\020.RegionS", - "pecifier\022\035\n\005value\030\002 \002(\0132\016.NameBytesPair\"" + - "{\n\006Action\022\r\n\005index\030\001 \001(\r\022 \n\010mutation\030\002 \001" + - "(\0132\016.MutationProto\022\021\n\003get\030\003 \001(\0132\004.Get\022-\n" + - "\014service_call\030\004 \001(\0132\027.CoprocessorService" + - "Call\"Y\n\014RegionAction\022 \n\006region\030\001 \002(\0132\020.R" + - "egionSpecifier\022\016\n\006atomic\030\002 \001(\010\022\027\n\006action" + - "\030\003 \003(\0132\007.Action\"c\n\017RegionLoadStats\022\027\n\014me" + - "mstoreLoad\030\001 \001(\005:\0010\022\030\n\rheapOccupancy\030\002 \001" + - "(\005:\0010\022\035\n\022compactionPressure\030\003 \001(\005:\0010\"\266\001\n" + - "\021ResultOrException\022\r\n\005index\030\001 \001(\r\022\027\n\006res", - "ult\030\002 \001(\0132\007.Result\022!\n\texception\030\003 \001(\0132\016." + - "NameBytesPair\0221\n\016service_result\030\004 \001(\0132\031." + - "CoprocessorServiceResult\022#\n\tloadStats\030\005 " + - "\001(\0132\020.RegionLoadStats\"f\n\022RegionActionRes" + - "ult\022-\n\021resultOrException\030\001 \003(\0132\022.ResultO" + - "rException\022!\n\texception\030\002 \001(\0132\016.NameByte" + - "sPair\"f\n\014MultiRequest\022#\n\014regionAction\030\001 " + - "\003(\0132\r.RegionAction\022\022\n\nnonceGroup\030\002 \001(\004\022\035" + - "\n\tcondition\030\003 \001(\0132\n.Condition\"S\n\rMultiRe" + - "sponse\022/\n\022regionActionResult\030\001 \003(\0132\023.Reg", - "ionActionResult\022\021\n\tprocessed\030\002 \001(\0102\205\003\n\rC" + - "lientService\022 \n\003Get\022\013.GetRequest\032\014.GetRe" + - "sponse\022)\n\006Mutate\022\016.MutateRequest\032\017.Mutat" + - "eResponse\022#\n\004Scan\022\014.ScanRequest\032\r.ScanRe" + - "sponse\022>\n\rBulkLoadHFile\022\025.BulkLoadHFileR" + - "equest\032\026.BulkLoadHFileResponse\022F\n\013ExecSe" + - "rvice\022\032.CoprocessorServiceRequest\032\033.Copr" + - "ocessorServiceResponse\022R\n\027ExecRegionServ" + - "erService\022\032.CoprocessorServiceRequest\032\033." + - "CoprocessorServiceResponse\022&\n\005Multi\022\r.Mu", - "ltiRequest\032\016.MultiResponseBB\n*org.apache" + - ".hadoop.hbase.protobuf.generatedB\014Client" + - "ProtosH\001\210\001\001\240\001\001" + ":\005false\"L\n\006Result\022\023\n\004cell\030\001 \003(\0132\005.Cell\022\035" + + "\n\025associated_cell_count\030\002 \001(\005\022\016\n\006exists\030" + + "\003 \001(\010\"A\n\nGetRequest\022 \n\006region\030\001 \002(\0132\020.Re" + + "gionSpecifier\022\021\n\003get\030\002 \002(\0132\004.Get\"&\n\013GetR" + + "esponse\022\027\n\006result\030\001 \001(\0132\007.Result\"\200\001\n\tCon" + + "dition\022\013\n\003row\030\001 \002(\014\022\016\n\006family\030\002 \002(\014\022\021\n\tq" + + "ualifier\030\003 \002(\014\022\"\n\014compare_type\030\004 \002(\0162\014.C" + + "ompareType\022\037\n\ncomparator\030\005 \002(\0132\013.Compara", + "tor\"\265\006\n\rMutationProto\022\013\n\003row\030\001 \001(\014\0220\n\013mu" + + "tate_type\030\002 \001(\0162\033.MutationProto.Mutation" + + "Type\0220\n\014column_value\030\003 \003(\0132\032.MutationPro" + + "to.ColumnValue\022\021\n\ttimestamp\030\004 \001(\004\022!\n\tatt" + + "ribute\030\005 \003(\0132\016.NameBytesPair\022:\n\ndurabili" + + "ty\030\006 \001(\0162\031.MutationProto.Durability:\013USE" + + "_DEFAULT\022\036\n\ntime_range\030\007 \001(\0132\n.TimeRange" + + "\022\035\n\025associated_cell_count\030\010 \001(\005\022\r\n\005nonce" + + "\030\t \001(\004\032\347\001\n\013ColumnValue\022\016\n\006family\030\001 \002(\014\022B" + + "\n\017qualifier_value\030\002 \003(\0132).MutationProto.", + "ColumnValue.QualifierValue\032\203\001\n\016Qualifier" + + "Value\022\021\n\tqualifier\030\001 \001(\014\022\r\n\005value\030\002 \001(\014\022" + + "\021\n\ttimestamp\030\003 \001(\004\022.\n\013delete_type\030\004 \001(\0162" + + "\031.MutationProto.DeleteType\022\014\n\004tags\030\005 \001(\014" + + "\"W\n\nDurability\022\017\n\013USE_DEFAULT\020\000\022\014\n\010SKIP_" + + "WAL\020\001\022\r\n\tASYNC_WAL\020\002\022\014\n\010SYNC_WAL\020\003\022\r\n\tFS" + + "YNC_WAL\020\004\">\n\014MutationType\022\n\n\006APPEND\020\000\022\r\n" + + "\tINCREMENT\020\001\022\007\n\003PUT\020\002\022\n\n\006DELETE\020\003\"p\n\nDel" + + "eteType\022\026\n\022DELETE_ONE_VERSION\020\000\022\034\n\030DELET" + + "E_MULTIPLE_VERSIONS\020\001\022\021\n\rDELETE_FAMILY\020\002", + "\022\031\n\025DELETE_FAMILY_VERSION\020\003\"\207\001\n\rMutateRe" + + "quest\022 \n\006region\030\001 \002(\0132\020.RegionSpecifier\022" + + " \n\010mutation\030\002 \002(\0132\016.MutationProto\022\035\n\tcon" + + "dition\030\003 \001(\0132\n.Condition\022\023\n\013nonce_group\030" + + "\004 \001(\004\"<\n\016MutateResponse\022\027\n\006result\030\001 \001(\0132" + + "\007.Result\022\021\n\tprocessed\030\002 \001(\010\"\216\003\n\004Scan\022\027\n\006" + + "column\030\001 \003(\0132\007.Column\022!\n\tattribute\030\002 \003(\013" + + "2\016.NameBytesPair\022\021\n\tstart_row\030\003 \001(\014\022\020\n\010s" + + "top_row\030\004 \001(\014\022\027\n\006filter\030\005 \001(\0132\007.Filter\022\036" + + "\n\ntime_range\030\006 \001(\0132\n.TimeRange\022\027\n\014max_ve", + "rsions\030\007 \001(\r:\0011\022\032\n\014cache_blocks\030\010 \001(\010:\004t" + + "rue\022\022\n\nbatch_size\030\t \001(\r\022\027\n\017max_result_si" + + "ze\030\n \001(\004\022\023\n\013store_limit\030\013 \001(\r\022\024\n\014store_o" + + "ffset\030\014 \001(\r\022&\n\036load_column_families_on_d" + + "emand\030\r \001(\010\022\r\n\005small\030\016 \001(\010\022\027\n\010reversed\030\017" + + " \001(\010:\005false\022\017\n\007caching\030\021 \001(\r\"\264\001\n\013ScanReq" + + "uest\022 \n\006region\030\001 \001(\0132\020.RegionSpecifier\022\023" + + "\n\004scan\030\002 \001(\0132\005.Scan\022\022\n\nscanner_id\030\003 \001(\004\022" + + "\026\n\016number_of_rows\030\004 \001(\r\022\025\n\rclose_scanner" + + "\030\005 \001(\010\022\025\n\rnext_call_seq\030\006 \001(\004\022\024\n\005renew\030\n", + " \001(\010:\005false\"\231\001\n\014ScanResponse\022\030\n\020cells_pe" + + "r_result\030\001 \003(\r\022\022\n\nscanner_id\030\002 \001(\004\022\024\n\014mo" + + "re_results\030\003 \001(\010\022\013\n\003ttl\030\004 \001(\r\022\030\n\007results" + + "\030\005 \003(\0132\007.Result\022\036\n\026more_results_in_regio" + + "n\030\010 \001(\010\"\263\001\n\024BulkLoadHFileRequest\022 \n\006regi" + + "on\030\001 \002(\0132\020.RegionSpecifier\0225\n\013family_pat" + + "h\030\002 \003(\0132 .BulkLoadHFileRequest.FamilyPat" + + "h\022\026\n\016assign_seq_num\030\003 \001(\010\032*\n\nFamilyPath\022" + + "\016\n\006family\030\001 \002(\014\022\014\n\004path\030\002 \002(\t\"\'\n\025BulkLoa" + + "dHFileResponse\022\016\n\006loaded\030\001 \002(\010\"a\n\026Coproc", + "essorServiceCall\022\013\n\003row\030\001 \002(\014\022\024\n\014service" + + "_name\030\002 \002(\t\022\023\n\013method_name\030\003 \002(\t\022\017\n\007requ" + + "est\030\004 \002(\014\"9\n\030CoprocessorServiceResult\022\035\n" + + "\005value\030\001 \001(\0132\016.NameBytesPair\"d\n\031Coproces" + + "sorServiceRequest\022 \n\006region\030\001 \002(\0132\020.Regi" + + "onSpecifier\022%\n\004call\030\002 \002(\0132\027.CoprocessorS" + + "erviceCall\"]\n\032CoprocessorServiceResponse" + + "\022 \n\006region\030\001 \002(\0132\020.RegionSpecifier\022\035\n\005va" + + "lue\030\002 \002(\0132\016.NameBytesPair\"{\n\006Action\022\r\n\005i" + + "ndex\030\001 \001(\r\022 \n\010mutation\030\002 \001(\0132\016.MutationP", + "roto\022\021\n\003get\030\003 \001(\0132\004.Get\022-\n\014service_call\030" + + "\004 \001(\0132\027.CoprocessorServiceCall\"Y\n\014Region" + + "Action\022 \n\006region\030\001 \002(\0132\020.RegionSpecifier" + + "\022\016\n\006atomic\030\002 \001(\010\022\027\n\006action\030\003 \003(\0132\007.Actio" + + "n\"c\n\017RegionLoadStats\022\027\n\014memstoreLoad\030\001 \001" + + "(\005:\0010\022\030\n\rheapOccupancy\030\002 \001(\005:\0010\022\035\n\022compa" + + "ctionPressure\030\003 \001(\005:\0010\"\266\001\n\021ResultOrExcep" + + "tion\022\r\n\005index\030\001 \001(\r\022\027\n\006result\030\002 \001(\0132\007.Re" + + "sult\022!\n\texception\030\003 \001(\0132\016.NameBytesPair\022" + + "1\n\016service_result\030\004 \001(\0132\031.CoprocessorSer", + "viceResult\022#\n\tloadStats\030\005 \001(\0132\020.RegionLo" + + "adStats\"f\n\022RegionActionResult\022-\n\021resultO" + + "rException\030\001 \003(\0132\022.ResultOrException\022!\n\t" + + "exception\030\002 \001(\0132\016.NameBytesPair\"f\n\014Multi" + + "Request\022#\n\014regionAction\030\001 \003(\0132\r.RegionAc" + + "tion\022\022\n\nnonceGroup\030\002 \001(\004\022\035\n\tcondition\030\003 " + + "\001(\0132\n.Condition\"S\n\rMultiResponse\022/\n\022regi" + + "onActionResult\030\001 \003(\0132\023.RegionActionResul" + + "t\022\021\n\tprocessed\030\002 \001(\0102\205\003\n\rClientService\022 " + + "\n\003Get\022\013.GetRequest\032\014.GetResponse\022)\n\006Muta", + "te\022\016.MutateRequest\032\017.MutateResponse\022#\n\004S" + + "can\022\014.ScanRequest\032\r.ScanResponse\022>\n\rBulk" + + "LoadHFile\022\025.BulkLoadHFileRequest\032\026.BulkL" + + "oadHFileResponse\022F\n\013ExecService\022\032.Coproc" + + "essorServiceRequest\032\033.CoprocessorService" + + "Response\022R\n\027ExecRegionServerService\022\032.Co" + + "processorServiceRequest\032\033.CoprocessorSer" + + "viceResponse\022&\n\005Multi\022\r.MultiRequest\032\016.M" + + "ultiResponseBB\n*org.apache.hadoop.hbase." + + "protobuf.generatedB\014ClientProtosH\001\210\001\001\240\001\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -32754,7 +31991,7 @@ public final class ClientProtos { internal_static_Get_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_Get_descriptor, - new java.lang.String[] { "Row", "Column", "Attribute", "Filter", "TimeRange", "MaxVersions", "CacheBlocks", "StoreLimit", "StoreOffset", "ExistenceOnly", "ClosestRowBefore", "CfTimeRange", }); + new java.lang.String[] { "Row", "Column", "Attribute", "Filter", "TimeRange", "MaxVersions", "CacheBlocks", "StoreLimit", "StoreOffset", "ExistenceOnly", "ClosestRowBefore", }); internal_static_Result_descriptor = getDescriptor().getMessageTypes().get(4); internal_static_Result_fieldAccessorTable = new @@ -32814,7 +32051,7 @@ public final class ClientProtos { internal_static_Scan_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_Scan_descriptor, - new java.lang.String[] { "Column", "Attribute", "StartRow", "StopRow", "Filter", "TimeRange", "MaxVersions", "CacheBlocks", "BatchSize", "MaxResultSize", "StoreLimit", "StoreOffset", "LoadColumnFamiliesOnDemand", "Small", "Reversed", "Caching", "CfTimeRange", }); + new java.lang.String[] { "Column", "Attribute", "StartRow", "StopRow", "Filter", "TimeRange", "MaxVersions", "CacheBlocks", "BatchSize", "MaxResultSize", "StoreLimit", "StoreOffset", "LoadColumnFamiliesOnDemand", "Small", "Reversed", "Caching", }); internal_static_ScanRequest_descriptor = getDescriptor().getMessageTypes().get(12); internal_static_ScanRequest_fieldAccessorTable = new
