Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9FF6F200C8E for ; Mon, 1 May 2017 00:14:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9E85B160BC4; Sun, 30 Apr 2017 22:14:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1CEDE160BC6 for ; Mon, 1 May 2017 00:14:13 +0200 (CEST) Received: (qmail 59492 invoked by uid 500); 30 Apr 2017 22:14:12 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 58459 invoked by uid 99); 30 Apr 2017 22:14:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 30 Apr 2017 22:14:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EC70FDFD78; Sun, 30 Apr 2017 22:14:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Date: Sun, 30 Apr 2017 22:14:31 -0000 Message-Id: <64b45127013a4a039a1b485a7021b0db@git.apache.org> In-Reply-To: <7f75e4ff538f43b8992121c76c55d4e4@git.apache.org> References: <7f75e4ff538f43b8992121c76c55d4e4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/24] hbase git commit: HBASE-14614 Procedure v2 - Core Assignment Manager (Matteo Bertozzi) Move to a new AssignmentManager, one that describes Assignment using a State Machine built on top of ProcedureV2 facility. archived-at: Sun, 30 Apr 2017 22:14:16 -0000 http://git-wip-us.apache.org/repos/asf/hbase/blob/ccbc9ec2/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java index 703de38..d802523 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java @@ -9414,53 +9414,70 @@ public final class AdminProtos { } - public interface CloseRegionForSplitOrMergeRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:hbase.pb.CloseRegionForSplitOrMergeRequest) + public interface FlushRegionRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:hbase.pb.FlushRegionRequest) org.apache.hadoop.hbase.shaded.com.google.protobuf.MessageOrBuilder { /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - java.util.List - getRegionList(); + boolean hasRegion(); /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier getRegion(int index); + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier getRegion(); /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - int getRegionCount(); + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder(); + /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * optional uint64 if_older_than_ts = 2; */ - java.util.List - getRegionOrBuilderList(); + boolean hasIfOlderThanTs(); /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * optional uint64 if_older_than_ts = 2; */ - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder( - int index); + long getIfOlderThanTs(); + + /** + *
+     * whether to write a marker to WAL even if not flushed
+     * 
+ * + * optional bool write_flush_wal_marker = 3; + */ + boolean hasWriteFlushWalMarker(); + /** + *
+     * whether to write a marker to WAL even if not flushed
+     * 
+ * + * optional bool write_flush_wal_marker = 3; + */ + boolean getWriteFlushWalMarker(); } /** *
    **
-   * Closes the specified region(s) for
-   * split or merge
+   * Flushes the MemStore of the specified region.
+   * <p>
+   * This method is synchronous.
    * 
* - * Protobuf type {@code hbase.pb.CloseRegionForSplitOrMergeRequest} + * Protobuf type {@code hbase.pb.FlushRegionRequest} */ - public static final class CloseRegionForSplitOrMergeRequest extends + public static final class FlushRegionRequest extends org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:hbase.pb.CloseRegionForSplitOrMergeRequest) - CloseRegionForSplitOrMergeRequestOrBuilder { - // Use CloseRegionForSplitOrMergeRequest.newBuilder() to construct. - private CloseRegionForSplitOrMergeRequest(org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder builder) { + // @@protoc_insertion_point(message_implements:hbase.pb.FlushRegionRequest) + FlushRegionRequestOrBuilder { + // Use FlushRegionRequest.newBuilder() to construct. + private FlushRegionRequest(org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private CloseRegionForSplitOrMergeRequest() { - region_ = java.util.Collections.emptyList(); + private FlushRegionRequest() { + ifOlderThanTs_ = 0L; + writeFlushWalMarker_ = false; } @java.lang.Override @@ -9468,7 +9485,7 @@ public final class AdminProtos { getUnknownFields() { return this.unknownFields; } - private CloseRegionForSplitOrMergeRequest( + private FlushRegionRequest( org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { @@ -9492,12 +9509,26 @@ public final class AdminProtos { break; } case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - region_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = region_.toBuilder(); + } + region_ = input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(region_); + region_ = subBuilder.buildPartial(); } - region_.add( - input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.PARSER, extensionRegistry)); + bitField0_ |= 0x00000001; + break; + } + case 16: { + bitField0_ |= 0x00000002; + ifOlderThanTs_ = input.readUInt64(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + writeFlushWalMarker_ = input.readBool(); break; } } @@ -9508,58 +9539,80 @@ public final class AdminProtos { throw new org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - region_ = java.util.Collections.unmodifiableList(region_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionForSplitOrMergeRequest_descriptor; + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionRequest_descriptor; } protected org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionForSplitOrMergeRequest_fieldAccessorTable + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest.class, org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest.Builder.class); + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest.class, org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest.Builder.class); } + private int bitField0_; public static final int REGION_FIELD_NUMBER = 1; - private java.util.List region_; + private org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier region_; /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - public java.util.List getRegionList() { - return region_; + public boolean hasRegion() { + return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - public java.util.List - getRegionOrBuilderList() { - return region_; + public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() { + return region_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance() : region_; } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - public int getRegionCount() { - return region_.size(); + public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() { + return region_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance() : region_; } + + public static final int IF_OLDER_THAN_TS_FIELD_NUMBER = 2; + private long ifOlderThanTs_; /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * optional uint64 if_older_than_ts = 2; */ - public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier getRegion(int index) { - return region_.get(index); + public boolean hasIfOlderThanTs() { + return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * optional uint64 if_older_than_ts = 2; */ - public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder( - int index) { - return region_.get(index); + public long getIfOlderThanTs() { + return ifOlderThanTs_; + } + + public static final int WRITE_FLUSH_WAL_MARKER_FIELD_NUMBER = 3; + private boolean writeFlushWalMarker_; + /** + *
+     * whether to write a marker to WAL even if not flushed
+     * 
+ * + * optional bool write_flush_wal_marker = 3; + */ + public boolean hasWriteFlushWalMarker() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + *
+     * whether to write a marker to WAL even if not flushed
+     * 
+ * + * optional bool write_flush_wal_marker = 3; + */ + public boolean getWriteFlushWalMarker() { + return writeFlushWalMarker_; } private byte memoizedIsInitialized = -1; @@ -9568,11 +9621,13 @@ public final class AdminProtos { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - for (int i = 0; i < getRegionCount(); i++) { - if (!getRegion(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } + if (!hasRegion()) { + memoizedIsInitialized = 0; + return false; + } + if (!getRegion().isInitialized()) { + memoizedIsInitialized = 0; + return false; } memoizedIsInitialized = 1; return true; @@ -9580,8 +9635,14 @@ public final class AdminProtos { public void writeTo(org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < region_.size(); i++) { - output.writeMessage(1, region_.get(i)); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeMessage(1, getRegion()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeUInt64(2, ifOlderThanTs_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeBool(3, writeFlushWalMarker_); } unknownFields.writeTo(output); } @@ -9591,9 +9652,17 @@ public final class AdminProtos { if (size != -1) return size; size = 0; - for (int i = 0; i < region_.size(); i++) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getRegion()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream + .computeUInt64Size(2, ifOlderThanTs_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream - .computeMessageSize(1, region_.get(i)); + .computeBoolSize(3, writeFlushWalMarker_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -9606,14 +9675,27 @@ public final class AdminProtos { if (obj == this) { return true; } - if (!(obj instanceof org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest)) { + if (!(obj instanceof org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest)) { return super.equals(obj); } - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest other = (org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest) obj; + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest other = (org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest) obj; boolean result = true; - result = result && getRegionList() - .equals(other.getRegionList()); + result = result && (hasRegion() == other.hasRegion()); + if (hasRegion()) { + result = result && getRegion() + .equals(other.getRegion()); + } + result = result && (hasIfOlderThanTs() == other.hasIfOlderThanTs()); + if (hasIfOlderThanTs()) { + result = result && (getIfOlderThanTs() + == other.getIfOlderThanTs()); + } + result = result && (hasWriteFlushWalMarker() == other.hasWriteFlushWalMarker()); + if (hasWriteFlushWalMarker()) { + result = result && (getWriteFlushWalMarker() + == other.getWriteFlushWalMarker()); + } result = result && unknownFields.equals(other.unknownFields); return result; } @@ -9625,67 +9707,77 @@ public final class AdminProtos { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getRegionCount() > 0) { + if (hasRegion()) { hash = (37 * hash) + REGION_FIELD_NUMBER; - hash = (53 * hash) + getRegionList().hashCode(); + hash = (53 * hash) + getRegion().hashCode(); + } + if (hasIfOlderThanTs()) { + hash = (37 * hash) + IF_OLDER_THAN_TS_FIELD_NUMBER; + hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong( + getIfOlderThanTs()); + } + if (hasWriteFlushWalMarker()) { + hash = (37 * hash) + WRITE_FLUSH_WAL_MARKER_FIELD_NUMBER; + hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean( + getWriteFlushWalMarker()); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest parseFrom( org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString data) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest parseFrom( org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString data, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest parseFrom(byte[] data) + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest parseFrom(byte[] data) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest parseFrom( byte[] data, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest parseFrom(java.io.InputStream input) + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest parseFrom( java.io.InputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest parseDelimitedFrom(java.io.InputStream input) + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest parseDelimitedFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest parseDelimitedFrom( java.io.InputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest parseFrom( org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input) throws java.io.IOException { return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest parseFrom( org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -9697,7 +9789,7 @@ public final class AdminProtos { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest prototype) { + public static Builder newBuilder(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -9714,29 +9806,30 @@ public final class AdminProtos { /** *
      **
-     * Closes the specified region(s) for
-     * split or merge
+     * Flushes the MemStore of the specified region.
+     * <p>
+     * This method is synchronous.
      * 
* - * Protobuf type {@code hbase.pb.CloseRegionForSplitOrMergeRequest} + * Protobuf type {@code hbase.pb.FlushRegionRequest} */ public static final class Builder extends org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:hbase.pb.CloseRegionForSplitOrMergeRequest) - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequestOrBuilder { + // @@protoc_insertion_point(builder_implements:hbase.pb.FlushRegionRequest) + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequestOrBuilder { public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionForSplitOrMergeRequest_descriptor; + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionRequest_descriptor; } protected org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionForSplitOrMergeRequest_fieldAccessorTable + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest.class, org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest.Builder.class); + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest.class, org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest.Builder.class); } - // Construct using org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest.newBuilder() + // Construct using org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -9755,43 +9848,56 @@ public final class AdminProtos { public Builder clear() { super.clear(); if (regionBuilder_ == null) { - region_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + region_ = null; } else { regionBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); + ifOlderThanTs_ = 0L; + bitField0_ = (bitField0_ & ~0x00000002); + writeFlushWalMarker_ = false; + bitField0_ = (bitField0_ & ~0x00000004); return this; } public org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionForSplitOrMergeRequest_descriptor; + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionRequest_descriptor; } - public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest getDefaultInstanceForType() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest.getDefaultInstance(); + public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest getDefaultInstanceForType() { + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest.getDefaultInstance(); } - public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest build() { - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest result = buildPartial(); + public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest build() { + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest buildPartial() { - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest result = new org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest(this); + public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest buildPartial() { + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest result = new org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest(this); int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } if (regionBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { - region_ = java.util.Collections.unmodifiableList(region_); - bitField0_ = (bitField0_ & ~0x00000001); - } result.region_ = region_; } else { result.region_ = regionBuilder_.build(); } + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.ifOlderThanTs_ = ifOlderThanTs_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.writeFlushWalMarker_ = writeFlushWalMarker_; + result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -9823,41 +9929,24 @@ public final class AdminProtos { return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(org.apache.hadoop.hbase.shaded.com.google.protobuf.Message other) { - if (other instanceof org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest) { - return mergeFrom((org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest)other); + if (other instanceof org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest) { + return mergeFrom((org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest other) { - if (other == org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest.getDefaultInstance()) return this; - if (regionBuilder_ == null) { - if (!other.region_.isEmpty()) { - if (region_.isEmpty()) { - region_ = other.region_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureRegionIsMutable(); - region_.addAll(other.region_); - } - onChanged(); - } - } else { - if (!other.region_.isEmpty()) { - if (regionBuilder_.isEmpty()) { - regionBuilder_.dispose(); - regionBuilder_ = null; - region_ = other.region_; - bitField0_ = (bitField0_ & ~0x00000001); - regionBuilder_ = - org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getRegionFieldBuilder() : null; - } else { - regionBuilder_.addAllMessages(other.region_); - } - } + public Builder mergeFrom(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest other) { + if (other == org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest.getDefaultInstance()) return this; + if (other.hasRegion()) { + mergeRegion(other.getRegion()); + } + if (other.hasIfOlderThanTs()) { + setIfOlderThanTs(other.getIfOlderThanTs()); + } + if (other.hasWriteFlushWalMarker()) { + setWriteFlushWalMarker(other.getWriteFlushWalMarker()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -9865,10 +9954,11 @@ public final class AdminProtos { } public final boolean isInitialized() { - for (int i = 0; i < getRegionCount(); i++) { - if (!getRegion(i).isInitialized()) { - return false; - } + if (!hasRegion()) { + return false; + } + if (!getRegion().isInitialized()) { + return false; } return true; } @@ -9877,11 +9967,11 @@ public final class AdminProtos { org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest parsedMessage = null; + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest) e.getUnfinishedMessage(); + parsedMessage = (org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -9892,244 +9982,202 @@ public final class AdminProtos { } private int bitField0_; - private java.util.List region_ = - java.util.Collections.emptyList(); - private void ensureRegionIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { - region_ = new java.util.ArrayList(region_); - bitField0_ |= 0x00000001; - } - } - - private org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3< + private org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier region_ = null; + private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_; - - /** - * repeated .hbase.pb.RegionSpecifier region = 1; - */ - public java.util.List getRegionList() { - if (regionBuilder_ == null) { - return java.util.Collections.unmodifiableList(region_); - } else { - return regionBuilder_.getMessageList(); - } - } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - public int getRegionCount() { - if (regionBuilder_ == null) { - return region_.size(); - } else { - return regionBuilder_.getCount(); - } + public boolean hasRegion() { + return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier getRegion(int index) { + public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() { if (regionBuilder_ == null) { - return region_.get(index); + return region_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance() : region_; } else { - return regionBuilder_.getMessage(index); + return regionBuilder_.getMessage(); } } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - public Builder setRegion( - int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier value) { + public Builder setRegion(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier value) { if (regionBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureRegionIsMutable(); - region_.set(index, value); + region_ = value; onChanged(); } else { - regionBuilder_.setMessage(index, value); + regionBuilder_.setMessage(value); } + bitField0_ |= 0x00000001; return this; } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ public Builder setRegion( - int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) { + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) { if (regionBuilder_ == null) { - ensureRegionIsMutable(); - region_.set(index, builderForValue.build()); + region_ = builderForValue.build(); onChanged(); } else { - regionBuilder_.setMessage(index, builderForValue.build()); + regionBuilder_.setMessage(builderForValue.build()); } + bitField0_ |= 0x00000001; return this; } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - public Builder addRegion(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier value) { + public Builder mergeRegion(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier value) { if (regionBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); + if (((bitField0_ & 0x00000001) == 0x00000001) && + region_ != null && + region_ != org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance()) { + region_ = + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.newBuilder(region_).mergeFrom(value).buildPartial(); + } else { + region_ = value; } - ensureRegionIsMutable(); - region_.add(value); onChanged(); } else { - regionBuilder_.addMessage(value); + regionBuilder_.mergeFrom(value); } + bitField0_ |= 0x00000001; return this; } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - public Builder addRegion( - int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier value) { + public Builder clearRegion() { if (regionBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureRegionIsMutable(); - region_.add(index, value); + region_ = null; onChanged(); } else { - regionBuilder_.addMessage(index, value); + regionBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - public Builder addRegion( - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) { - if (regionBuilder_ == null) { - ensureRegionIsMutable(); - region_.add(builderForValue.build()); - onChanged(); - } else { - regionBuilder_.addMessage(builderForValue.build()); - } - return this; + public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getRegionFieldBuilder().getBuilder(); } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - public Builder addRegion( - int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) { - if (regionBuilder_ == null) { - ensureRegionIsMutable(); - region_.add(index, builderForValue.build()); - onChanged(); + public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() { + if (regionBuilder_ != null) { + return regionBuilder_.getMessageOrBuilder(); } else { - regionBuilder_.addMessage(index, builderForValue.build()); + return region_ == null ? + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance() : region_; } - return this; } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * required .hbase.pb.RegionSpecifier region = 1; */ - public Builder addAllRegion( - java.lang.Iterable values) { + private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> + getRegionFieldBuilder() { if (regionBuilder_ == null) { - ensureRegionIsMutable(); - org.apache.hadoop.hbase.shaded.com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, region_); - onChanged(); - } else { - regionBuilder_.addAllMessages(values); + regionBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3< + org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder>( + getRegion(), + getParentForChildren(), + isClean()); + region_ = null; } - return this; + return regionBuilder_; } + + private long ifOlderThanTs_ ; /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * optional uint64 if_older_than_ts = 2; */ - public Builder clearRegion() { - if (regionBuilder_ == null) { - region_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - } else { - regionBuilder_.clear(); - } - return this; + public boolean hasIfOlderThanTs() { + return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * optional uint64 if_older_than_ts = 2; */ - public Builder removeRegion(int index) { - if (regionBuilder_ == null) { - ensureRegionIsMutable(); - region_.remove(index); - onChanged(); - } else { - regionBuilder_.remove(index); - } - return this; + public long getIfOlderThanTs() { + return ifOlderThanTs_; } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * optional uint64 if_older_than_ts = 2; */ - public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder( - int index) { - return getRegionFieldBuilder().getBuilder(index); + public Builder setIfOlderThanTs(long value) { + bitField0_ |= 0x00000002; + ifOlderThanTs_ = value; + onChanged(); + return this; } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + * optional uint64 if_older_than_ts = 2; */ - public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder( - int index) { - if (regionBuilder_ == null) { - return region_.get(index); } else { - return regionBuilder_.getMessageOrBuilder(index); - } + public Builder clearIfOlderThanTs() { + bitField0_ = (bitField0_ & ~0x00000002); + ifOlderThanTs_ = 0L; + onChanged(); + return this; } + + private boolean writeFlushWalMarker_ ; /** - * repeated .hbase.pb.RegionSpecifier region = 1; + *
+       * whether to write a marker to WAL even if not flushed
+       * 
+ * + * optional bool write_flush_wal_marker = 3; */ - public java.util.List - getRegionOrBuilderList() { - if (regionBuilder_ != null) { - return regionBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(region_); - } + public boolean hasWriteFlushWalMarker() { + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + *
+       * whether to write a marker to WAL even if not flushed
+       * 
+ * + * optional bool write_flush_wal_marker = 3; */ - public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder addRegionBuilder() { - return getRegionFieldBuilder().addBuilder( - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance()); + public boolean getWriteFlushWalMarker() { + return writeFlushWalMarker_; } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + *
+       * whether to write a marker to WAL even if not flushed
+       * 
+ * + * optional bool write_flush_wal_marker = 3; */ - public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder addRegionBuilder( - int index) { - return getRegionFieldBuilder().addBuilder( - index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance()); + public Builder setWriteFlushWalMarker(boolean value) { + bitField0_ |= 0x00000004; + writeFlushWalMarker_ = value; + onChanged(); + return this; } /** - * repeated .hbase.pb.RegionSpecifier region = 1; + *
+       * whether to write a marker to WAL even if not flushed
+       * 
+ * + * optional bool write_flush_wal_marker = 3; */ - public java.util.List - getRegionBuilderList() { - return getRegionFieldBuilder().getBuilderList(); - } - private org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> - getRegionFieldBuilder() { - if (regionBuilder_ == null) { - regionBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3< - org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder>( - region_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); - region_ = null; - } - return regionBuilder_; + public Builder clearWriteFlushWalMarker() { + bitField0_ = (bitField0_ & ~0x00000004); + writeFlushWalMarker_ = false; + onChanged(); + return this; } public final Builder setUnknownFields( final org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet unknownFields) { @@ -10142,70 +10190,90 @@ public final class AdminProtos { } - // @@protoc_insertion_point(builder_scope:hbase.pb.CloseRegionForSplitOrMergeRequest) + // @@protoc_insertion_point(builder_scope:hbase.pb.FlushRegionRequest) } - // @@protoc_insertion_point(class_scope:hbase.pb.CloseRegionForSplitOrMergeRequest) - private static final org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:hbase.pb.FlushRegionRequest) + private static final org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest(); + DEFAULT_INSTANCE = new org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest(); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest getDefaultInstance() { + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest getDefaultInstance() { return DEFAULT_INSTANCE; } - @java.lang.Deprecated public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser - PARSER = new org.apache.hadoop.hbase.shaded.com.google.protobuf.AbstractParser() { - public CloseRegionForSplitOrMergeRequest parsePartialFrom( + @java.lang.Deprecated public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser + PARSER = new org.apache.hadoop.hbase.shaded.com.google.protobuf.AbstractParser() { + public FlushRegionRequest parsePartialFrom( org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { - return new CloseRegionForSplitOrMergeRequest(input, extensionRegistry); + return new FlushRegionRequest(input, extensionRegistry); } }; - public static org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser parser() { + public static org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser getParserForType() { + public org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser getParserForType() { return PARSER; } - public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeRequest getDefaultInstanceForType() { + public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface CloseRegionForSplitOrMergeResponseOrBuilder extends - // @@protoc_insertion_point(interface_extends:hbase.pb.CloseRegionForSplitOrMergeResponse) + public interface FlushRegionResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:hbase.pb.FlushRegionResponse) org.apache.hadoop.hbase.shaded.com.google.protobuf.MessageOrBuilder { /** - * required bool closed = 1; + * required uint64 last_flush_time = 1; */ - boolean hasClosed(); + boolean hasLastFlushTime(); /** - * required bool closed = 1; + * required uint64 last_flush_time = 1; */ - boolean getClosed(); + long getLastFlushTime(); + + /** + * optional bool flushed = 2; + */ + boolean hasFlushed(); + /** + * optional bool flushed = 2; + */ + boolean getFlushed(); + + /** + * optional bool wrote_flush_wal_marker = 3; + */ + boolean hasWroteFlushWalMarker(); + /** + * optional bool wrote_flush_wal_marker = 3; + */ + boolean getWroteFlushWalMarker(); } /** - * Protobuf type {@code hbase.pb.CloseRegionForSplitOrMergeResponse} + * Protobuf type {@code hbase.pb.FlushRegionResponse} */ - public static final class CloseRegionForSplitOrMergeResponse extends + public static final class FlushRegionResponse extends org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:hbase.pb.CloseRegionForSplitOrMergeResponse) - CloseRegionForSplitOrMergeResponseOrBuilder { - // Use CloseRegionForSplitOrMergeResponse.newBuilder() to construct. - private CloseRegionForSplitOrMergeResponse(org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder builder) { + // @@protoc_insertion_point(message_implements:hbase.pb.FlushRegionResponse) + FlushRegionResponseOrBuilder { + // Use FlushRegionResponse.newBuilder() to construct. + private FlushRegionResponse(org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private CloseRegionForSplitOrMergeResponse() { - closed_ = false; + private FlushRegionResponse() { + lastFlushTime_ = 0L; + flushed_ = false; + wroteFlushWalMarker_ = false; } @java.lang.Override @@ -10213,7 +10281,7 @@ public final class AdminProtos { getUnknownFields() { return this.unknownFields; } - private CloseRegionForSplitOrMergeResponse( + private FlushRegionResponse( org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { @@ -10238,7 +10306,17 @@ public final class AdminProtos { } case 8: { bitField0_ |= 0x00000001; - closed_ = input.readBool(); + lastFlushTime_ = input.readUInt64(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + flushed_ = input.readBool(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + wroteFlushWalMarker_ = input.readBool(); break; } } @@ -10255,30 +10333,60 @@ public final class AdminProtos { } public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionForSplitOrMergeResponse_descriptor; + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionResponse_descriptor; } protected org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionForSplitOrMergeResponse_fieldAccessorTable + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse.class, org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse.Builder.class); + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse.class, org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse.Builder.class); } private int bitField0_; - public static final int CLOSED_FIELD_NUMBER = 1; - private boolean closed_; + public static final int LAST_FLUSH_TIME_FIELD_NUMBER = 1; + private long lastFlushTime_; /** - * required bool closed = 1; + * required uint64 last_flush_time = 1; */ - public boolean hasClosed() { + public boolean hasLastFlushTime() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required bool closed = 1; + * required uint64 last_flush_time = 1; */ - public boolean getClosed() { - return closed_; + public long getLastFlushTime() { + return lastFlushTime_; + } + + public static final int FLUSHED_FIELD_NUMBER = 2; + private boolean flushed_; + /** + * optional bool flushed = 2; + */ + public boolean hasFlushed() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional bool flushed = 2; + */ + public boolean getFlushed() { + return flushed_; + } + + public static final int WROTE_FLUSH_WAL_MARKER_FIELD_NUMBER = 3; + private boolean wroteFlushWalMarker_; + /** + * optional bool wrote_flush_wal_marker = 3; + */ + public boolean hasWroteFlushWalMarker() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional bool wrote_flush_wal_marker = 3; + */ + public boolean getWroteFlushWalMarker() { + return wroteFlushWalMarker_; } private byte memoizedIsInitialized = -1; @@ -10287,7 +10395,7 @@ public final class AdminProtos { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasClosed()) { + if (!hasLastFlushTime()) { memoizedIsInitialized = 0; return false; } @@ -10298,7 +10406,13 @@ public final class AdminProtos { public void writeTo(org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBool(1, closed_); + output.writeUInt64(1, lastFlushTime_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeBool(2, flushed_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeBool(3, wroteFlushWalMarker_); } unknownFields.writeTo(output); } @@ -10310,7 +10424,15 @@ public final class AdminProtos { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream - .computeBoolSize(1, closed_); + .computeUInt64Size(1, lastFlushTime_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream + .computeBoolSize(2, flushed_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream + .computeBoolSize(3, wroteFlushWalMarker_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -10323,16 +10445,26 @@ public final class AdminProtos { if (obj == this) { return true; } - if (!(obj instanceof org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse)) { + if (!(obj instanceof org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse)) { return super.equals(obj); } - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse other = (org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse) obj; + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse other = (org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse) obj; boolean result = true; - result = result && (hasClosed() == other.hasClosed()); - if (hasClosed()) { - result = result && (getClosed() - == other.getClosed()); + result = result && (hasLastFlushTime() == other.hasLastFlushTime()); + if (hasLastFlushTime()) { + result = result && (getLastFlushTime() + == other.getLastFlushTime()); + } + result = result && (hasFlushed() == other.hasFlushed()); + if (hasFlushed()) { + result = result && (getFlushed() + == other.getFlushed()); + } + result = result && (hasWroteFlushWalMarker() == other.hasWroteFlushWalMarker()); + if (hasWroteFlushWalMarker()) { + result = result && (getWroteFlushWalMarker() + == other.getWroteFlushWalMarker()); } result = result && unknownFields.equals(other.unknownFields); return result; @@ -10345,68 +10477,78 @@ public final class AdminProtos { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasClosed()) { - hash = (37 * hash) + CLOSED_FIELD_NUMBER; + if (hasLastFlushTime()) { + hash = (37 * hash) + LAST_FLUSH_TIME_FIELD_NUMBER; + hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong( + getLastFlushTime()); + } + if (hasFlushed()) { + hash = (37 * hash) + FLUSHED_FIELD_NUMBER; hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean( - getClosed()); + getFlushed()); + } + if (hasWroteFlushWalMarker()) { + hash = (37 * hash) + WROTE_FLUSH_WAL_MARKER_FIELD_NUMBER; + hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean( + getWroteFlushWalMarker()); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse parseFrom( org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString data) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse parseFrom( org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString data, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse parseFrom(byte[] data) + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse parseFrom(byte[] data) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse parseFrom( byte[] data, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse parseFrom(java.io.InputStream input) + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse parseFrom(java.io.InputStream input) throws java.io.IOException { return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse parseFrom( java.io.InputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse parseDelimitedFrom(java.io.InputStream input) + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse parseDelimitedFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse parseDelimitedFrom( java.io.InputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse parseFrom( org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input) throws java.io.IOException { return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse parseFrom( + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse parseFrom( org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -10418,7 +10560,7 @@ public final class AdminProtos { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse prototype) { + public static Builder newBuilder(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -10433,25 +10575,25 @@ public final class AdminProtos { return builder; } /** - * Protobuf type {@code hbase.pb.CloseRegionForSplitOrMergeResponse} + * Protobuf type {@code hbase.pb.FlushRegionResponse} */ public static final class Builder extends org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:hbase.pb.CloseRegionForSplitOrMergeResponse) - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponseOrBuilder { + // @@protoc_insertion_point(builder_implements:hbase.pb.FlushRegionResponse) + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponseOrBuilder { public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionForSplitOrMergeResponse_descriptor; + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionResponse_descriptor; } protected org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionForSplitOrMergeResponse_fieldAccessorTable + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse.class, org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse.Builder.class); + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse.class, org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse.Builder.class); } - // Construct using org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse.newBuilder() + // Construct using org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -10468,36 +10610,48 @@ public final class AdminProtos { } public Builder clear() { super.clear(); - closed_ = false; + lastFlushTime_ = 0L; bitField0_ = (bitField0_ & ~0x00000001); + flushed_ = false; + bitField0_ = (bitField0_ & ~0x00000002); + wroteFlushWalMarker_ = false; + bitField0_ = (bitField0_ & ~0x00000004); return this; } public org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionForSplitOrMergeResponse_descriptor; + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionResponse_descriptor; } - public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse getDefaultInstanceForType() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse.getDefaultInstance(); + public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse getDefaultInstanceForType() { + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse.getDefaultInstance(); } - public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse build() { - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse result = buildPartial(); + public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse build() { + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse buildPartial() { - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse result = new org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse(this); + public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse buildPartial() { + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse result = new org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.closed_ = closed_; + result.lastFlushTime_ = lastFlushTime_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.flushed_ = flushed_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.wroteFlushWalMarker_ = wroteFlushWalMarker_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -10530,18 +10684,24 @@ public final class AdminProtos { return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(org.apache.hadoop.hbase.shaded.com.google.protobuf.Message other) { - if (other instanceof org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse) { - return mergeFrom((org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse)other); + if (other instanceof org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse) { + return mergeFrom((org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse other) { - if (other == org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse.getDefaultInstance()) return this; - if (other.hasClosed()) { - setClosed(other.getClosed()); + public Builder mergeFrom(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse other) { + if (other == org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse.getDefaultInstance()) return this; + if (other.hasLastFlushTime()) { + setLastFlushTime(other.getLastFlushTime()); + } + if (other.hasFlushed()) { + setFlushed(other.getFlushed()); + } + if (other.hasWroteFlushWalMarker()) { + setWroteFlushWalMarker(other.getWroteFlushWalMarker()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -10549,7 +10709,7 @@ public final class AdminProtos { } public final boolean isInitialized() { - if (!hasClosed()) { + if (!hasLastFlushTime()) { return false; } return true; @@ -10559,11 +10719,11 @@ public final class AdminProtos { org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse parsedMessage = null; + org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse) e.getUnfinishedMessage(); + parsedMessage = (org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -10574,34 +10734,98 @@ public final class AdminProtos { } private int bitField0_; - private boolean closed_ ; + private long lastFlushTime_ ; /** - * required bool closed = 1; + * required uint64 last_flush_time = 1; */ - public boolean hasClosed() { + public boolean hasLastFlushTime() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required bool closed = 1; + * required uint64 last_flush_time = 1; */ - public boolean getClosed() { - return closed_; + public long getLastFlushTime() { + return lastFlushTime_; } /** - * required bool closed = 1; + * required uint64 last_flush_time = 1; */ - public Builder setClosed(boolean value) { + public Builder setLastFlushTime(long value) { bitField0_ |= 0x00000001; - closed_ = value; + lastFlushTime_ = value; onChanged(); return this; } /** - * required bool closed = 1; + * required uint64 last_flush_time = 1; */ - public Builder clearClosed() { + public Builder clearLastFlushTime() { bitField0_ = (bitField0_ & ~0x00000001); - closed_ = false; + lastFlushTime_ = 0L; + onChanged(); + return this; + } + + private boolean flushed_ ; + /** + * optional bool flushed = 2; + */ + public boolean hasFlushed() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional bool flushed = 2; + */ + public boolean getFlushed() { + return flushed_; + } + /** + * optional bool flushed = 2; + */ + public Builder setFlushed(boolean value) { + bitField0_ |= 0x00000002; + flushed_ = value; + onChanged(); + return this; + } + /** + * optional bool flushed = 2; + */ + public Builder clearFlushed() { + bitField0_ = (bitField0_ & ~0x00000002); + flushed_ = false; + onChanged(); + return this; + } + + private boolean wroteFlushWalMarker_ ; + /** + * optional bool wrote_flush_wal_marker = 3; + */ + public boolean hasWroteFlushWalMarker() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional bool wrote_flush_wal_marker = 3; + */ + public boolean getWroteFlushWalMarker() { + return wroteFlushWalMarker_; + } + /** + * optional bool wrote_flush_wal_marker = 3; + */ + public Builder setWroteFlushWalMarker(boolean value) { + bitField0_ |= 0x00000004; + wroteFlushWalMarker_ = value; + onChanged(); + return this; + } + /** + * optional bool wrote_flush_wal_marker = 3; + */ + public Builder clearWroteFlushWalMarker() { + bitField0_ = (bitField0_ & ~0x00000004); + wroteFlushWalMarker_ = false; onChanged(); return this; } @@ -10616,46 +10840,46 @@ public final class AdminProtos { } - // @@protoc_insertion_point(builder_scope:hbase.pb.CloseRegionForSplitOrMergeResponse) + // @@protoc_insertion_point(builder_scope:hbase.pb.FlushRegionResponse) } - // @@protoc_insertion_point(class_scope:hbase.pb.CloseRegionForSplitOrMergeResponse) - private static final org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:hbase.pb.FlushRegionResponse) + private static final org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse(); + DEFAULT_INSTANCE = new org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse(); } - public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse getDefaultInstance() { + public static org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse getDefaultInstance() { return DEFAULT_INSTANCE; } - @java.lang.Deprecated public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser - PARSER = new org.apache.hadoop.hbase.shaded.com.google.protobuf.AbstractParser() { - public CloseRegionForSplitOrMergeResponse parsePartialFrom( + @java.lang.Deprecated public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser + PARSER = new org.apache.hadoop.hbase.shaded.com.google.protobuf.AbstractParser() { + public FlushRegionResponse parsePartialFrom( org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { - return new CloseRegionForSplitOrMergeResponse(input, extensionRegistry); + return new FlushRegionResponse(input, extensionRegistry); } }; - public static org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser parser() { + public static org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser getParserForType() { + public org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser getParserForType() { return PARSER; } - public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionForSplitOrMergeResponse getDefaultInstanceForType() { + public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } } - public interface FlushRegionRequestOrBuilder extends - // @@protoc_insertion_point(interface_extends:hbase.pb.FlushRegionRequest) + public interface SplitRegionRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:hbase.pb.SplitRegionRequest) org.apache.hadoop.hbase.shaded.com.google.protobuf.MessageOrBuilder { /** @@ -10672,52 +10896,36 @@ public final class AdminProtos { org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder(); /** - * optional uint64 if_older_than_ts = 2; - */ - boolean hasIfOlderThanTs(); - /** - * optional uint64 if_older_than_ts = 2; - */ - long getIfOlderThanTs(); - - /** - *
-     * whether to write a marker to WAL even if not flushed
-     * 
- * - * optional bool write_flush_wal_marker = 3; + * optional bytes split_point = 2; */ - boolean hasWriteFlushWalMarker(); + boolean hasSplitPoint(); /** - *
-     * whether to write a marker to WAL even if not flushed
-     * 
- * - * optional bool write_flush_wal_marker = 3; + * optional bytes split_point = 2; */ - boolean getWriteFlushWalMarker(); + org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString getSplitPoint(); } /** *
    **
-   * Flushes the MemStore of the specified region.
+   * Splits the specified region.
    * <p>
-   * This method is synchronous.
+   * This method currently flushes the region and then forces a compaction which
+   * will then trigger a split.  The flush is done synchronously but the
+   * compaction is asynchronous.
    * 
* - * Protobuf type {@code hbase.pb.FlushRegionRequest} + * Protobuf type {@code hbase.pb.SplitRegionRequest} */ - public static final class FlushRegionRequest extends + public static final class SplitRegionRequest extends org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:hbase.pb.FlushRegionRequest) - FlushRegionRequestOrBuilder { - // Use FlushRegionRequest.newBuilder() to construct. - private FlushRegionRequest(org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder builder) { + // @@protoc_insertion_point(message_implements:hbase.pb.SplitRegionRequest) + SplitRegionRequestOrBuilder { + // Use SplitRegionRequest.newBuilder() to construct. + private SplitRegionRequest(org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private FlushRegionRequest() { - ifOlderThanTs_ = 0L; - writeFlushWalMarker_ = false; + private SplitRegionRequest() { + splitPoint_ = org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString.EMPTY; } @java.lang.Override @@ -10725,7 +10933,7 @@ public final class AdminProtos { getUnknownFields() { return this.unknownFields; } - private FlushRegionRequest( + private SplitRegionRequest( org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input, org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException { @@ -10761,14 +10969,9 @@ public final class AdminProtos { bitField0_ |= 0x00000001; break; } - case 16: { + case 18: { bitField0_ |= 0x00000002; - ifOlderThanTs_ = input.readUInt64(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - writeFlushWalMarker_ = input.readBool(); + splitPoint_ = input.readBytes(); break; } } @@ -10785,14 +10988,14 @@ public final class AdminProtos { } public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionRequest_descriptor; + return org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.internal_static_hbase_pb_SplitRegionRequest_descriptor; } protected org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.shaded.protobuf.genera