From 212ca1124eca71f22d9b41986dee68eb0766dc51 Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Sun, 30 Jun 2024 12:31:07 -0400 Subject: [PATCH 01/25] Add grpc and protobuf setup to maven build This includes dependencies and plugin to generate the grpc service and protocol buffer classes --- core/pom.xml | 69 +++++++++++++++++++ core/src/main/spotbugs/exclude-filter.xml | 6 ++ hadoop-mapreduce/pom.xml | 2 +- pom.xml | 63 ++++++++++++++++- server/base/pom.xml | 4 ++ .../src/main/resources/log4j2-test.properties | 3 + 6 files changed, 144 insertions(+), 3 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 5adcc0d308b..96f9d6e5185 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -61,6 +61,10 @@ + + com.google.protobuf + protobuf-java + commons-io commons-io @@ -69,6 +73,14 @@ commons-logging commons-logging + + io.grpc + grpc-protobuf + + + io.grpc + grpc-stub + io.micrometer micrometer-core @@ -143,6 +155,17 @@ org.yaml snakeyaml + + + org.apache.tomcat + annotations-api + provided + + + io.grpc + grpc-netty-shaded + runtime + org.apache.hadoop hadoop-client-runtime @@ -258,12 +281,14 @@ .*[.]impl[.].* .*[.]thrift[.].* + .*[.]protobuf[.].* org[.]apache[.]accumulo[.]core[.]security[.]crypto[.].* org[.]apache[.]accumulo[.].*[.]thrift[.].* + org[.]apache[.]accumulo[.].*[.]protobuf[.].* @@ -393,6 +418,13 @@ + + + kr.motd.maven + os-maven-plugin + 1.7.1 + + @@ -418,6 +450,43 @@ + + protobuf + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + 0.6.1 + + com.google.protobuf:protoc:3.25.3:exe:${os.detected.classifier} + grpc-java + io.grpc:protoc-gen-grpc-java:1.64.0:exe:${os.detected.classifier} + src/main/protobuf-gen-java/ + + + + generate-protobuf + + compile + + generate-sources + + + generate-grpc + + compile-custom + + generate-sources + + false + + + + + + + diff --git a/core/src/main/spotbugs/exclude-filter.xml b/core/src/main/spotbugs/exclude-filter.xml index ded70a98dc4..03ce7cdca32 100644 --- a/core/src/main/spotbugs/exclude-filter.xml +++ b/core/src/main/spotbugs/exclude-filter.xml @@ -40,6 +40,12 @@ + + + + + + diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index 90e8dccdc56..f6321a67b7c 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -101,7 +101,7 @@ .*[.]impl[.].* - org[.]apache[.]accumulo[.]core[.](?:client|data|security)[.](?!.*(impl|thrift|crypto).*).* + org[.]apache[.]accumulo[.]core[.](?:client|data|security)[.](?!.*(impl|thrift|protobuf|crypto).*).* org[.]apache[.]accumulo[.]core[.]util[.]Pair + org.apache.tomcat + annotations-api + 6.0.53 + org.apache.zookeeper zookeeper @@ -840,6 +858,7 @@ ${rootlocation}/src/build/eclipse-codestyle.xml **/thrift/*.java + **/protobuf/*.java LF true @@ -879,6 +898,7 @@ java.,javax.,jakarta.,org.,com. **/thrift/*.java + **/protobuf/*.java @@ -908,6 +928,11 @@ org.apache.httpcomponents:httpcore:jar:* org.powermock:powermock-core:jar:* org.powermock:powermock-reflect:jar:* + + com.google.protobuf:protobuf-java:* + + io.grpc:grpc-api:* + io.grpc:grpc-stub:* @@ -932,6 +957,10 @@ biz.aQute.bnd:biz.aQute.bnd.annotation:jar:* org.junit.jupiter:junit-jupiter-engine:jar:* + + org.apache.tomcat:annotations-api:jar:* + + io.grpc:grpc-netty-shaded:jar:* @@ -1104,7 +1133,7 @@ warning true - **/thrift/*.java + **/thrift/*.java,**/protobuf/*.java @@ -1532,6 +1561,36 @@ + + add-protobuf-java-source + + + src/main/protobuf-gen-java + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-protobuf-java-source + + add-source + + generate-sources + + + src/main/protobuf-gen-java + + + + + + + + add-spotbugs-excludes @@ -1606,7 +1665,7 @@ -XDcompilePolicy=simple -Xplugin:ErrorProne \ - -XepExcludedPaths:.*/(thrift|generated-sources|src/test)/.* \ + -XepExcludedPaths:.*/(thrift|protobuf|generated-sources|src/test)/.* \ -XepDisableWarningsInGeneratedCode \ -XepDisableAllWarnings \ diff --git a/server/base/pom.xml b/server/base/pom.xml index c20b3e6edce..02ffad85f7b 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -56,6 +56,10 @@ commons-codec commons-codec + + io.grpc + grpc-api + io.micrometer micrometer-core diff --git a/test/src/main/resources/log4j2-test.properties b/test/src/main/resources/log4j2-test.properties index ac62675d852..2c5e6c6bc8c 100644 --- a/test/src/main/resources/log4j2-test.properties +++ b/test/src/main/resources/log4j2-test.properties @@ -148,5 +148,8 @@ logger.40.level = trace logger.41.name = org.apache.accumulo.server.metadata logger.41.level = trace +logger.42.name = io.grpc.netty +logger.42.level = info + rootLogger.level = debug rootLogger.appenderRef.console.ref = STDOUT From 75eb46f84d02606de6d18a59fc490a79fb0967ea Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Sun, 30 Jun 2024 12:31:59 -0400 Subject: [PATCH 02/25] Add defintion and generate service/protocol for compaction service This adds the defintions we need for the getCompactionJob() API and adds the generated source --- .../main/proto/compaction-coordinator.proto | 146 ++ .../CompactionCoordinatorServiceGrpc.java | 353 +++ .../CompactionCoordinatorServiceProto.java | 252 ++ .../protobuf/CompactionJobRequest.java | 1210 ++++++++++ .../CompactionJobRequestOrBuilder.java | 94 + .../compaction/protobuf/PCompactionKind.java | 156 ++ .../compaction/protobuf/PCredentials.java | 1001 ++++++++ .../protobuf/PCredentialsOrBuilder.java | 90 + .../protobuf/PExternalCompactionJob.java | 2138 +++++++++++++++++ .../PExternalCompactionJobOrBuilder.java | 192 ++ .../core/compaction/protobuf/PFateId.java | 654 +++++ .../compaction/protobuf/PFateIdOrBuilder.java | 51 + .../protobuf/PFateInstanceType.java | 141 ++ .../core/compaction/protobuf/PInfo.java | 703 ++++++ .../compaction/protobuf/PInfoOrBuilder.java | 62 + .../core/compaction/protobuf/PInputFile.java | 796 ++++++ .../protobuf/PInputFileOrBuilder.java | 68 + .../compaction/protobuf/PIteratorConfig.java | 778 ++++++ .../protobuf/PIteratorConfigOrBuilder.java | 52 + .../compaction/protobuf/PIteratorSetting.java | 1041 ++++++++ .../protobuf/PIteratorSettingOrBuilder.java | 92 + .../core/compaction/protobuf/PKeyExtent.java | 702 ++++++ .../protobuf/PKeyExtentOrBuilder.java | 66 + .../protobuf/PNextCompactionJob.java | 683 ++++++ .../protobuf/PNextCompactionJobOrBuilder.java | 49 + 25 files changed, 11570 insertions(+) create mode 100644 core/src/main/proto/compaction-coordinator.proto create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfo.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfoOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java diff --git a/core/src/main/proto/compaction-coordinator.proto b/core/src/main/proto/compaction-coordinator.proto new file mode 100644 index 00000000000..528bebe4942 --- /dev/null +++ b/core/src/main/proto/compaction-coordinator.proto @@ -0,0 +1,146 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +syntax = "proto3"; + +option java_multiple_files = true; +option java_package = "org.apache.accumulo.core.compaction.protobuf"; +option java_outer_classname = "CompactionCoordinatorServiceProto"; + +package compaction_coordinator; + +// Interface exported by the server. +service CompactionCoordinatorService { + // A simple RPC. + // + // Obtains the feature at a given position. + // + // A feature with an empty name is returned if there's no feature at the given + // position. + rpc GetCompactionJob(CompactionJobRequest) returns (PNextCompactionJob) {} + + // A server-to-client streaming RPC. + // + // Obtains the Features available within the given Rectangle. Results are + // streamed rather than returned at once (e.g. in a response message with a + // repeated field), as the rectangle may cover a large area and contain a + // huge number of features. + //rpc ListFeatures(Rectangle) returns (stream Feature) {} + + // A client-to-server streaming RPC. + // + // Accepts a stream of Points on a route being traversed, returning a + // RouteSummary when traversal is completed. + //rpc RecordRoute(stream Point) returns (RouteSummary) {} + + // A Bidirectional streaming RPC. + // + // Accepts a stream of RouteNotes sent while a route is being traversed, + // while receiving other RouteNotes (e.g. from other users). + // rpc RouteChat(stream RouteNote) returns (stream RouteNote) {} +} + +message PInfo { + map headers = 1; +} + +// There are no nulls with Protobuf3, so the default will be an empty string +// Our TCredentials version with thrift currently is using/checking for null so +// using the optional field will generate "has" methods which we can use to +// check if the value was set +message PCredentials { + optional string principal = 1; + optional string tokenClassName = 2; + optional bytes token = 3; + optional string instanceId = 4; +} + +message PKeyExtent { + bytes table = 1; + // optional to generate hasEndRow() and hasPrevEndRow() becuase + // of no nulls in protobuf + optional bytes endRow = 2; + optional bytes prevEndRow = 3; +} + +message PInputFile { + // This is nullable in Thrift but I am not marking as optional as + // I think it should always be set + string metadataFileEntry = 1; + int64 size = 2; + int64 entries = 3; + int64 timestamp = 4; +} + +message PIteratorSetting { + int32 priority = 1; + string name = 2; + string iteratorClass = 3; + map properties = 4; +} + +message PIteratorConfig { + repeated PIteratorSetting iterators = 1; +} + +// We can't use the same values in the different enums if in the same +// package so add a prefix to the values +enum PCompactionKind { + // SELECTOR was removed and used to be zero + // However protobuf3 requires starting with 0 which is the default + CK_UNKNOWN = 0; + CK_SYSTEM = 1; + CK_USER = 2; +} + +enum PFateInstanceType { + FI_UNKNOWN = 0; + FI_META = 1; + FI_USER = 2; +} + +message PFateId { + PFateInstanceType type = 1; + string txUUIDStr = 2; +} + +message PExternalCompactionJob { + optional string externalCompactionId = 1; + optional PKeyExtent extent = 2; + repeated PInputFile files = 3; + optional PIteratorConfig iteratorSettings = 4; + optional string outputFile = 5; + optional bool propagateDeletes = 6; + optional PCompactionKind kind = 7; + optional PFateId fateId = 8; + map overrides = 9; +} + +message PNextCompactionJob { + PExternalCompactionJob job = 1; + int32 compactorCount = 2; +} + +message CompactionJobRequest { + PInfo pinfo = 1; + PCredentials credentials = 2; + string groupName = 3; + string compactor = 4; + string externalCompactionId = 5; +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java new file mode 100644 index 00000000000..4bd6c9b4b48 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java @@ -0,0 +1,353 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.accumulo.core.compaction.protobuf; + +import static io.grpc.MethodDescriptor.generateFullMethodName; + +/** + * 
+ * Interface exported by the server.
+ *
+ */ +@javax.annotation.Generated( + value = "by gRPC proto compiler (version 1.64.0)", + comments = "Source: compaction-coordinator.proto") +@io.grpc.stub.annotations.GrpcGenerated +public final class CompactionCoordinatorServiceGrpc { + + private CompactionCoordinatorServiceGrpc() {} + + public static final java.lang.String SERVICE_NAME = "compaction_coordinator.CompactionCoordinatorService"; + + // Static method descriptors that strictly reflect the proto. + private static volatile io.grpc.MethodDescriptor getGetCompactionJobMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetCompactionJob", + requestType = org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.class, + responseType = org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getGetCompactionJobMethod() { + io.grpc.MethodDescriptor getGetCompactionJobMethod; + if ((getGetCompactionJobMethod = CompactionCoordinatorServiceGrpc.getGetCompactionJobMethod) == null) { + synchronized (CompactionCoordinatorServiceGrpc.class) { + if ((getGetCompactionJobMethod = CompactionCoordinatorServiceGrpc.getGetCompactionJobMethod) == null) { + CompactionCoordinatorServiceGrpc.getGetCompactionJobMethod = getGetCompactionJobMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetCompactionJob")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.getDefaultInstance())) + .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("GetCompactionJob")) + .build(); + } + } + } + return getGetCompactionJobMethod; + } + + /** + * Creates a new async stub that supports all call types for the service + */ + public static CompactionCoordinatorServiceStub newStub(io.grpc.Channel channel) { + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public CompactionCoordinatorServiceStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new CompactionCoordinatorServiceStub(channel, callOptions); + } + }; + return CompactionCoordinatorServiceStub.newStub(factory, channel); + } + + /** + * Creates a new blocking-style stub that supports unary and streaming output calls on the service + */ + public static CompactionCoordinatorServiceBlockingStub newBlockingStub( + io.grpc.Channel channel) { + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public CompactionCoordinatorServiceBlockingStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new CompactionCoordinatorServiceBlockingStub(channel, callOptions); + } + }; + return CompactionCoordinatorServiceBlockingStub.newStub(factory, channel); + } + + /** + * Creates a new ListenableFuture-style stub that supports unary calls on the service + */ + public static CompactionCoordinatorServiceFutureStub newFutureStub( + io.grpc.Channel channel) { + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public CompactionCoordinatorServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new CompactionCoordinatorServiceFutureStub(channel, callOptions); + } + }; + return CompactionCoordinatorServiceFutureStub.newStub(factory, channel); + } + + /** + * 
+   * Interface exported by the server.
+   *
+ */ + public interface AsyncService { + + /** + * 
+     * A simple RPC.
+     * Obtains the feature at a given position.
+     * A feature with an empty name is returned if there's no feature at the given
+     * position.
+     *
+ */ + default void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetCompactionJobMethod(), responseObserver); + } + } + + /** + * Base class for the server implementation of the service CompactionCoordinatorService. + * 
+   * Interface exported by the server.
+   *
+ */ + public static abstract class CompactionCoordinatorServiceImplBase + implements io.grpc.BindableService, AsyncService { + + @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { + return CompactionCoordinatorServiceGrpc.bindService(this); + } + } + + /** + * A stub to allow clients to do asynchronous rpc calls to service CompactionCoordinatorService. + * 
+   * Interface exported by the server.
+   *
+ */ + public static final class CompactionCoordinatorServiceStub + extends io.grpc.stub.AbstractAsyncStub { + private CompactionCoordinatorServiceStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + super(channel, callOptions); + } + + @java.lang.Override + protected CompactionCoordinatorServiceStub build( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new CompactionCoordinatorServiceStub(channel, callOptions); + } + + /** + * 
+     * A simple RPC.
+     * Obtains the feature at a given position.
+     * A feature with an empty name is returned if there's no feature at the given
+     * position.
+     *
+ */ + public void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getGetCompactionJobMethod(), getCallOptions()), request, responseObserver); + } + } + + /** + * A stub to allow clients to do synchronous rpc calls to service CompactionCoordinatorService. + * 
+   * Interface exported by the server.
+   *
+ */ + public static final class CompactionCoordinatorServiceBlockingStub + extends io.grpc.stub.AbstractBlockingStub { + private CompactionCoordinatorServiceBlockingStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + super(channel, callOptions); + } + + @java.lang.Override + protected CompactionCoordinatorServiceBlockingStub build( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new CompactionCoordinatorServiceBlockingStub(channel, callOptions); + } + + /** + * 
+     * A simple RPC.
+     * Obtains the feature at a given position.
+     * A feature with an empty name is returned if there's no feature at the given
+     * position.
+     *
+ */ + public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getGetCompactionJobMethod(), getCallOptions(), request); + } + } + + /** + * A stub to allow clients to do ListenableFuture-style rpc calls to service CompactionCoordinatorService. + * 
+   * Interface exported by the server.
+   *
+ */ + public static final class CompactionCoordinatorServiceFutureStub + extends io.grpc.stub.AbstractFutureStub { + private CompactionCoordinatorServiceFutureStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + super(channel, callOptions); + } + + @java.lang.Override + protected CompactionCoordinatorServiceFutureStub build( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new CompactionCoordinatorServiceFutureStub(channel, callOptions); + } + + /** + * 
+     * A simple RPC.
+     * Obtains the feature at a given position.
+     * A feature with an empty name is returned if there's no feature at the given
+     * position.
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture getCompactionJob( + org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getGetCompactionJobMethod(), getCallOptions()), request); + } + } + + private static final int METHODID_GET_COMPACTION_JOB = 0; + + private static final class MethodHandlers implements + io.grpc.stub.ServerCalls.UnaryMethod, + io.grpc.stub.ServerCalls.ServerStreamingMethod, + io.grpc.stub.ServerCalls.ClientStreamingMethod, + io.grpc.stub.ServerCalls.BidiStreamingMethod { + private final AsyncService serviceImpl; + private final int methodId; + + MethodHandlers(AsyncService serviceImpl, int methodId) { + this.serviceImpl = serviceImpl; + this.methodId = methodId; + } + + @java.lang.Override + @java.lang.SuppressWarnings("unchecked") + public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { + switch (methodId) { + case METHODID_GET_COMPACTION_JOB: + serviceImpl.getCompactionJob((org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; + default: + throw new AssertionError(); + } + } + + @java.lang.Override + @java.lang.SuppressWarnings("unchecked") + public io.grpc.stub.StreamObserver invoke( + io.grpc.stub.StreamObserver responseObserver) { + switch (methodId) { + default: + throw new AssertionError(); + } + } + } + + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getGetCompactionJobMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest, + org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob>( + service, METHODID_GET_COMPACTION_JOB))) + .build(); + } + + private static abstract class CompactionCoordinatorServiceBaseDescriptorSupplier + implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { + CompactionCoordinatorServiceBaseDescriptorSupplier() {} + + @java.lang.Override + public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.getDescriptor(); + } + + @java.lang.Override + public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() { + return getFileDescriptor().findServiceByName("CompactionCoordinatorService"); + } + } + + private static final class CompactionCoordinatorServiceFileDescriptorSupplier + extends CompactionCoordinatorServiceBaseDescriptorSupplier { + CompactionCoordinatorServiceFileDescriptorSupplier() {} + } + + private static final class CompactionCoordinatorServiceMethodDescriptorSupplier + extends CompactionCoordinatorServiceBaseDescriptorSupplier + implements io.grpc.protobuf.ProtoMethodDescriptorSupplier { + private final java.lang.String methodName; + + CompactionCoordinatorServiceMethodDescriptorSupplier(java.lang.String methodName) { + this.methodName = methodName; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() { + return getServiceDescriptor().findMethodByName(methodName); + } + } + + private static volatile io.grpc.ServiceDescriptor serviceDescriptor; + + public static io.grpc.ServiceDescriptor getServiceDescriptor() { + io.grpc.ServiceDescriptor result = serviceDescriptor; + if (result == null) { + synchronized (CompactionCoordinatorServiceGrpc.class) { + result = serviceDescriptor; + if (result == null) { + serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME) + .setSchemaDescriptor(new CompactionCoordinatorServiceFileDescriptorSupplier()) + .addMethod(getGetCompactionJobMethod()) + .build(); + } + } + } + return result; + } +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java new file mode 100644 index 00000000000..e22a7638364 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java @@ -0,0 +1,252 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public final class CompactionCoordinatorServiceProto { + private CompactionCoordinatorServiceProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PInfo_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PInfo_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PInfo_HeadersEntry_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PInfo_HeadersEntry_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PCredentials_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PCredentials_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PKeyExtent_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PKeyExtent_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PInputFile_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PInputFile_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PIteratorSetting_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PIteratorSetting_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PIteratorConfig_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PIteratorConfig_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PFateId_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PFateId_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PExternalCompactionJob_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PExternalCompactionJob_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PNextCompactionJob_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_CompactionJobRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\034compaction-coordinator.proto\022\026compacti" + + "on_coordinator\"t\n\005PInfo\022;\n\007headers\030\001 \003(\013" + + "2*.compaction_coordinator.PInfo.HeadersE" + + "ntry\032.\n\014HeadersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" + + "ue\030\002 \001(\t:\0028\001\"\252\001\n\014PCredentials\022\026\n\tprincip" + + "al\030\001 \001(\tH\000\210\001\001\022\033\n\016tokenClassName\030\002 \001(\tH\001\210" + + "\001\001\022\022\n\005token\030\003 \001(\014H\002\210\001\001\022\027\n\ninstanceId\030\004 \001" + + "(\tH\003\210\001\001B\014\n\n_principalB\021\n\017_tokenClassName" + + "B\010\n\006_tokenB\r\n\013_instanceId\"c\n\nPKeyExtent\022" + + "\r\n\005table\030\001 \001(\014\022\023\n\006endRow\030\002 \001(\014H\000\210\001\001\022\027\n\np" + + "revEndRow\030\003 \001(\014H\001\210\001\001B\t\n\007_endRowB\r\n\013_prev" + + "EndRow\"Y\n\nPInputFile\022\031\n\021metadataFileEntr" + + "y\030\001 \001(\t\022\014\n\004size\030\002 \001(\003\022\017\n\007entries\030\003 \001(\003\022\021" + + "\n\ttimestamp\030\004 \001(\003\"\312\001\n\020PIteratorSetting\022\020" + + "\n\010priority\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\025\n\riterat" + + "orClass\030\003 \001(\t\022L\n\nproperties\030\004 \003(\01328.comp" + + "action_coordinator.PIteratorSetting.Prop" + + "ertiesEntry\0321\n\017PropertiesEntry\022\013\n\003key\030\001 " + + "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"N\n\017PIteratorConfi" + + "g\022;\n\titerators\030\001 \003(\0132(.compaction_coordi" + + "nator.PIteratorSetting\"U\n\007PFateId\0227\n\004typ" + + "e\030\001 \001(\0162).compaction_coordinator.PFateIn" + + "stanceType\022\021\n\ttxUUIDStr\030\002 \001(\t\"\216\005\n\026PExter" + + "nalCompactionJob\022!\n\024externalCompactionId" + + "\030\001 \001(\tH\000\210\001\001\0227\n\006extent\030\002 \001(\0132\".compaction" + + "_coordinator.PKeyExtentH\001\210\001\001\0221\n\005files\030\003 " + + "\003(\0132\".compaction_coordinator.PInputFile\022" + + "F\n\020iteratorSettings\030\004 \001(\0132\'.compaction_c" + + "oordinator.PIteratorConfigH\002\210\001\001\022\027\n\noutpu" + + "tFile\030\005 \001(\tH\003\210\001\001\022\035\n\020propagateDeletes\030\006 \001" + + "(\010H\004\210\001\001\022:\n\004kind\030\007 \001(\0162\'.compaction_coord" + + "inator.PCompactionKindH\005\210\001\001\0224\n\006fateId\030\010 " + + "\001(\0132\037.compaction_coordinator.PFateIdH\006\210\001" + + "\001\022P\n\toverrides\030\t \003(\0132=.compaction_coordi" + + "nator.PExternalCompactionJob.OverridesEn" + + "try\0320\n\016OverridesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" + + "lue\030\002 \001(\t:\0028\001B\027\n\025_externalCompactionIdB\t" + + "\n\007_extentB\023\n\021_iteratorSettingsB\r\n\013_outpu" + + "tFileB\023\n\021_propagateDeletesB\007\n\005_kindB\t\n\007_" + + "fateId\"i\n\022PNextCompactionJob\022;\n\003job\030\001 \001(" + + "\0132..compaction_coordinator.PExternalComp" + + "actionJob\022\026\n\016compactorCount\030\002 \001(\005\"\303\001\n\024Co" + + "mpactionJobRequest\022,\n\005pinfo\030\001 \001(\0132\035.comp" + + "action_coordinator.PInfo\0229\n\013credentials\030" + + "\002 \001(\0132$.compaction_coordinator.PCredenti" + + "als\022\021\n\tgroupName\030\003 \001(\t\022\021\n\tcompactor\030\004 \001(" + + "\t\022\034\n\024externalCompactionId\030\005 \001(\t*=\n\017PComp" + + "actionKind\022\016\n\nCK_UNKNOWN\020\000\022\r\n\tCK_SYSTEM\020" + + "\001\022\013\n\007CK_USER\020\002*=\n\021PFateInstanceType\022\016\n\nF" + + "I_UNKNOWN\020\000\022\013\n\007FI_META\020\001\022\013\n\007FI_USER\020\0022\216\001" + + "\n\034CompactionCoordinatorService\022n\n\020GetCom" + + "pactionJob\022,.compaction_coordinator.Comp" + + "actionJobRequest\032*.compaction_coordinato" + + "r.PNextCompactionJob\"\000BS\n,org.apache.acc" + + "umulo.core.compaction.protobufB!Compacti" + + "onCoordinatorServiceProtoP\001b\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_compaction_coordinator_PInfo_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_compaction_coordinator_PInfo_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PInfo_descriptor, + new java.lang.String[] { "Headers", }); + internal_static_compaction_coordinator_PInfo_HeadersEntry_descriptor = + internal_static_compaction_coordinator_PInfo_descriptor.getNestedTypes().get(0); + internal_static_compaction_coordinator_PInfo_HeadersEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PInfo_HeadersEntry_descriptor, + new java.lang.String[] { "Key", "Value", }); + internal_static_compaction_coordinator_PCredentials_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_compaction_coordinator_PCredentials_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PCredentials_descriptor, + new java.lang.String[] { "Principal", "TokenClassName", "Token", "InstanceId", }); + internal_static_compaction_coordinator_PKeyExtent_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_compaction_coordinator_PKeyExtent_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PKeyExtent_descriptor, + new java.lang.String[] { "Table", "EndRow", "PrevEndRow", }); + internal_static_compaction_coordinator_PInputFile_descriptor = + getDescriptor().getMessageTypes().get(3); + internal_static_compaction_coordinator_PInputFile_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PInputFile_descriptor, + new java.lang.String[] { "MetadataFileEntry", "Size", "Entries", "Timestamp", }); + internal_static_compaction_coordinator_PIteratorSetting_descriptor = + getDescriptor().getMessageTypes().get(4); + internal_static_compaction_coordinator_PIteratorSetting_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PIteratorSetting_descriptor, + new java.lang.String[] { "Priority", "Name", "IteratorClass", "Properties", }); + internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_descriptor = + internal_static_compaction_coordinator_PIteratorSetting_descriptor.getNestedTypes().get(0); + internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_descriptor, + new java.lang.String[] { "Key", "Value", }); + internal_static_compaction_coordinator_PIteratorConfig_descriptor = + getDescriptor().getMessageTypes().get(5); + internal_static_compaction_coordinator_PIteratorConfig_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PIteratorConfig_descriptor, + new java.lang.String[] { "Iterators", }); + internal_static_compaction_coordinator_PFateId_descriptor = + getDescriptor().getMessageTypes().get(6); + internal_static_compaction_coordinator_PFateId_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PFateId_descriptor, + new java.lang.String[] { "Type", "TxUUIDStr", }); + internal_static_compaction_coordinator_PExternalCompactionJob_descriptor = + getDescriptor().getMessageTypes().get(7); + internal_static_compaction_coordinator_PExternalCompactionJob_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PExternalCompactionJob_descriptor, + new java.lang.String[] { "ExternalCompactionId", "Extent", "Files", "IteratorSettings", "OutputFile", "PropagateDeletes", "Kind", "FateId", "Overrides", }); + internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_descriptor = + internal_static_compaction_coordinator_PExternalCompactionJob_descriptor.getNestedTypes().get(0); + internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_descriptor, + new java.lang.String[] { "Key", "Value", }); + internal_static_compaction_coordinator_PNextCompactionJob_descriptor = + getDescriptor().getMessageTypes().get(8); + internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PNextCompactionJob_descriptor, + new java.lang.String[] { "Job", "CompactorCount", }); + internal_static_compaction_coordinator_CompactionJobRequest_descriptor = + getDescriptor().getMessageTypes().get(9); + internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_CompactionJobRequest_descriptor, + new java.lang.String[] { "Pinfo", "Credentials", "GroupName", "Compactor", "ExternalCompactionId", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java new file mode 100644 index 00000000000..75b57aeaee2 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java @@ -0,0 +1,1210 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.CompactionJobRequest} + */ +public final class CompactionJobRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.CompactionJobRequest) + CompactionJobRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use CompactionJobRequest.newBuilder() to construct. + private CompactionJobRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private CompactionJobRequest() { + groupName_ = ""; + compactor_ = ""; + externalCompactionId_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new CompactionJobRequest(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.Builder.class); + } + + private int bitField0_; + public static final int PINFO_FIELD_NUMBER = 1; + private org.apache.accumulo.core.compaction.protobuf.PInfo pinfo_; + /** + * .compaction_coordinator.PInfo pinfo = 1; + * @return Whether the pinfo field is set. + */ + @java.lang.Override + public boolean hasPinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .compaction_coordinator.PInfo pinfo = 1; + * @return The pinfo. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInfo getPinfo() { + return pinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance() : pinfo_; + } + /** + * .compaction_coordinator.PInfo pinfo = 1; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder getPinfoOrBuilder() { + return pinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance() : pinfo_; + } + + public static final int CREDENTIALS_FIELD_NUMBER = 2; + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + /** + * .compaction_coordinator.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + @java.lang.Override + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .compaction_coordinator.PCredentials credentials = 2; + * @return The credentials. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + /** + * .compaction_coordinator.PCredentials credentials = 2; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + + public static final int GROUPNAME_FIELD_NUMBER = 3; + @SuppressWarnings("serial") + private volatile java.lang.Object groupName_ = ""; + /** + * string groupName = 3; + * @return The groupName. + */ + @java.lang.Override + public java.lang.String getGroupName() { + java.lang.Object ref = groupName_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + groupName_ = s; + return s; + } + } + /** + * string groupName = 3; + * @return The bytes for groupName. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getGroupNameBytes() { + java.lang.Object ref = groupName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + groupName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int COMPACTOR_FIELD_NUMBER = 4; + @SuppressWarnings("serial") + private volatile java.lang.Object compactor_ = ""; + /** + * string compactor = 4; + * @return The compactor. + */ + @java.lang.Override + public java.lang.String getCompactor() { + java.lang.Object ref = compactor_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + compactor_ = s; + return s; + } + } + /** + * string compactor = 4; + * @return The bytes for compactor. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getCompactorBytes() { + java.lang.Object ref = compactor_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + compactor_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int EXTERNALCOMPACTIONID_FIELD_NUMBER = 5; + @SuppressWarnings("serial") + private volatile java.lang.Object externalCompactionId_ = ""; + /** + * string externalCompactionId = 5; + * @return The externalCompactionId. + */ + @java.lang.Override + public java.lang.String getExternalCompactionId() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + externalCompactionId_ = s; + return s; + } + } + /** + * string externalCompactionId = 5; + * @return The bytes for externalCompactionId. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getExternalCompactionIdBytes() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + externalCompactionId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(1, getPinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + output.writeMessage(2, getCredentials()); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(groupName_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, groupName_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(compactor_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, compactor_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(externalCompactionId_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, externalCompactionId_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getPinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getCredentials()); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(groupName_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, groupName_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(compactor_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, compactor_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(externalCompactionId_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, externalCompactionId_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest other = (org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest) obj; + + if (hasPinfo() != other.hasPinfo()) return false; + if (hasPinfo()) { + if (!getPinfo() + .equals(other.getPinfo())) return false; + } + if (hasCredentials() != other.hasCredentials()) return false; + if (hasCredentials()) { + if (!getCredentials() + .equals(other.getCredentials())) return false; + } + if (!getGroupName() + .equals(other.getGroupName())) return false; + if (!getCompactor() + .equals(other.getCompactor())) return false; + if (!getExternalCompactionId() + .equals(other.getExternalCompactionId())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPinfo()) { + hash = (37 * hash) + PINFO_FIELD_NUMBER; + hash = (53 * hash) + getPinfo().hashCode(); + } + if (hasCredentials()) { + hash = (37 * hash) + CREDENTIALS_FIELD_NUMBER; + hash = (53 * hash) + getCredentials().hashCode(); + } + hash = (37 * hash) + GROUPNAME_FIELD_NUMBER; + hash = (53 * hash) + getGroupName().hashCode(); + hash = (37 * hash) + COMPACTOR_FIELD_NUMBER; + hash = (53 * hash) + getCompactor().hashCode(); + hash = (37 * hash) + EXTERNALCOMPACTIONID_FIELD_NUMBER; + hash = (53 * hash) + getExternalCompactionId().hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.CompactionJobRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.CompactionJobRequest) + org.apache.accumulo.core.compaction.protobuf.CompactionJobRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getPinfoFieldBuilder(); + getCredentialsFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + pinfo_ = null; + if (pinfoBuilder_ != null) { + pinfoBuilder_.dispose(); + pinfoBuilder_ = null; + } + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + groupName_ = ""; + compactor_ = ""; + externalCompactionId_ = ""; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest build() { + org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest buildPartial() { + org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest result = new org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.pinfo_ = pinfoBuilder_ == null + ? pinfo_ + : pinfoBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.credentials_ = credentialsBuilder_ == null + ? credentials_ + : credentialsBuilder_.build(); + to_bitField0_ |= 0x00000002; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.groupName_ = groupName_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.compactor_ = compactor_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.externalCompactionId_ = externalCompactionId_; + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest other) { + if (other == org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.getDefaultInstance()) return this; + if (other.hasPinfo()) { + mergePinfo(other.getPinfo()); + } + if (other.hasCredentials()) { + mergeCredentials(other.getCredentials()); + } + if (!other.getGroupName().isEmpty()) { + groupName_ = other.groupName_; + bitField0_ |= 0x00000004; + onChanged(); + } + if (!other.getCompactor().isEmpty()) { + compactor_ = other.compactor_; + bitField0_ |= 0x00000008; + onChanged(); + } + if (!other.getExternalCompactionId().isEmpty()) { + externalCompactionId_ = other.externalCompactionId_; + bitField0_ |= 0x00000010; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getPinfoFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + input.readMessage( + getCredentialsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + groupName_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 34: { + compactor_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000008; + break; + } // case 34 + case 42: { + externalCompactionId_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000010; + break; + } // case 42 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private org.apache.accumulo.core.compaction.protobuf.PInfo pinfo_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PInfo, org.apache.accumulo.core.compaction.protobuf.PInfo.Builder, org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder> pinfoBuilder_; + /** + * .compaction_coordinator.PInfo pinfo = 1; + * @return Whether the pinfo field is set. + */ + public boolean hasPinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .compaction_coordinator.PInfo pinfo = 1; + * @return The pinfo. + */ + public org.apache.accumulo.core.compaction.protobuf.PInfo getPinfo() { + if (pinfoBuilder_ == null) { + return pinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance() : pinfo_; + } else { + return pinfoBuilder_.getMessage(); + } + } + /** + * .compaction_coordinator.PInfo pinfo = 1; + */ + public Builder setPinfo(org.apache.accumulo.core.compaction.protobuf.PInfo value) { + if (pinfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + pinfo_ = value; + } else { + pinfoBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .compaction_coordinator.PInfo pinfo = 1; + */ + public Builder setPinfo( + org.apache.accumulo.core.compaction.protobuf.PInfo.Builder builderForValue) { + if (pinfoBuilder_ == null) { + pinfo_ = builderForValue.build(); + } else { + pinfoBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .compaction_coordinator.PInfo pinfo = 1; + */ + public Builder mergePinfo(org.apache.accumulo.core.compaction.protobuf.PInfo value) { + if (pinfoBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + pinfo_ != null && + pinfo_ != org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance()) { + getPinfoBuilder().mergeFrom(value); + } else { + pinfo_ = value; + } + } else { + pinfoBuilder_.mergeFrom(value); + } + if (pinfo_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } + return this; + } + /** + * .compaction_coordinator.PInfo pinfo = 1; + */ + public Builder clearPinfo() { + bitField0_ = (bitField0_ & ~0x00000001); + pinfo_ = null; + if (pinfoBuilder_ != null) { + pinfoBuilder_.dispose(); + pinfoBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .compaction_coordinator.PInfo pinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.PInfo.Builder getPinfoBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getPinfoFieldBuilder().getBuilder(); + } + /** + * .compaction_coordinator.PInfo pinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder getPinfoOrBuilder() { + if (pinfoBuilder_ != null) { + return pinfoBuilder_.getMessageOrBuilder(); + } else { + return pinfo_ == null ? + org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance() : pinfo_; + } + } + /** + * .compaction_coordinator.PInfo pinfo = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PInfo, org.apache.accumulo.core.compaction.protobuf.PInfo.Builder, org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder> + getPinfoFieldBuilder() { + if (pinfoBuilder_ == null) { + pinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PInfo, org.apache.accumulo.core.compaction.protobuf.PInfo.Builder, org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder>( + getPinfo(), + getParentForChildren(), + isClean()); + pinfo_ = null; + } + return pinfoBuilder_; + } + + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; + /** + * .compaction_coordinator.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .compaction_coordinator.PCredentials credentials = 2; + * @return The credentials. + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + if (credentialsBuilder_ == null) { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } else { + return credentialsBuilder_.getMessage(); + } + } + /** + * .compaction_coordinator.PCredentials credentials = 2; + */ + public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + credentials_ = value; + } else { + credentialsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .compaction_coordinator.PCredentials credentials = 2; + */ + public Builder setCredentials( + org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) { + if (credentialsBuilder_ == null) { + credentials_ = builderForValue.build(); + } else { + credentialsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .compaction_coordinator.PCredentials credentials = 2; + */ + public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0) && + credentials_ != null && + credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) { + getCredentialsBuilder().mergeFrom(value); + } else { + credentials_ = value; + } + } else { + credentialsBuilder_.mergeFrom(value); + } + if (credentials_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } + return this; + } + /** + * .compaction_coordinator.PCredentials credentials = 2; + */ + public Builder clearCredentials() { + bitField0_ = (bitField0_ & ~0x00000002); + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .compaction_coordinator.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getCredentialsFieldBuilder().getBuilder(); + } + /** + * .compaction_coordinator.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + if (credentialsBuilder_ != null) { + return credentialsBuilder_.getMessageOrBuilder(); + } else { + return credentials_ == null ? + org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + } + /** + * .compaction_coordinator.PCredentials credentials = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> + getCredentialsFieldBuilder() { + if (credentialsBuilder_ == null) { + credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>( + getCredentials(), + getParentForChildren(), + isClean()); + credentials_ = null; + } + return credentialsBuilder_; + } + + private java.lang.Object groupName_ = ""; + /** + * string groupName = 3; + * @return The groupName. + */ + public java.lang.String getGroupName() { + java.lang.Object ref = groupName_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + groupName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string groupName = 3; + * @return The bytes for groupName. + */ + public com.google.protobuf.ByteString + getGroupNameBytes() { + java.lang.Object ref = groupName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + groupName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string groupName = 3; + * @param value The groupName to set. + * @return This builder for chaining. + */ + public Builder setGroupName( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + groupName_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * string groupName = 3; + * @return This builder for chaining. + */ + public Builder clearGroupName() { + groupName_ = getDefaultInstance().getGroupName(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + return this; + } + /** + * string groupName = 3; + * @param value The bytes for groupName to set. + * @return This builder for chaining. + */ + public Builder setGroupNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + groupName_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + + private java.lang.Object compactor_ = ""; + /** + * string compactor = 4; + * @return The compactor. + */ + public java.lang.String getCompactor() { + java.lang.Object ref = compactor_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + compactor_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string compactor = 4; + * @return The bytes for compactor. + */ + public com.google.protobuf.ByteString + getCompactorBytes() { + java.lang.Object ref = compactor_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + compactor_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string compactor = 4; + * @param value The compactor to set. + * @return This builder for chaining. + */ + public Builder setCompactor( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + compactor_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * string compactor = 4; + * @return This builder for chaining. + */ + public Builder clearCompactor() { + compactor_ = getDefaultInstance().getCompactor(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + return this; + } + /** + * string compactor = 4; + * @param value The bytes for compactor to set. + * @return This builder for chaining. + */ + public Builder setCompactorBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + compactor_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + + private java.lang.Object externalCompactionId_ = ""; + /** + * string externalCompactionId = 5; + * @return The externalCompactionId. + */ + public java.lang.String getExternalCompactionId() { + java.lang.Object ref = externalCompactionId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + externalCompactionId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string externalCompactionId = 5; + * @return The bytes for externalCompactionId. + */ + public com.google.protobuf.ByteString + getExternalCompactionIdBytes() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + externalCompactionId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string externalCompactionId = 5; + * @param value The externalCompactionId to set. + * @return This builder for chaining. + */ + public Builder setExternalCompactionId( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + externalCompactionId_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * string externalCompactionId = 5; + * @return This builder for chaining. + */ + public Builder clearExternalCompactionId() { + externalCompactionId_ = getDefaultInstance().getExternalCompactionId(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + return this; + } + /** + * string externalCompactionId = 5; + * @param value The bytes for externalCompactionId to set. + * @return This builder for chaining. + */ + public Builder setExternalCompactionIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + externalCompactionId_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.CompactionJobRequest) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.CompactionJobRequest) + private static final org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest(); + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public CompactionJobRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java new file mode 100644 index 00000000000..defd26f12bd --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java @@ -0,0 +1,94 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface CompactionJobRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.CompactionJobRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * .compaction_coordinator.PInfo pinfo = 1; + * @return Whether the pinfo field is set. + */ + boolean hasPinfo(); + /** + * .compaction_coordinator.PInfo pinfo = 1; + * @return The pinfo. + */ + org.apache.accumulo.core.compaction.protobuf.PInfo getPinfo(); + /** + * .compaction_coordinator.PInfo pinfo = 1; + */ + org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder getPinfoOrBuilder(); + + /** + * .compaction_coordinator.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + boolean hasCredentials(); + /** + * .compaction_coordinator.PCredentials credentials = 2; + * @return The credentials. + */ + org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(); + /** + * .compaction_coordinator.PCredentials credentials = 2; + */ + org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); + + /** + * string groupName = 3; + * @return The groupName. + */ + java.lang.String getGroupName(); + /** + * string groupName = 3; + * @return The bytes for groupName. + */ + com.google.protobuf.ByteString + getGroupNameBytes(); + + /** + * string compactor = 4; + * @return The compactor. + */ + java.lang.String getCompactor(); + /** + * string compactor = 4; + * @return The bytes for compactor. + */ + com.google.protobuf.ByteString + getCompactorBytes(); + + /** + * string externalCompactionId = 5; + * @return The externalCompactionId. + */ + java.lang.String getExternalCompactionId(); + /** + * string externalCompactionId = 5; + * @return The bytes for externalCompactionId. + */ + com.google.protobuf.ByteString + getExternalCompactionIdBytes(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java new file mode 100644 index 00000000000..a4d063f0b54 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java @@ -0,0 +1,156 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * 
+ * We can't use the same values in the different enums if in the same
+ * package so add a prefix to the values
+ *
+ * + * Protobuf enum {@code compaction_coordinator.PCompactionKind} + */ +public enum PCompactionKind + implements com.google.protobuf.ProtocolMessageEnum { + /** + * 
+   * SELECTOR was removed and used to be zero
+   * However protobuf3 requires starting with 0 which is the default
+   *
+ * + * CK_UNKNOWN = 0; + */ + CK_UNKNOWN(0), + /** + * CK_SYSTEM = 1; + */ + CK_SYSTEM(1), + /** + * CK_USER = 2; + */ + CK_USER(2), + UNRECOGNIZED(-1), + ; + + /** + * 
+   * SELECTOR was removed and used to be zero
+   * However protobuf3 requires starting with 0 which is the default
+   *
+ * + * CK_UNKNOWN = 0; + */ + public static final int CK_UNKNOWN_VALUE = 0; + /** + * CK_SYSTEM = 1; + */ + public static final int CK_SYSTEM_VALUE = 1; + /** + * CK_USER = 2; + */ + public static final int CK_USER_VALUE = 2; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static PCompactionKind valueOf(int value) { + return forNumber(value); + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + */ + public static PCompactionKind forNumber(int value) { + switch (value) { + case 0: return CK_UNKNOWN; + case 1: return CK_SYSTEM; + case 2: return CK_USER; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + PCompactionKind> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public PCompactionKind findValueByNumber(int number) { + return PCompactionKind.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.getDescriptor().getEnumTypes().get(0); + } + + private static final PCompactionKind[] VALUES = values(); + + public static PCompactionKind valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private PCompactionKind(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:compaction_coordinator.PCompactionKind) +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java new file mode 100644 index 00000000000..72dc09dcfe1 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java @@ -0,0 +1,1001 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * 
+ * There are no nulls with Protobuf3, so the default will be an empty string
+ * Our TCredentials version with thrift currently is using/checking for null so
+ * using the optional field will generate "has" methods which we can use to
+ * check if the value was set
+ *
+ * + * Protobuf type {@code compaction_coordinator.PCredentials} + */ +public final class PCredentials extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.PCredentials) + PCredentialsOrBuilder { +private static final long serialVersionUID = 0L; + // Use PCredentials.newBuilder() to construct. + private PCredentials(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PCredentials() { + principal_ = ""; + tokenClassName_ = ""; + token_ = com.google.protobuf.ByteString.EMPTY; + instanceId_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PCredentials(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCredentials_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCredentials_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PCredentials.class, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder.class); + } + + private int bitField0_; + public static final int PRINCIPAL_FIELD_NUMBER = 1; + @SuppressWarnings("serial") + private volatile java.lang.Object principal_ = ""; + /** + * optional string principal = 1; + * @return Whether the principal field is set. + */ + @java.lang.Override + public boolean hasPrincipal() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * optional string principal = 1; + * @return The principal. + */ + @java.lang.Override + public java.lang.String getPrincipal() { + java.lang.Object ref = principal_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + principal_ = s; + return s; + } + } + /** + * optional string principal = 1; + * @return The bytes for principal. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getPrincipalBytes() { + java.lang.Object ref = principal_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + principal_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int TOKENCLASSNAME_FIELD_NUMBER = 2; + @SuppressWarnings("serial") + private volatile java.lang.Object tokenClassName_ = ""; + /** + * optional string tokenClassName = 2; + * @return Whether the tokenClassName field is set. + */ + @java.lang.Override + public boolean hasTokenClassName() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * optional string tokenClassName = 2; + * @return The tokenClassName. + */ + @java.lang.Override + public java.lang.String getTokenClassName() { + java.lang.Object ref = tokenClassName_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + tokenClassName_ = s; + return s; + } + } + /** + * optional string tokenClassName = 2; + * @return The bytes for tokenClassName. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getTokenClassNameBytes() { + java.lang.Object ref = tokenClassName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + tokenClassName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int TOKEN_FIELD_NUMBER = 3; + private com.google.protobuf.ByteString token_ = com.google.protobuf.ByteString.EMPTY; + /** + * optional bytes token = 3; + * @return Whether the token field is set. + */ + @java.lang.Override + public boolean hasToken() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * optional bytes token = 3; + * @return The token. + */ + @java.lang.Override + public com.google.protobuf.ByteString getToken() { + return token_; + } + + public static final int INSTANCEID_FIELD_NUMBER = 4; + @SuppressWarnings("serial") + private volatile java.lang.Object instanceId_ = ""; + /** + * optional string instanceId = 4; + * @return Whether the instanceId field is set. + */ + @java.lang.Override + public boolean hasInstanceId() { + return ((bitField0_ & 0x00000008) != 0); + } + /** + * optional string instanceId = 4; + * @return The instanceId. + */ + @java.lang.Override + public java.lang.String getInstanceId() { + java.lang.Object ref = instanceId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + instanceId_ = s; + return s; + } + } + /** + * optional string instanceId = 4; + * @return The bytes for instanceId. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getInstanceIdBytes() { + java.lang.Object ref = instanceId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + instanceId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, principal_); + } + if (((bitField0_ & 0x00000002) != 0)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, tokenClassName_); + } + if (((bitField0_ & 0x00000004) != 0)) { + output.writeBytes(3, token_); + } + if (((bitField0_ & 0x00000008) != 0)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, instanceId_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, principal_); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, tokenClassName_); + } + if (((bitField0_ & 0x00000004) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(3, token_); + } + if (((bitField0_ & 0x00000008) != 0)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, instanceId_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PCredentials)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.PCredentials other = (org.apache.accumulo.core.compaction.protobuf.PCredentials) obj; + + if (hasPrincipal() != other.hasPrincipal()) return false; + if (hasPrincipal()) { + if (!getPrincipal() + .equals(other.getPrincipal())) return false; + } + if (hasTokenClassName() != other.hasTokenClassName()) return false; + if (hasTokenClassName()) { + if (!getTokenClassName() + .equals(other.getTokenClassName())) return false; + } + if (hasToken() != other.hasToken()) return false; + if (hasToken()) { + if (!getToken() + .equals(other.getToken())) return false; + } + if (hasInstanceId() != other.hasInstanceId()) return false; + if (hasInstanceId()) { + if (!getInstanceId() + .equals(other.getInstanceId())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPrincipal()) { + hash = (37 * hash) + PRINCIPAL_FIELD_NUMBER; + hash = (53 * hash) + getPrincipal().hashCode(); + } + if (hasTokenClassName()) { + hash = (37 * hash) + TOKENCLASSNAME_FIELD_NUMBER; + hash = (53 * hash) + getTokenClassName().hashCode(); + } + if (hasToken()) { + hash = (37 * hash) + TOKEN_FIELD_NUMBER; + hash = (53 * hash) + getToken().hashCode(); + } + if (hasInstanceId()) { + hash = (37 * hash) + INSTANCEID_FIELD_NUMBER; + hash = (53 * hash) + getInstanceId().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PCredentials prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+   * There are no nulls with Protobuf3, so the default will be an empty string
+   * Our TCredentials version with thrift currently is using/checking for null so
+   * using the optional field will generate "has" methods which we can use to
+   * check if the value was set
+   *
+ * + * Protobuf type {@code compaction_coordinator.PCredentials} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.PCredentials) + org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCredentials_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCredentials_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PCredentials.class, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.PCredentials.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + principal_ = ""; + tokenClassName_ = ""; + token_ = com.google.protobuf.ByteString.EMPTY; + instanceId_ = ""; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCredentials_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentials getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentials build() { + org.apache.accumulo.core.compaction.protobuf.PCredentials result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentials buildPartial() { + org.apache.accumulo.core.compaction.protobuf.PCredentials result = new org.apache.accumulo.core.compaction.protobuf.PCredentials(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PCredentials result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.principal_ = principal_; + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.tokenClassName_ = tokenClassName_; + to_bitField0_ |= 0x00000002; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.token_ = token_; + to_bitField0_ |= 0x00000004; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.instanceId_ = instanceId_; + to_bitField0_ |= 0x00000008; + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.PCredentials) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PCredentials)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PCredentials other) { + if (other == org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) return this; + if (other.hasPrincipal()) { + principal_ = other.principal_; + bitField0_ |= 0x00000001; + onChanged(); + } + if (other.hasTokenClassName()) { + tokenClassName_ = other.tokenClassName_; + bitField0_ |= 0x00000002; + onChanged(); + } + if (other.hasToken()) { + setToken(other.getToken()); + } + if (other.hasInstanceId()) { + instanceId_ = other.instanceId_; + bitField0_ |= 0x00000008; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + principal_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + tokenClassName_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + token_ = input.readBytes(); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 34: { + instanceId_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000008; + break; + } // case 34 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private java.lang.Object principal_ = ""; + /** + * optional string principal = 1; + * @return Whether the principal field is set. + */ + public boolean hasPrincipal() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * optional string principal = 1; + * @return The principal. + */ + public java.lang.String getPrincipal() { + java.lang.Object ref = principal_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + principal_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string principal = 1; + * @return The bytes for principal. + */ + public com.google.protobuf.ByteString + getPrincipalBytes() { + java.lang.Object ref = principal_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + principal_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string principal = 1; + * @param value The principal to set. + * @return This builder for chaining. + */ + public Builder setPrincipal( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + principal_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * optional string principal = 1; + * @return This builder for chaining. + */ + public Builder clearPrincipal() { + principal_ = getDefaultInstance().getPrincipal(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + /** + * optional string principal = 1; + * @param value The bytes for principal to set. + * @return This builder for chaining. + */ + public Builder setPrincipalBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + principal_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + + private java.lang.Object tokenClassName_ = ""; + /** + * optional string tokenClassName = 2; + * @return Whether the tokenClassName field is set. + */ + public boolean hasTokenClassName() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * optional string tokenClassName = 2; + * @return The tokenClassName. + */ + public java.lang.String getTokenClassName() { + java.lang.Object ref = tokenClassName_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + tokenClassName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string tokenClassName = 2; + * @return The bytes for tokenClassName. + */ + public com.google.protobuf.ByteString + getTokenClassNameBytes() { + java.lang.Object ref = tokenClassName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + tokenClassName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string tokenClassName = 2; + * @param value The tokenClassName to set. + * @return This builder for chaining. + */ + public Builder setTokenClassName( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + tokenClassName_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * optional string tokenClassName = 2; + * @return This builder for chaining. + */ + public Builder clearTokenClassName() { + tokenClassName_ = getDefaultInstance().getTokenClassName(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + * optional string tokenClassName = 2; + * @param value The bytes for tokenClassName to set. + * @return This builder for chaining. + */ + public Builder setTokenClassNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + tokenClassName_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + + private com.google.protobuf.ByteString token_ = com.google.protobuf.ByteString.EMPTY; + /** + * optional bytes token = 3; + * @return Whether the token field is set. + */ + @java.lang.Override + public boolean hasToken() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * optional bytes token = 3; + * @return The token. + */ + @java.lang.Override + public com.google.protobuf.ByteString getToken() { + return token_; + } + /** + * optional bytes token = 3; + * @param value The token to set. + * @return This builder for chaining. + */ + public Builder setToken(com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + token_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * optional bytes token = 3; + * @return This builder for chaining. + */ + public Builder clearToken() { + bitField0_ = (bitField0_ & ~0x00000004); + token_ = getDefaultInstance().getToken(); + onChanged(); + return this; + } + + private java.lang.Object instanceId_ = ""; + /** + * optional string instanceId = 4; + * @return Whether the instanceId field is set. + */ + public boolean hasInstanceId() { + return ((bitField0_ & 0x00000008) != 0); + } + /** + * optional string instanceId = 4; + * @return The instanceId. + */ + public java.lang.String getInstanceId() { + java.lang.Object ref = instanceId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + instanceId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string instanceId = 4; + * @return The bytes for instanceId. + */ + public com.google.protobuf.ByteString + getInstanceIdBytes() { + java.lang.Object ref = instanceId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + instanceId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string instanceId = 4; + * @param value The instanceId to set. + * @return This builder for chaining. + */ + public Builder setInstanceId( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + instanceId_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * optional string instanceId = 4; + * @return This builder for chaining. + */ + public Builder clearInstanceId() { + instanceId_ = getDefaultInstance().getInstanceId(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + return this; + } + /** + * optional string instanceId = 4; + * @param value The bytes for instanceId to set. + * @return This builder for chaining. + */ + public Builder setInstanceIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + instanceId_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.PCredentials) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.PCredentials) + private static final org.apache.accumulo.core.compaction.protobuf.PCredentials DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PCredentials(); + } + + public static org.apache.accumulo.core.compaction.protobuf.PCredentials getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PCredentials parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentials getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java new file mode 100644 index 00000000000..8943894a9d0 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java @@ -0,0 +1,90 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface PCredentialsOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.PCredentials) + com.google.protobuf.MessageOrBuilder { + + /** + * optional string principal = 1; + * @return Whether the principal field is set. + */ + boolean hasPrincipal(); + /** + * optional string principal = 1; + * @return The principal. + */ + java.lang.String getPrincipal(); + /** + * optional string principal = 1; + * @return The bytes for principal. + */ + com.google.protobuf.ByteString + getPrincipalBytes(); + + /** + * optional string tokenClassName = 2; + * @return Whether the tokenClassName field is set. + */ + boolean hasTokenClassName(); + /** + * optional string tokenClassName = 2; + * @return The tokenClassName. + */ + java.lang.String getTokenClassName(); + /** + * optional string tokenClassName = 2; + * @return The bytes for tokenClassName. + */ + com.google.protobuf.ByteString + getTokenClassNameBytes(); + + /** + * optional bytes token = 3; + * @return Whether the token field is set. + */ + boolean hasToken(); + /** + * optional bytes token = 3; + * @return The token. + */ + com.google.protobuf.ByteString getToken(); + + /** + * optional string instanceId = 4; + * @return Whether the instanceId field is set. + */ + boolean hasInstanceId(); + /** + * optional string instanceId = 4; + * @return The instanceId. + */ + java.lang.String getInstanceId(); + /** + * optional string instanceId = 4; + * @return The bytes for instanceId. + */ + com.google.protobuf.ByteString + getInstanceIdBytes(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java new file mode 100644 index 00000000000..5402ffccd88 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java @@ -0,0 +1,2138 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.PExternalCompactionJob} + */ +public final class PExternalCompactionJob extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.PExternalCompactionJob) + PExternalCompactionJobOrBuilder { +private static final long serialVersionUID = 0L; + // Use PExternalCompactionJob.newBuilder() to construct. + private PExternalCompactionJob(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PExternalCompactionJob() { + externalCompactionId_ = ""; + files_ = java.util.Collections.emptyList(); + outputFile_ = ""; + kind_ = 0; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PExternalCompactionJob(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + @java.lang.Override + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection( + int number) { + switch (number) { + case 9: + return internalGetOverrides(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder.class); + } + + private int bitField0_; + public static final int EXTERNALCOMPACTIONID_FIELD_NUMBER = 1; + @SuppressWarnings("serial") + private volatile java.lang.Object externalCompactionId_ = ""; + /** + * optional string externalCompactionId = 1; + * @return Whether the externalCompactionId field is set. + */ + @java.lang.Override + public boolean hasExternalCompactionId() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * optional string externalCompactionId = 1; + * @return The externalCompactionId. + */ + @java.lang.Override + public java.lang.String getExternalCompactionId() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + externalCompactionId_ = s; + return s; + } + } + /** + * optional string externalCompactionId = 1; + * @return The bytes for externalCompactionId. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getExternalCompactionIdBytes() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + externalCompactionId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int EXTENT_FIELD_NUMBER = 2; + private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_; + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + * @return Whether the extent field is set. + */ + @java.lang.Override + public boolean hasExtent() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + * @return The extent. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { + return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { + return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } + + public static final int FILES_FIELD_NUMBER = 3; + @SuppressWarnings("serial") + private java.util.List files_; + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + @java.lang.Override + public java.util.List getFilesList() { + return files_; + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + @java.lang.Override + public java.util.List + getFilesOrBuilderList() { + return files_; + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + @java.lang.Override + public int getFilesCount() { + return files_.size(); + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index) { + return files_.get(index); + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder( + int index) { + return files_.get(index); + } + + public static final int ITERATORSETTINGS_FIELD_NUMBER = 4; + private org.apache.accumulo.core.compaction.protobuf.PIteratorConfig iteratorSettings_; + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * @return Whether the iteratorSettings field is set. + */ + @java.lang.Override + public boolean hasIteratorSettings() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * @return The iteratorSettings. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorSettings() { + return iteratorSettings_ == null ? org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_; + } + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder() { + return iteratorSettings_ == null ? org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_; + } + + public static final int OUTPUTFILE_FIELD_NUMBER = 5; + @SuppressWarnings("serial") + private volatile java.lang.Object outputFile_ = ""; + /** + * optional string outputFile = 5; + * @return Whether the outputFile field is set. + */ + @java.lang.Override + public boolean hasOutputFile() { + return ((bitField0_ & 0x00000008) != 0); + } + /** + * optional string outputFile = 5; + * @return The outputFile. + */ + @java.lang.Override + public java.lang.String getOutputFile() { + java.lang.Object ref = outputFile_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + outputFile_ = s; + return s; + } + } + /** + * optional string outputFile = 5; + * @return The bytes for outputFile. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getOutputFileBytes() { + java.lang.Object ref = outputFile_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + outputFile_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int PROPAGATEDELETES_FIELD_NUMBER = 6; + private boolean propagateDeletes_ = false; + /** + * optional bool propagateDeletes = 6; + * @return Whether the propagateDeletes field is set. + */ + @java.lang.Override + public boolean hasPropagateDeletes() { + return ((bitField0_ & 0x00000010) != 0); + } + /** + * optional bool propagateDeletes = 6; + * @return The propagateDeletes. + */ + @java.lang.Override + public boolean getPropagateDeletes() { + return propagateDeletes_; + } + + public static final int KIND_FIELD_NUMBER = 7; + private int kind_ = 0; + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @return Whether the kind field is set. + */ + @java.lang.Override public boolean hasKind() { + return ((bitField0_ & 0x00000020) != 0); + } + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @return The enum numeric value on the wire for kind. + */ + @java.lang.Override public int getKindValue() { + return kind_; + } + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @return The kind. + */ + @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind() { + org.apache.accumulo.core.compaction.protobuf.PCompactionKind result = org.apache.accumulo.core.compaction.protobuf.PCompactionKind.forNumber(kind_); + return result == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionKind.UNRECOGNIZED : result; + } + + public static final int FATEID_FIELD_NUMBER = 8; + private org.apache.accumulo.core.compaction.protobuf.PFateId fateId_; + /** + * optional .compaction_coordinator.PFateId fateId = 8; + * @return Whether the fateId field is set. + */ + @java.lang.Override + public boolean hasFateId() { + return ((bitField0_ & 0x00000040) != 0); + } + /** + * optional .compaction_coordinator.PFateId fateId = 8; + * @return The fateId. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PFateId getFateId() { + return fateId_ == null ? org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance() : fateId_; + } + /** + * optional .compaction_coordinator.PFateId fateId = 8; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder() { + return fateId_ == null ? org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance() : fateId_; + } + + public static final int OVERRIDES_FIELD_NUMBER = 9; + private static final class OverridesDefaultEntryHolder { + static final com.google.protobuf.MapEntry< + java.lang.String, java.lang.String> defaultEntry = + com.google.protobuf.MapEntry + .newDefaultInstance( + org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_descriptor, + com.google.protobuf.WireFormat.FieldType.STRING, + "", + com.google.protobuf.WireFormat.FieldType.STRING, + ""); + } + @SuppressWarnings("serial") + private com.google.protobuf.MapField< + java.lang.String, java.lang.String> overrides_; + private com.google.protobuf.MapField + internalGetOverrides() { + if (overrides_ == null) { + return com.google.protobuf.MapField.emptyMapField( + OverridesDefaultEntryHolder.defaultEntry); + } + return overrides_; + } + public int getOverridesCount() { + return internalGetOverrides().getMap().size(); + } + /** + * map<string, string> overrides = 9; + */ + @java.lang.Override + public boolean containsOverrides( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + return internalGetOverrides().getMap().containsKey(key); + } + /** + * Use {@link #getOverridesMap()} instead. + */ + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getOverrides() { + return getOverridesMap(); + } + /** + * map<string, string> overrides = 9; + */ + @java.lang.Override + public java.util.Map getOverridesMap() { + return internalGetOverrides().getMap(); + } + /** + * map<string, string> overrides = 9; + */ + @java.lang.Override + public /* nullable */ +java.lang.String getOverridesOrDefault( + java.lang.String key, + /* nullable */ +java.lang.String defaultValue) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetOverrides().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * map<string, string> overrides = 9; + */ + @java.lang.Override + public java.lang.String getOverridesOrThrow( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetOverrides().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, externalCompactionId_); + } + if (((bitField0_ & 0x00000002) != 0)) { + output.writeMessage(2, getExtent()); + } + for (int i = 0; i < files_.size(); i++) { + output.writeMessage(3, files_.get(i)); + } + if (((bitField0_ & 0x00000004) != 0)) { + output.writeMessage(4, getIteratorSettings()); + } + if (((bitField0_ & 0x00000008) != 0)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, outputFile_); + } + if (((bitField0_ & 0x00000010) != 0)) { + output.writeBool(6, propagateDeletes_); + } + if (((bitField0_ & 0x00000020) != 0)) { + output.writeEnum(7, kind_); + } + if (((bitField0_ & 0x00000040) != 0)) { + output.writeMessage(8, getFateId()); + } + com.google.protobuf.GeneratedMessageV3 + .serializeStringMapTo( + output, + internalGetOverrides(), + OverridesDefaultEntryHolder.defaultEntry, + 9); + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, externalCompactionId_); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getExtent()); + } + for (int i = 0; i < files_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, files_.get(i)); + } + if (((bitField0_ & 0x00000004) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, getIteratorSettings()); + } + if (((bitField0_ & 0x00000008) != 0)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, outputFile_); + } + if (((bitField0_ & 0x00000010) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(6, propagateDeletes_); + } + if (((bitField0_ & 0x00000020) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(7, kind_); + } + if (((bitField0_ & 0x00000040) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(8, getFateId()); + } + for (java.util.Map.Entry entry + : internalGetOverrides().getMap().entrySet()) { + com.google.protobuf.MapEntry + overrides__ = OverridesDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(9, overrides__); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob other = (org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob) obj; + + if (hasExternalCompactionId() != other.hasExternalCompactionId()) return false; + if (hasExternalCompactionId()) { + if (!getExternalCompactionId() + .equals(other.getExternalCompactionId())) return false; + } + if (hasExtent() != other.hasExtent()) return false; + if (hasExtent()) { + if (!getExtent() + .equals(other.getExtent())) return false; + } + if (!getFilesList() + .equals(other.getFilesList())) return false; + if (hasIteratorSettings() != other.hasIteratorSettings()) return false; + if (hasIteratorSettings()) { + if (!getIteratorSettings() + .equals(other.getIteratorSettings())) return false; + } + if (hasOutputFile() != other.hasOutputFile()) return false; + if (hasOutputFile()) { + if (!getOutputFile() + .equals(other.getOutputFile())) return false; + } + if (hasPropagateDeletes() != other.hasPropagateDeletes()) return false; + if (hasPropagateDeletes()) { + if (getPropagateDeletes() + != other.getPropagateDeletes()) return false; + } + if (hasKind() != other.hasKind()) return false; + if (hasKind()) { + if (kind_ != other.kind_) return false; + } + if (hasFateId() != other.hasFateId()) return false; + if (hasFateId()) { + if (!getFateId() + .equals(other.getFateId())) return false; + } + if (!internalGetOverrides().equals( + other.internalGetOverrides())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasExternalCompactionId()) { + hash = (37 * hash) + EXTERNALCOMPACTIONID_FIELD_NUMBER; + hash = (53 * hash) + getExternalCompactionId().hashCode(); + } + if (hasExtent()) { + hash = (37 * hash) + EXTENT_FIELD_NUMBER; + hash = (53 * hash) + getExtent().hashCode(); + } + if (getFilesCount() > 0) { + hash = (37 * hash) + FILES_FIELD_NUMBER; + hash = (53 * hash) + getFilesList().hashCode(); + } + if (hasIteratorSettings()) { + hash = (37 * hash) + ITERATORSETTINGS_FIELD_NUMBER; + hash = (53 * hash) + getIteratorSettings().hashCode(); + } + if (hasOutputFile()) { + hash = (37 * hash) + OUTPUTFILE_FIELD_NUMBER; + hash = (53 * hash) + getOutputFile().hashCode(); + } + if (hasPropagateDeletes()) { + hash = (37 * hash) + PROPAGATEDELETES_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getPropagateDeletes()); + } + if (hasKind()) { + hash = (37 * hash) + KIND_FIELD_NUMBER; + hash = (53 * hash) + kind_; + } + if (hasFateId()) { + hash = (37 * hash) + FATEID_FIELD_NUMBER; + hash = (53 * hash) + getFateId().hashCode(); + } + if (!internalGetOverrides().getMap().isEmpty()) { + hash = (37 * hash) + OVERRIDES_FIELD_NUMBER; + hash = (53 * hash) + internalGetOverrides().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.PExternalCompactionJob} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.PExternalCompactionJob) + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection( + int number) { + switch (number) { + case 9: + return internalGetOverrides(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection( + int number) { + switch (number) { + case 9: + return internalGetMutableOverrides(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getExtentFieldBuilder(); + getFilesFieldBuilder(); + getIteratorSettingsFieldBuilder(); + getFateIdFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + externalCompactionId_ = ""; + extent_ = null; + if (extentBuilder_ != null) { + extentBuilder_.dispose(); + extentBuilder_ = null; + } + if (filesBuilder_ == null) { + files_ = java.util.Collections.emptyList(); + } else { + files_ = null; + filesBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000004); + iteratorSettings_ = null; + if (iteratorSettingsBuilder_ != null) { + iteratorSettingsBuilder_.dispose(); + iteratorSettingsBuilder_ = null; + } + outputFile_ = ""; + propagateDeletes_ = false; + kind_ = 0; + fateId_ = null; + if (fateIdBuilder_ != null) { + fateIdBuilder_.dispose(); + fateIdBuilder_ = null; + } + internalGetMutableOverrides().clear(); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob build() { + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob buildPartial() { + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob result = new org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob result) { + if (filesBuilder_ == null) { + if (((bitField0_ & 0x00000004) != 0)) { + files_ = java.util.Collections.unmodifiableList(files_); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.files_ = files_; + } else { + result.files_ = filesBuilder_.build(); + } + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.externalCompactionId_ = externalCompactionId_; + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.extent_ = extentBuilder_ == null + ? extent_ + : extentBuilder_.build(); + to_bitField0_ |= 0x00000002; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.iteratorSettings_ = iteratorSettingsBuilder_ == null + ? iteratorSettings_ + : iteratorSettingsBuilder_.build(); + to_bitField0_ |= 0x00000004; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.outputFile_ = outputFile_; + to_bitField0_ |= 0x00000008; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.propagateDeletes_ = propagateDeletes_; + to_bitField0_ |= 0x00000010; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.kind_ = kind_; + to_bitField0_ |= 0x00000020; + } + if (((from_bitField0_ & 0x00000080) != 0)) { + result.fateId_ = fateIdBuilder_ == null + ? fateId_ + : fateIdBuilder_.build(); + to_bitField0_ |= 0x00000040; + } + if (((from_bitField0_ & 0x00000100) != 0)) { + result.overrides_ = internalGetOverrides(); + result.overrides_.makeImmutable(); + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob other) { + if (other == org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance()) return this; + if (other.hasExternalCompactionId()) { + externalCompactionId_ = other.externalCompactionId_; + bitField0_ |= 0x00000001; + onChanged(); + } + if (other.hasExtent()) { + mergeExtent(other.getExtent()); + } + if (filesBuilder_ == null) { + if (!other.files_.isEmpty()) { + if (files_.isEmpty()) { + files_ = other.files_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensureFilesIsMutable(); + files_.addAll(other.files_); + } + onChanged(); + } + } else { + if (!other.files_.isEmpty()) { + if (filesBuilder_.isEmpty()) { + filesBuilder_.dispose(); + filesBuilder_ = null; + files_ = other.files_; + bitField0_ = (bitField0_ & ~0x00000004); + filesBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getFilesFieldBuilder() : null; + } else { + filesBuilder_.addAllMessages(other.files_); + } + } + } + if (other.hasIteratorSettings()) { + mergeIteratorSettings(other.getIteratorSettings()); + } + if (other.hasOutputFile()) { + outputFile_ = other.outputFile_; + bitField0_ |= 0x00000010; + onChanged(); + } + if (other.hasPropagateDeletes()) { + setPropagateDeletes(other.getPropagateDeletes()); + } + if (other.hasKind()) { + setKind(other.getKind()); + } + if (other.hasFateId()) { + mergeFateId(other.getFateId()); + } + internalGetMutableOverrides().mergeFrom( + other.internalGetOverrides()); + bitField0_ |= 0x00000100; + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + externalCompactionId_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + input.readMessage( + getExtentFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + org.apache.accumulo.core.compaction.protobuf.PInputFile m = + input.readMessage( + org.apache.accumulo.core.compaction.protobuf.PInputFile.parser(), + extensionRegistry); + if (filesBuilder_ == null) { + ensureFilesIsMutable(); + files_.add(m); + } else { + filesBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: { + input.readMessage( + getIteratorSettingsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000008; + break; + } // case 34 + case 42: { + outputFile_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000010; + break; + } // case 42 + case 48: { + propagateDeletes_ = input.readBool(); + bitField0_ |= 0x00000020; + break; + } // case 48 + case 56: { + kind_ = input.readEnum(); + bitField0_ |= 0x00000040; + break; + } // case 56 + case 66: { + input.readMessage( + getFateIdFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000080; + break; + } // case 66 + case 74: { + com.google.protobuf.MapEntry + overrides__ = input.readMessage( + OverridesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + internalGetMutableOverrides().getMutableMap().put( + overrides__.getKey(), overrides__.getValue()); + bitField0_ |= 0x00000100; + break; + } // case 74 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private java.lang.Object externalCompactionId_ = ""; + /** + * optional string externalCompactionId = 1; + * @return Whether the externalCompactionId field is set. + */ + public boolean hasExternalCompactionId() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * optional string externalCompactionId = 1; + * @return The externalCompactionId. + */ + public java.lang.String getExternalCompactionId() { + java.lang.Object ref = externalCompactionId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + externalCompactionId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string externalCompactionId = 1; + * @return The bytes for externalCompactionId. + */ + public com.google.protobuf.ByteString + getExternalCompactionIdBytes() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + externalCompactionId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string externalCompactionId = 1; + * @param value The externalCompactionId to set. + * @return This builder for chaining. + */ + public Builder setExternalCompactionId( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + externalCompactionId_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * optional string externalCompactionId = 1; + * @return This builder for chaining. + */ + public Builder clearExternalCompactionId() { + externalCompactionId_ = getDefaultInstance().getExternalCompactionId(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + /** + * optional string externalCompactionId = 1; + * @param value The bytes for externalCompactionId to set. + * @return This builder for chaining. + */ + public Builder setExternalCompactionIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + externalCompactionId_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + + private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> extentBuilder_; + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + * @return Whether the extent field is set. + */ + public boolean hasExtent() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + * @return The extent. + */ + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { + if (extentBuilder_ == null) { + return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } else { + return extentBuilder_.getMessage(); + } + } + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + */ + public Builder setExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) { + if (extentBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + extent_ = value; + } else { + extentBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + */ + public Builder setExtent( + org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder builderForValue) { + if (extentBuilder_ == null) { + extent_ = builderForValue.build(); + } else { + extentBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + */ + public Builder mergeExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) { + if (extentBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0) && + extent_ != null && + extent_ != org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance()) { + getExtentBuilder().mergeFrom(value); + } else { + extent_ = value; + } + } else { + extentBuilder_.mergeFrom(value); + } + if (extent_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } + return this; + } + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + */ + public Builder clearExtent() { + bitField0_ = (bitField0_ & ~0x00000002); + extent_ = null; + if (extentBuilder_ != null) { + extentBuilder_.dispose(); + extentBuilder_ = null; + } + onChanged(); + return this; + } + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder getExtentBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getExtentFieldBuilder().getBuilder(); + } + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { + if (extentBuilder_ != null) { + return extentBuilder_.getMessageOrBuilder(); + } else { + return extent_ == null ? + org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } + } + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> + getExtentFieldBuilder() { + if (extentBuilder_ == null) { + extentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder>( + getExtent(), + getParentForChildren(), + isClean()); + extent_ = null; + } + return extentBuilder_; + } + + private java.util.List files_ = + java.util.Collections.emptyList(); + private void ensureFilesIsMutable() { + if (!((bitField0_ & 0x00000004) != 0)) { + files_ = new java.util.ArrayList(files_); + bitField0_ |= 0x00000004; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PInputFile, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder, org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder> filesBuilder_; + + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public java.util.List getFilesList() { + if (filesBuilder_ == null) { + return java.util.Collections.unmodifiableList(files_); + } else { + return filesBuilder_.getMessageList(); + } + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public int getFilesCount() { + if (filesBuilder_ == null) { + return files_.size(); + } else { + return filesBuilder_.getCount(); + } + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index) { + if (filesBuilder_ == null) { + return files_.get(index); + } else { + return filesBuilder_.getMessage(index); + } + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public Builder setFiles( + int index, org.apache.accumulo.core.compaction.protobuf.PInputFile value) { + if (filesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFilesIsMutable(); + files_.set(index, value); + onChanged(); + } else { + filesBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public Builder setFiles( + int index, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) { + if (filesBuilder_ == null) { + ensureFilesIsMutable(); + files_.set(index, builderForValue.build()); + onChanged(); + } else { + filesBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public Builder addFiles(org.apache.accumulo.core.compaction.protobuf.PInputFile value) { + if (filesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFilesIsMutable(); + files_.add(value); + onChanged(); + } else { + filesBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public Builder addFiles( + int index, org.apache.accumulo.core.compaction.protobuf.PInputFile value) { + if (filesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureFilesIsMutable(); + files_.add(index, value); + onChanged(); + } else { + filesBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public Builder addFiles( + org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) { + if (filesBuilder_ == null) { + ensureFilesIsMutable(); + files_.add(builderForValue.build()); + onChanged(); + } else { + filesBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public Builder addFiles( + int index, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) { + if (filesBuilder_ == null) { + ensureFilesIsMutable(); + files_.add(index, builderForValue.build()); + onChanged(); + } else { + filesBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public Builder addAllFiles( + java.lang.Iterable values) { + if (filesBuilder_ == null) { + ensureFilesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, files_); + onChanged(); + } else { + filesBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public Builder clearFiles() { + if (filesBuilder_ == null) { + files_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + } else { + filesBuilder_.clear(); + } + return this; + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public Builder removeFiles(int index) { + if (filesBuilder_ == null) { + ensureFilesIsMutable(); + files_.remove(index); + onChanged(); + } else { + filesBuilder_.remove(index); + } + return this; + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder getFilesBuilder( + int index) { + return getFilesFieldBuilder().getBuilder(index); + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder( + int index) { + if (filesBuilder_ == null) { + return files_.get(index); } else { + return filesBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public java.util.List + getFilesOrBuilderList() { + if (filesBuilder_ != null) { + return filesBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(files_); + } + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesBuilder() { + return getFilesFieldBuilder().addBuilder( + org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance()); + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesBuilder( + int index) { + return getFilesFieldBuilder().addBuilder( + index, org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance()); + } + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + public java.util.List + getFilesBuilderList() { + return getFilesFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PInputFile, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder, org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder> + getFilesFieldBuilder() { + if (filesBuilder_ == null) { + filesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PInputFile, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder, org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder>( + files_, + ((bitField0_ & 0x00000004) != 0), + getParentForChildren(), + isClean()); + files_ = null; + } + return filesBuilder_; + } + + private org.apache.accumulo.core.compaction.protobuf.PIteratorConfig iteratorSettings_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PIteratorConfig, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder> iteratorSettingsBuilder_; + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * @return Whether the iteratorSettings field is set. + */ + public boolean hasIteratorSettings() { + return ((bitField0_ & 0x00000008) != 0); + } + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * @return The iteratorSettings. + */ + public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorSettings() { + if (iteratorSettingsBuilder_ == null) { + return iteratorSettings_ == null ? org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_; + } else { + return iteratorSettingsBuilder_.getMessage(); + } + } + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + */ + public Builder setIteratorSettings(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig value) { + if (iteratorSettingsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + iteratorSettings_ = value; + } else { + iteratorSettingsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + */ + public Builder setIteratorSettings( + org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder builderForValue) { + if (iteratorSettingsBuilder_ == null) { + iteratorSettings_ = builderForValue.build(); + } else { + iteratorSettingsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + */ + public Builder mergeIteratorSettings(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig value) { + if (iteratorSettingsBuilder_ == null) { + if (((bitField0_ & 0x00000008) != 0) && + iteratorSettings_ != null && + iteratorSettings_ != org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance()) { + getIteratorSettingsBuilder().mergeFrom(value); + } else { + iteratorSettings_ = value; + } + } else { + iteratorSettingsBuilder_.mergeFrom(value); + } + if (iteratorSettings_ != null) { + bitField0_ |= 0x00000008; + onChanged(); + } + return this; + } + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + */ + public Builder clearIteratorSettings() { + bitField0_ = (bitField0_ & ~0x00000008); + iteratorSettings_ = null; + if (iteratorSettingsBuilder_ != null) { + iteratorSettingsBuilder_.dispose(); + iteratorSettingsBuilder_ = null; + } + onChanged(); + return this; + } + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + */ + public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder getIteratorSettingsBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getIteratorSettingsFieldBuilder().getBuilder(); + } + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + */ + public org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder() { + if (iteratorSettingsBuilder_ != null) { + return iteratorSettingsBuilder_.getMessageOrBuilder(); + } else { + return iteratorSettings_ == null ? + org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_; + } + } + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PIteratorConfig, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder> + getIteratorSettingsFieldBuilder() { + if (iteratorSettingsBuilder_ == null) { + iteratorSettingsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PIteratorConfig, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder>( + getIteratorSettings(), + getParentForChildren(), + isClean()); + iteratorSettings_ = null; + } + return iteratorSettingsBuilder_; + } + + private java.lang.Object outputFile_ = ""; + /** + * optional string outputFile = 5; + * @return Whether the outputFile field is set. + */ + public boolean hasOutputFile() { + return ((bitField0_ & 0x00000010) != 0); + } + /** + * optional string outputFile = 5; + * @return The outputFile. + */ + public java.lang.String getOutputFile() { + java.lang.Object ref = outputFile_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + outputFile_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string outputFile = 5; + * @return The bytes for outputFile. + */ + public com.google.protobuf.ByteString + getOutputFileBytes() { + java.lang.Object ref = outputFile_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + outputFile_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string outputFile = 5; + * @param value The outputFile to set. + * @return This builder for chaining. + */ + public Builder setOutputFile( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + outputFile_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * optional string outputFile = 5; + * @return This builder for chaining. + */ + public Builder clearOutputFile() { + outputFile_ = getDefaultInstance().getOutputFile(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + return this; + } + /** + * optional string outputFile = 5; + * @param value The bytes for outputFile to set. + * @return This builder for chaining. + */ + public Builder setOutputFileBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + outputFile_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + + private boolean propagateDeletes_ ; + /** + * optional bool propagateDeletes = 6; + * @return Whether the propagateDeletes field is set. + */ + @java.lang.Override + public boolean hasPropagateDeletes() { + return ((bitField0_ & 0x00000020) != 0); + } + /** + * optional bool propagateDeletes = 6; + * @return The propagateDeletes. + */ + @java.lang.Override + public boolean getPropagateDeletes() { + return propagateDeletes_; + } + /** + * optional bool propagateDeletes = 6; + * @param value The propagateDeletes to set. + * @return This builder for chaining. + */ + public Builder setPropagateDeletes(boolean value) { + + propagateDeletes_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + /** + * optional bool propagateDeletes = 6; + * @return This builder for chaining. + */ + public Builder clearPropagateDeletes() { + bitField0_ = (bitField0_ & ~0x00000020); + propagateDeletes_ = false; + onChanged(); + return this; + } + + private int kind_ = 0; + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @return Whether the kind field is set. + */ + @java.lang.Override public boolean hasKind() { + return ((bitField0_ & 0x00000040) != 0); + } + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @return The enum numeric value on the wire for kind. + */ + @java.lang.Override public int getKindValue() { + return kind_; + } + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @param value The enum numeric value on the wire for kind to set. + * @return This builder for chaining. + */ + public Builder setKindValue(int value) { + kind_ = value; + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @return The kind. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind() { + org.apache.accumulo.core.compaction.protobuf.PCompactionKind result = org.apache.accumulo.core.compaction.protobuf.PCompactionKind.forNumber(kind_); + return result == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionKind.UNRECOGNIZED : result; + } + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @param value The kind to set. + * @return This builder for chaining. + */ + public Builder setKind(org.apache.accumulo.core.compaction.protobuf.PCompactionKind value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000040; + kind_ = value.getNumber(); + onChanged(); + return this; + } + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @return This builder for chaining. + */ + public Builder clearKind() { + bitField0_ = (bitField0_ & ~0x00000040); + kind_ = 0; + onChanged(); + return this; + } + + private org.apache.accumulo.core.compaction.protobuf.PFateId fateId_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PFateId, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder, org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder> fateIdBuilder_; + /** + * optional .compaction_coordinator.PFateId fateId = 8; + * @return Whether the fateId field is set. + */ + public boolean hasFateId() { + return ((bitField0_ & 0x00000080) != 0); + } + /** + * optional .compaction_coordinator.PFateId fateId = 8; + * @return The fateId. + */ + public org.apache.accumulo.core.compaction.protobuf.PFateId getFateId() { + if (fateIdBuilder_ == null) { + return fateId_ == null ? org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance() : fateId_; + } else { + return fateIdBuilder_.getMessage(); + } + } + /** + * optional .compaction_coordinator.PFateId fateId = 8; + */ + public Builder setFateId(org.apache.accumulo.core.compaction.protobuf.PFateId value) { + if (fateIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + fateId_ = value; + } else { + fateIdBuilder_.setMessage(value); + } + bitField0_ |= 0x00000080; + onChanged(); + return this; + } + /** + * optional .compaction_coordinator.PFateId fateId = 8; + */ + public Builder setFateId( + org.apache.accumulo.core.compaction.protobuf.PFateId.Builder builderForValue) { + if (fateIdBuilder_ == null) { + fateId_ = builderForValue.build(); + } else { + fateIdBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000080; + onChanged(); + return this; + } + /** + * optional .compaction_coordinator.PFateId fateId = 8; + */ + public Builder mergeFateId(org.apache.accumulo.core.compaction.protobuf.PFateId value) { + if (fateIdBuilder_ == null) { + if (((bitField0_ & 0x00000080) != 0) && + fateId_ != null && + fateId_ != org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance()) { + getFateIdBuilder().mergeFrom(value); + } else { + fateId_ = value; + } + } else { + fateIdBuilder_.mergeFrom(value); + } + if (fateId_ != null) { + bitField0_ |= 0x00000080; + onChanged(); + } + return this; + } + /** + * optional .compaction_coordinator.PFateId fateId = 8; + */ + public Builder clearFateId() { + bitField0_ = (bitField0_ & ~0x00000080); + fateId_ = null; + if (fateIdBuilder_ != null) { + fateIdBuilder_.dispose(); + fateIdBuilder_ = null; + } + onChanged(); + return this; + } + /** + * optional .compaction_coordinator.PFateId fateId = 8; + */ + public org.apache.accumulo.core.compaction.protobuf.PFateId.Builder getFateIdBuilder() { + bitField0_ |= 0x00000080; + onChanged(); + return getFateIdFieldBuilder().getBuilder(); + } + /** + * optional .compaction_coordinator.PFateId fateId = 8; + */ + public org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder() { + if (fateIdBuilder_ != null) { + return fateIdBuilder_.getMessageOrBuilder(); + } else { + return fateId_ == null ? + org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance() : fateId_; + } + } + /** + * optional .compaction_coordinator.PFateId fateId = 8; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PFateId, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder, org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder> + getFateIdFieldBuilder() { + if (fateIdBuilder_ == null) { + fateIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PFateId, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder, org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder>( + getFateId(), + getParentForChildren(), + isClean()); + fateId_ = null; + } + return fateIdBuilder_; + } + + private com.google.protobuf.MapField< + java.lang.String, java.lang.String> overrides_; + private com.google.protobuf.MapField + internalGetOverrides() { + if (overrides_ == null) { + return com.google.protobuf.MapField.emptyMapField( + OverridesDefaultEntryHolder.defaultEntry); + } + return overrides_; + } + private com.google.protobuf.MapField + internalGetMutableOverrides() { + if (overrides_ == null) { + overrides_ = com.google.protobuf.MapField.newMapField( + OverridesDefaultEntryHolder.defaultEntry); + } + if (!overrides_.isMutable()) { + overrides_ = overrides_.copy(); + } + bitField0_ |= 0x00000100; + onChanged(); + return overrides_; + } + public int getOverridesCount() { + return internalGetOverrides().getMap().size(); + } + /** + * map<string, string> overrides = 9; + */ + @java.lang.Override + public boolean containsOverrides( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + return internalGetOverrides().getMap().containsKey(key); + } + /** + * Use {@link #getOverridesMap()} instead. + */ + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getOverrides() { + return getOverridesMap(); + } + /** + * map<string, string> overrides = 9; + */ + @java.lang.Override + public java.util.Map getOverridesMap() { + return internalGetOverrides().getMap(); + } + /** + * map<string, string> overrides = 9; + */ + @java.lang.Override + public /* nullable */ +java.lang.String getOverridesOrDefault( + java.lang.String key, + /* nullable */ +java.lang.String defaultValue) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetOverrides().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * map<string, string> overrides = 9; + */ + @java.lang.Override + public java.lang.String getOverridesOrThrow( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetOverrides().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + public Builder clearOverrides() { + bitField0_ = (bitField0_ & ~0x00000100); + internalGetMutableOverrides().getMutableMap() + .clear(); + return this; + } + /** + * map<string, string> overrides = 9; + */ + public Builder removeOverrides( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + internalGetMutableOverrides().getMutableMap() + .remove(key); + return this; + } + /** + * Use alternate mutation accessors instead. + */ + @java.lang.Deprecated + public java.util.Map + getMutableOverrides() { + bitField0_ |= 0x00000100; + return internalGetMutableOverrides().getMutableMap(); + } + /** + * map<string, string> overrides = 9; + */ + public Builder putOverrides( + java.lang.String key, + java.lang.String value) { + if (key == null) { throw new NullPointerException("map key"); } + if (value == null) { throw new NullPointerException("map value"); } + internalGetMutableOverrides().getMutableMap() + .put(key, value); + bitField0_ |= 0x00000100; + return this; + } + /** + * map<string, string> overrides = 9; + */ + public Builder putAllOverrides( + java.util.Map values) { + internalGetMutableOverrides().getMutableMap() + .putAll(values); + bitField0_ |= 0x00000100; + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.PExternalCompactionJob) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.PExternalCompactionJob) + private static final org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob(); + } + + public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PExternalCompactionJob parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java new file mode 100644 index 00000000000..d56402d5c4c --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java @@ -0,0 +1,192 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface PExternalCompactionJobOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.PExternalCompactionJob) + com.google.protobuf.MessageOrBuilder { + + /** + * optional string externalCompactionId = 1; + * @return Whether the externalCompactionId field is set. + */ + boolean hasExternalCompactionId(); + /** + * optional string externalCompactionId = 1; + * @return The externalCompactionId. + */ + java.lang.String getExternalCompactionId(); + /** + * optional string externalCompactionId = 1; + * @return The bytes for externalCompactionId. + */ + com.google.protobuf.ByteString + getExternalCompactionIdBytes(); + + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + * @return Whether the extent field is set. + */ + boolean hasExtent(); + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + * @return The extent. + */ + org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent(); + /** + * optional .compaction_coordinator.PKeyExtent extent = 2; + */ + org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder(); + + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + java.util.List + getFilesList(); + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index); + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + int getFilesCount(); + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + java.util.List + getFilesOrBuilderList(); + /** + * repeated .compaction_coordinator.PInputFile files = 3; + */ + org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder( + int index); + + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * @return Whether the iteratorSettings field is set. + */ + boolean hasIteratorSettings(); + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * @return The iteratorSettings. + */ + org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorSettings(); + /** + * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + */ + org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder(); + + /** + * optional string outputFile = 5; + * @return Whether the outputFile field is set. + */ + boolean hasOutputFile(); + /** + * optional string outputFile = 5; + * @return The outputFile. + */ + java.lang.String getOutputFile(); + /** + * optional string outputFile = 5; + * @return The bytes for outputFile. + */ + com.google.protobuf.ByteString + getOutputFileBytes(); + + /** + * optional bool propagateDeletes = 6; + * @return Whether the propagateDeletes field is set. + */ + boolean hasPropagateDeletes(); + /** + * optional bool propagateDeletes = 6; + * @return The propagateDeletes. + */ + boolean getPropagateDeletes(); + + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @return Whether the kind field is set. + */ + boolean hasKind(); + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @return The enum numeric value on the wire for kind. + */ + int getKindValue(); + /** + * optional .compaction_coordinator.PCompactionKind kind = 7; + * @return The kind. + */ + org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind(); + + /** + * optional .compaction_coordinator.PFateId fateId = 8; + * @return Whether the fateId field is set. + */ + boolean hasFateId(); + /** + * optional .compaction_coordinator.PFateId fateId = 8; + * @return The fateId. + */ + org.apache.accumulo.core.compaction.protobuf.PFateId getFateId(); + /** + * optional .compaction_coordinator.PFateId fateId = 8; + */ + org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder(); + + /** + * map<string, string> overrides = 9; + */ + int getOverridesCount(); + /** + * map<string, string> overrides = 9; + */ + boolean containsOverrides( + java.lang.String key); + /** + * Use {@link #getOverridesMap()} instead. + */ + @java.lang.Deprecated + java.util.Map + getOverrides(); + /** + * map<string, string> overrides = 9; + */ + java.util.Map + getOverridesMap(); + /** + * map<string, string> overrides = 9; + */ + /* nullable */ +java.lang.String getOverridesOrDefault( + java.lang.String key, + /* nullable */ +java.lang.String defaultValue); + /** + * map<string, string> overrides = 9; + */ + java.lang.String getOverridesOrThrow( + java.lang.String key); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java new file mode 100644 index 00000000000..142546632a5 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java @@ -0,0 +1,654 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.PFateId} + */ +public final class PFateId extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.PFateId) + PFateIdOrBuilder { +private static final long serialVersionUID = 0L; + // Use PFateId.newBuilder() to construct. + private PFateId(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PFateId() { + type_ = 0; + txUUIDStr_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PFateId(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PFateId_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PFateId_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PFateId.class, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder.class); + } + + public static final int TYPE_FIELD_NUMBER = 1; + private int type_ = 0; + /** + * .compaction_coordinator.PFateInstanceType type = 1; + * @return The enum numeric value on the wire for type. + */ + @java.lang.Override public int getTypeValue() { + return type_; + } + /** + * .compaction_coordinator.PFateInstanceType type = 1; + * @return The type. + */ + @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PFateInstanceType getType() { + org.apache.accumulo.core.compaction.protobuf.PFateInstanceType result = org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.forNumber(type_); + return result == null ? org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.UNRECOGNIZED : result; + } + + public static final int TXUUIDSTR_FIELD_NUMBER = 2; + @SuppressWarnings("serial") + private volatile java.lang.Object txUUIDStr_ = ""; + /** + * string txUUIDStr = 2; + * @return The txUUIDStr. + */ + @java.lang.Override + public java.lang.String getTxUUIDStr() { + java.lang.Object ref = txUUIDStr_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + txUUIDStr_ = s; + return s; + } + } + /** + * string txUUIDStr = 2; + * @return The bytes for txUUIDStr. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getTxUUIDStrBytes() { + java.lang.Object ref = txUUIDStr_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + txUUIDStr_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (type_ != org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.FI_UNKNOWN.getNumber()) { + output.writeEnum(1, type_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(txUUIDStr_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, txUUIDStr_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (type_ != org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.FI_UNKNOWN.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(1, type_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(txUUIDStr_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, txUUIDStr_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PFateId)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.PFateId other = (org.apache.accumulo.core.compaction.protobuf.PFateId) obj; + + if (type_ != other.type_) return false; + if (!getTxUUIDStr() + .equals(other.getTxUUIDStr())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + TYPE_FIELD_NUMBER; + hash = (53 * hash) + type_; + hash = (37 * hash) + TXUUIDSTR_FIELD_NUMBER; + hash = (53 * hash) + getTxUUIDStr().hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PFateId prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.PFateId} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.PFateId) + org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PFateId_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PFateId_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PFateId.class, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.PFateId.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + type_ = 0; + txUUIDStr_ = ""; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PFateId_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PFateId getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PFateId build() { + org.apache.accumulo.core.compaction.protobuf.PFateId result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PFateId buildPartial() { + org.apache.accumulo.core.compaction.protobuf.PFateId result = new org.apache.accumulo.core.compaction.protobuf.PFateId(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PFateId result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.type_ = type_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.txUUIDStr_ = txUUIDStr_; + } + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.PFateId) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PFateId)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PFateId other) { + if (other == org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance()) return this; + if (other.type_ != 0) { + setTypeValue(other.getTypeValue()); + } + if (!other.getTxUUIDStr().isEmpty()) { + txUUIDStr_ = other.txUUIDStr_; + bitField0_ |= 0x00000002; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + type_ = input.readEnum(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 18: { + txUUIDStr_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private int type_ = 0; + /** + * .compaction_coordinator.PFateInstanceType type = 1; + * @return The enum numeric value on the wire for type. + */ + @java.lang.Override public int getTypeValue() { + return type_; + } + /** + * .compaction_coordinator.PFateInstanceType type = 1; + * @param value The enum numeric value on the wire for type to set. + * @return This builder for chaining. + */ + public Builder setTypeValue(int value) { + type_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .compaction_coordinator.PFateInstanceType type = 1; + * @return The type. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PFateInstanceType getType() { + org.apache.accumulo.core.compaction.protobuf.PFateInstanceType result = org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.forNumber(type_); + return result == null ? org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.UNRECOGNIZED : result; + } + /** + * .compaction_coordinator.PFateInstanceType type = 1; + * @param value The type to set. + * @return This builder for chaining. + */ + public Builder setType(org.apache.accumulo.core.compaction.protobuf.PFateInstanceType value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + type_ = value.getNumber(); + onChanged(); + return this; + } + /** + * .compaction_coordinator.PFateInstanceType type = 1; + * @return This builder for chaining. + */ + public Builder clearType() { + bitField0_ = (bitField0_ & ~0x00000001); + type_ = 0; + onChanged(); + return this; + } + + private java.lang.Object txUUIDStr_ = ""; + /** + * string txUUIDStr = 2; + * @return The txUUIDStr. + */ + public java.lang.String getTxUUIDStr() { + java.lang.Object ref = txUUIDStr_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + txUUIDStr_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string txUUIDStr = 2; + * @return The bytes for txUUIDStr. + */ + public com.google.protobuf.ByteString + getTxUUIDStrBytes() { + java.lang.Object ref = txUUIDStr_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + txUUIDStr_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string txUUIDStr = 2; + * @param value The txUUIDStr to set. + * @return This builder for chaining. + */ + public Builder setTxUUIDStr( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + txUUIDStr_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * string txUUIDStr = 2; + * @return This builder for chaining. + */ + public Builder clearTxUUIDStr() { + txUUIDStr_ = getDefaultInstance().getTxUUIDStr(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + * string txUUIDStr = 2; + * @param value The bytes for txUUIDStr to set. + * @return This builder for chaining. + */ + public Builder setTxUUIDStrBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + txUUIDStr_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.PFateId) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.PFateId) + private static final org.apache.accumulo.core.compaction.protobuf.PFateId DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PFateId(); + } + + public static org.apache.accumulo.core.compaction.protobuf.PFateId getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PFateId parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PFateId getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java new file mode 100644 index 00000000000..a0a6ce3746f --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface PFateIdOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.PFateId) + com.google.protobuf.MessageOrBuilder { + + /** + * .compaction_coordinator.PFateInstanceType type = 1; + * @return The enum numeric value on the wire for type. + */ + int getTypeValue(); + /** + * .compaction_coordinator.PFateInstanceType type = 1; + * @return The type. + */ + org.apache.accumulo.core.compaction.protobuf.PFateInstanceType getType(); + + /** + * string txUUIDStr = 2; + * @return The txUUIDStr. + */ + java.lang.String getTxUUIDStr(); + /** + * string txUUIDStr = 2; + * @return The bytes for txUUIDStr. + */ + com.google.protobuf.ByteString + getTxUUIDStrBytes(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java new file mode 100644 index 00000000000..d4cb0cdb4a2 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java @@ -0,0 +1,141 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf enum {@code compaction_coordinator.PFateInstanceType} + */ +public enum PFateInstanceType + implements com.google.protobuf.ProtocolMessageEnum { + /** + * FI_UNKNOWN = 0; + */ + FI_UNKNOWN(0), + /** + * FI_META = 1; + */ + FI_META(1), + /** + * FI_USER = 2; + */ + FI_USER(2), + UNRECOGNIZED(-1), + ; + + /** + * FI_UNKNOWN = 0; + */ + public static final int FI_UNKNOWN_VALUE = 0; + /** + * FI_META = 1; + */ + public static final int FI_META_VALUE = 1; + /** + * FI_USER = 2; + */ + public static final int FI_USER_VALUE = 2; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static PFateInstanceType valueOf(int value) { + return forNumber(value); + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + */ + public static PFateInstanceType forNumber(int value) { + switch (value) { + case 0: return FI_UNKNOWN; + case 1: return FI_META; + case 2: return FI_USER; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + PFateInstanceType> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public PFateInstanceType findValueByNumber(int number) { + return PFateInstanceType.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.getDescriptor().getEnumTypes().get(1); + } + + private static final PFateInstanceType[] VALUES = values(); + + public static PFateInstanceType valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private PFateInstanceType(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:compaction_coordinator.PFateInstanceType) +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfo.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfo.java new file mode 100644 index 00000000000..883b9a22894 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfo.java @@ -0,0 +1,703 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.PInfo} + */ +public final class PInfo extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.PInfo) + PInfoOrBuilder { +private static final long serialVersionUID = 0L; + // Use PInfo.newBuilder() to construct. + private PInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PInfo() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PInfo(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + @java.lang.Override + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection( + int number) { + switch (number) { + case 1: + return internalGetHeaders(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PInfo.class, org.apache.accumulo.core.compaction.protobuf.PInfo.Builder.class); + } + + public static final int HEADERS_FIELD_NUMBER = 1; + private static final class HeadersDefaultEntryHolder { + static final com.google.protobuf.MapEntry< + java.lang.String, java.lang.String> defaultEntry = + com.google.protobuf.MapEntry + .newDefaultInstance( + org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_HeadersEntry_descriptor, + com.google.protobuf.WireFormat.FieldType.STRING, + "", + com.google.protobuf.WireFormat.FieldType.STRING, + ""); + } + @SuppressWarnings("serial") + private com.google.protobuf.MapField< + java.lang.String, java.lang.String> headers_; + private com.google.protobuf.MapField + internalGetHeaders() { + if (headers_ == null) { + return com.google.protobuf.MapField.emptyMapField( + HeadersDefaultEntryHolder.defaultEntry); + } + return headers_; + } + public int getHeadersCount() { + return internalGetHeaders().getMap().size(); + } + /** + * map<string, string> headers = 1; + */ + @java.lang.Override + public boolean containsHeaders( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + return internalGetHeaders().getMap().containsKey(key); + } + /** + * Use {@link #getHeadersMap()} instead. + */ + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getHeaders() { + return getHeadersMap(); + } + /** + * map<string, string> headers = 1; + */ + @java.lang.Override + public java.util.Map getHeadersMap() { + return internalGetHeaders().getMap(); + } + /** + * map<string, string> headers = 1; + */ + @java.lang.Override + public /* nullable */ +java.lang.String getHeadersOrDefault( + java.lang.String key, + /* nullable */ +java.lang.String defaultValue) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetHeaders().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * map<string, string> headers = 1; + */ + @java.lang.Override + public java.lang.String getHeadersOrThrow( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetHeaders().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + com.google.protobuf.GeneratedMessageV3 + .serializeStringMapTo( + output, + internalGetHeaders(), + HeadersDefaultEntryHolder.defaultEntry, + 1); + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (java.util.Map.Entry entry + : internalGetHeaders().getMap().entrySet()) { + com.google.protobuf.MapEntry + headers__ = HeadersDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, headers__); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PInfo)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.PInfo other = (org.apache.accumulo.core.compaction.protobuf.PInfo) obj; + + if (!internalGetHeaders().equals( + other.internalGetHeaders())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (!internalGetHeaders().getMap().isEmpty()) { + hash = (37 * hash) + HEADERS_FIELD_NUMBER; + hash = (53 * hash) + internalGetHeaders().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PInfo prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.PInfo} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.PInfo) + org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection( + int number) { + switch (number) { + case 1: + return internalGetHeaders(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection( + int number) { + switch (number) { + case 1: + return internalGetMutableHeaders(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PInfo.class, org.apache.accumulo.core.compaction.protobuf.PInfo.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.PInfo.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + internalGetMutableHeaders().clear(); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInfo getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInfo build() { + org.apache.accumulo.core.compaction.protobuf.PInfo result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInfo buildPartial() { + org.apache.accumulo.core.compaction.protobuf.PInfo result = new org.apache.accumulo.core.compaction.protobuf.PInfo(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PInfo result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.headers_ = internalGetHeaders(); + result.headers_.makeImmutable(); + } + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.PInfo) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PInfo)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PInfo other) { + if (other == org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance()) return this; + internalGetMutableHeaders().mergeFrom( + other.internalGetHeaders()); + bitField0_ |= 0x00000001; + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + com.google.protobuf.MapEntry + headers__ = input.readMessage( + HeadersDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + internalGetMutableHeaders().getMutableMap().put( + headers__.getKey(), headers__.getValue()); + bitField0_ |= 0x00000001; + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private com.google.protobuf.MapField< + java.lang.String, java.lang.String> headers_; + private com.google.protobuf.MapField + internalGetHeaders() { + if (headers_ == null) { + return com.google.protobuf.MapField.emptyMapField( + HeadersDefaultEntryHolder.defaultEntry); + } + return headers_; + } + private com.google.protobuf.MapField + internalGetMutableHeaders() { + if (headers_ == null) { + headers_ = com.google.protobuf.MapField.newMapField( + HeadersDefaultEntryHolder.defaultEntry); + } + if (!headers_.isMutable()) { + headers_ = headers_.copy(); + } + bitField0_ |= 0x00000001; + onChanged(); + return headers_; + } + public int getHeadersCount() { + return internalGetHeaders().getMap().size(); + } + /** + * map<string, string> headers = 1; + */ + @java.lang.Override + public boolean containsHeaders( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + return internalGetHeaders().getMap().containsKey(key); + } + /** + * Use {@link #getHeadersMap()} instead. + */ + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getHeaders() { + return getHeadersMap(); + } + /** + * map<string, string> headers = 1; + */ + @java.lang.Override + public java.util.Map getHeadersMap() { + return internalGetHeaders().getMap(); + } + /** + * map<string, string> headers = 1; + */ + @java.lang.Override + public /* nullable */ +java.lang.String getHeadersOrDefault( + java.lang.String key, + /* nullable */ +java.lang.String defaultValue) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetHeaders().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * map<string, string> headers = 1; + */ + @java.lang.Override + public java.lang.String getHeadersOrThrow( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetHeaders().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + public Builder clearHeaders() { + bitField0_ = (bitField0_ & ~0x00000001); + internalGetMutableHeaders().getMutableMap() + .clear(); + return this; + } + /** + * map<string, string> headers = 1; + */ + public Builder removeHeaders( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + internalGetMutableHeaders().getMutableMap() + .remove(key); + return this; + } + /** + * Use alternate mutation accessors instead. + */ + @java.lang.Deprecated + public java.util.Map + getMutableHeaders() { + bitField0_ |= 0x00000001; + return internalGetMutableHeaders().getMutableMap(); + } + /** + * map<string, string> headers = 1; + */ + public Builder putHeaders( + java.lang.String key, + java.lang.String value) { + if (key == null) { throw new NullPointerException("map key"); } + if (value == null) { throw new NullPointerException("map value"); } + internalGetMutableHeaders().getMutableMap() + .put(key, value); + bitField0_ |= 0x00000001; + return this; + } + /** + * map<string, string> headers = 1; + */ + public Builder putAllHeaders( + java.util.Map values) { + internalGetMutableHeaders().getMutableMap() + .putAll(values); + bitField0_ |= 0x00000001; + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.PInfo) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.PInfo) + private static final org.apache.accumulo.core.compaction.protobuf.PInfo DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PInfo(); + } + + public static org.apache.accumulo.core.compaction.protobuf.PInfo getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PInfo parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInfo getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfoOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfoOrBuilder.java new file mode 100644 index 00000000000..f49eaad9288 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfoOrBuilder.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface PInfoOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.PInfo) + com.google.protobuf.MessageOrBuilder { + + /** + * map<string, string> headers = 1; + */ + int getHeadersCount(); + /** + * map<string, string> headers = 1; + */ + boolean containsHeaders( + java.lang.String key); + /** + * Use {@link #getHeadersMap()} instead. + */ + @java.lang.Deprecated + java.util.Map + getHeaders(); + /** + * map<string, string> headers = 1; + */ + java.util.Map + getHeadersMap(); + /** + * map<string, string> headers = 1; + */ + /* nullable */ +java.lang.String getHeadersOrDefault( + java.lang.String key, + /* nullable */ +java.lang.String defaultValue); + /** + * map<string, string> headers = 1; + */ + java.lang.String getHeadersOrThrow( + java.lang.String key); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java new file mode 100644 index 00000000000..5fadd5bed5d --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java @@ -0,0 +1,796 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.PInputFile} + */ +public final class PInputFile extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.PInputFile) + PInputFileOrBuilder { +private static final long serialVersionUID = 0L; + // Use PInputFile.newBuilder() to construct. + private PInputFile(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PInputFile() { + metadataFileEntry_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PInputFile(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInputFile_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInputFile_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PInputFile.class, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder.class); + } + + public static final int METADATAFILEENTRY_FIELD_NUMBER = 1; + @SuppressWarnings("serial") + private volatile java.lang.Object metadataFileEntry_ = ""; + /** + * 
+   * This is nullable in Thrift but I am not marking as optional as
+   * I think it should always be set
+   *
+ * + * string metadataFileEntry = 1; + * @return The metadataFileEntry. + */ + @java.lang.Override + public java.lang.String getMetadataFileEntry() { + java.lang.Object ref = metadataFileEntry_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + metadataFileEntry_ = s; + return s; + } + } + /** + * 
+   * This is nullable in Thrift but I am not marking as optional as
+   * I think it should always be set
+   *
+ * + * string metadataFileEntry = 1; + * @return The bytes for metadataFileEntry. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getMetadataFileEntryBytes() { + java.lang.Object ref = metadataFileEntry_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + metadataFileEntry_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int SIZE_FIELD_NUMBER = 2; + private long size_ = 0L; + /** + * int64 size = 2; + * @return The size. + */ + @java.lang.Override + public long getSize() { + return size_; + } + + public static final int ENTRIES_FIELD_NUMBER = 3; + private long entries_ = 0L; + /** + * int64 entries = 3; + * @return The entries. + */ + @java.lang.Override + public long getEntries() { + return entries_; + } + + public static final int TIMESTAMP_FIELD_NUMBER = 4; + private long timestamp_ = 0L; + /** + * int64 timestamp = 4; + * @return The timestamp. + */ + @java.lang.Override + public long getTimestamp() { + return timestamp_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(metadataFileEntry_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, metadataFileEntry_); + } + if (size_ != 0L) { + output.writeInt64(2, size_); + } + if (entries_ != 0L) { + output.writeInt64(3, entries_); + } + if (timestamp_ != 0L) { + output.writeInt64(4, timestamp_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(metadataFileEntry_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, metadataFileEntry_); + } + if (size_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(2, size_); + } + if (entries_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(3, entries_); + } + if (timestamp_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(4, timestamp_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PInputFile)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.PInputFile other = (org.apache.accumulo.core.compaction.protobuf.PInputFile) obj; + + if (!getMetadataFileEntry() + .equals(other.getMetadataFileEntry())) return false; + if (getSize() + != other.getSize()) return false; + if (getEntries() + != other.getEntries()) return false; + if (getTimestamp() + != other.getTimestamp()) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + METADATAFILEENTRY_FIELD_NUMBER; + hash = (53 * hash) + getMetadataFileEntry().hashCode(); + hash = (37 * hash) + SIZE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getSize()); + hash = (37 * hash) + ENTRIES_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getEntries()); + hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getTimestamp()); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PInputFile prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.PInputFile} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.PInputFile) + org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInputFile_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInputFile_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PInputFile.class, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.PInputFile.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + metadataFileEntry_ = ""; + size_ = 0L; + entries_ = 0L; + timestamp_ = 0L; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInputFile_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInputFile getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInputFile build() { + org.apache.accumulo.core.compaction.protobuf.PInputFile result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInputFile buildPartial() { + org.apache.accumulo.core.compaction.protobuf.PInputFile result = new org.apache.accumulo.core.compaction.protobuf.PInputFile(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PInputFile result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.metadataFileEntry_ = metadataFileEntry_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.size_ = size_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.entries_ = entries_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.timestamp_ = timestamp_; + } + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.PInputFile) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PInputFile)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PInputFile other) { + if (other == org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance()) return this; + if (!other.getMetadataFileEntry().isEmpty()) { + metadataFileEntry_ = other.metadataFileEntry_; + bitField0_ |= 0x00000001; + onChanged(); + } + if (other.getSize() != 0L) { + setSize(other.getSize()); + } + if (other.getEntries() != 0L) { + setEntries(other.getEntries()); + } + if (other.getTimestamp() != 0L) { + setTimestamp(other.getTimestamp()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + metadataFileEntry_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + size_ = input.readInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + entries_ = input.readInt64(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 32: { + timestamp_ = input.readInt64(); + bitField0_ |= 0x00000008; + break; + } // case 32 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private java.lang.Object metadataFileEntry_ = ""; + /** + * 
+     * This is nullable in Thrift but I am not marking as optional as
+     * I think it should always be set
+     *
+ * + * string metadataFileEntry = 1; + * @return The metadataFileEntry. + */ + public java.lang.String getMetadataFileEntry() { + java.lang.Object ref = metadataFileEntry_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + metadataFileEntry_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+     * This is nullable in Thrift but I am not marking as optional as
+     * I think it should always be set
+     *
+ * + * string metadataFileEntry = 1; + * @return The bytes for metadataFileEntry. + */ + public com.google.protobuf.ByteString + getMetadataFileEntryBytes() { + java.lang.Object ref = metadataFileEntry_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + metadataFileEntry_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+     * This is nullable in Thrift but I am not marking as optional as
+     * I think it should always be set
+     *
+ * + * string metadataFileEntry = 1; + * @param value The metadataFileEntry to set. + * @return This builder for chaining. + */ + public Builder setMetadataFileEntry( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + metadataFileEntry_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * 
+     * This is nullable in Thrift but I am not marking as optional as
+     * I think it should always be set
+     *
+ * + * string metadataFileEntry = 1; + * @return This builder for chaining. + */ + public Builder clearMetadataFileEntry() { + metadataFileEntry_ = getDefaultInstance().getMetadataFileEntry(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + /** + * 
+     * This is nullable in Thrift but I am not marking as optional as
+     * I think it should always be set
+     *
+ * + * string metadataFileEntry = 1; + * @param value The bytes for metadataFileEntry to set. + * @return This builder for chaining. + */ + public Builder setMetadataFileEntryBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + metadataFileEntry_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + + private long size_ ; + /** + * int64 size = 2; + * @return The size. + */ + @java.lang.Override + public long getSize() { + return size_; + } + /** + * int64 size = 2; + * @param value The size to set. + * @return This builder for chaining. + */ + public Builder setSize(long value) { + + size_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * int64 size = 2; + * @return This builder for chaining. + */ + public Builder clearSize() { + bitField0_ = (bitField0_ & ~0x00000002); + size_ = 0L; + onChanged(); + return this; + } + + private long entries_ ; + /** + * int64 entries = 3; + * @return The entries. + */ + @java.lang.Override + public long getEntries() { + return entries_; + } + /** + * int64 entries = 3; + * @param value The entries to set. + * @return This builder for chaining. + */ + public Builder setEntries(long value) { + + entries_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * int64 entries = 3; + * @return This builder for chaining. + */ + public Builder clearEntries() { + bitField0_ = (bitField0_ & ~0x00000004); + entries_ = 0L; + onChanged(); + return this; + } + + private long timestamp_ ; + /** + * int64 timestamp = 4; + * @return The timestamp. + */ + @java.lang.Override + public long getTimestamp() { + return timestamp_; + } + /** + * int64 timestamp = 4; + * @param value The timestamp to set. + * @return This builder for chaining. + */ + public Builder setTimestamp(long value) { + + timestamp_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * int64 timestamp = 4; + * @return This builder for chaining. + */ + public Builder clearTimestamp() { + bitField0_ = (bitField0_ & ~0x00000008); + timestamp_ = 0L; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.PInputFile) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.PInputFile) + private static final org.apache.accumulo.core.compaction.protobuf.PInputFile DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PInputFile(); + } + + public static org.apache.accumulo.core.compaction.protobuf.PInputFile getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PInputFile parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PInputFile getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java new file mode 100644 index 00000000000..17214c13d76 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface PInputFileOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.PInputFile) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+   * This is nullable in Thrift but I am not marking as optional as
+   * I think it should always be set
+   *
+ * + * string metadataFileEntry = 1; + * @return The metadataFileEntry. + */ + java.lang.String getMetadataFileEntry(); + /** + * 
+   * This is nullable in Thrift but I am not marking as optional as
+   * I think it should always be set
+   *
+ * + * string metadataFileEntry = 1; + * @return The bytes for metadataFileEntry. + */ + com.google.protobuf.ByteString + getMetadataFileEntryBytes(); + + /** + * int64 size = 2; + * @return The size. + */ + long getSize(); + + /** + * int64 entries = 3; + * @return The entries. + */ + long getEntries(); + + /** + * int64 timestamp = 4; + * @return The timestamp. + */ + long getTimestamp(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java new file mode 100644 index 00000000000..19a2d7121d3 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java @@ -0,0 +1,778 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.PIteratorConfig} + */ +public final class PIteratorConfig extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.PIteratorConfig) + PIteratorConfigOrBuilder { +private static final long serialVersionUID = 0L; + // Use PIteratorConfig.newBuilder() to construct. + private PIteratorConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PIteratorConfig() { + iterators_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PIteratorConfig(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorConfig_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorConfig_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.class, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder.class); + } + + public static final int ITERATORS_FIELD_NUMBER = 1; + @SuppressWarnings("serial") + private java.util.List iterators_; + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + @java.lang.Override + public java.util.List getIteratorsList() { + return iterators_; + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + @java.lang.Override + public java.util.List + getIteratorsOrBuilderList() { + return iterators_; + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + @java.lang.Override + public int getIteratorsCount() { + return iterators_.size(); + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index) { + return iterators_.get(index); + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder( + int index) { + return iterators_.get(index); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < iterators_.size(); i++) { + output.writeMessage(1, iterators_.get(i)); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < iterators_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, iterators_.get(i)); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PIteratorConfig)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.PIteratorConfig other = (org.apache.accumulo.core.compaction.protobuf.PIteratorConfig) obj; + + if (!getIteratorsList() + .equals(other.getIteratorsList())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getIteratorsCount() > 0) { + hash = (37 * hash) + ITERATORS_FIELD_NUMBER; + hash = (53 * hash) + getIteratorsList().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.PIteratorConfig} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.PIteratorConfig) + org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorConfig_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorConfig_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.class, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + if (iteratorsBuilder_ == null) { + iterators_ = java.util.Collections.emptyList(); + } else { + iterators_ = null; + iteratorsBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorConfig_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig build() { + org.apache.accumulo.core.compaction.protobuf.PIteratorConfig result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig buildPartial() { + org.apache.accumulo.core.compaction.protobuf.PIteratorConfig result = new org.apache.accumulo.core.compaction.protobuf.PIteratorConfig(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig result) { + if (iteratorsBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + iterators_ = java.util.Collections.unmodifiableList(iterators_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.iterators_ = iterators_; + } else { + result.iterators_ = iteratorsBuilder_.build(); + } + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig result) { + int from_bitField0_ = bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.PIteratorConfig) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PIteratorConfig)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig other) { + if (other == org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance()) return this; + if (iteratorsBuilder_ == null) { + if (!other.iterators_.isEmpty()) { + if (iterators_.isEmpty()) { + iterators_ = other.iterators_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureIteratorsIsMutable(); + iterators_.addAll(other.iterators_); + } + onChanged(); + } + } else { + if (!other.iterators_.isEmpty()) { + if (iteratorsBuilder_.isEmpty()) { + iteratorsBuilder_.dispose(); + iteratorsBuilder_ = null; + iterators_ = other.iterators_; + bitField0_ = (bitField0_ & ~0x00000001); + iteratorsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getIteratorsFieldBuilder() : null; + } else { + iteratorsBuilder_.addAllMessages(other.iterators_); + } + } + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting m = + input.readMessage( + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.parser(), + extensionRegistry); + if (iteratorsBuilder_ == null) { + ensureIteratorsIsMutable(); + iterators_.add(m); + } else { + iteratorsBuilder_.addMessage(m); + } + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private java.util.List iterators_ = + java.util.Collections.emptyList(); + private void ensureIteratorsIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + iterators_ = new java.util.ArrayList(iterators_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder> iteratorsBuilder_; + + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public java.util.List getIteratorsList() { + if (iteratorsBuilder_ == null) { + return java.util.Collections.unmodifiableList(iterators_); + } else { + return iteratorsBuilder_.getMessageList(); + } + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public int getIteratorsCount() { + if (iteratorsBuilder_ == null) { + return iterators_.size(); + } else { + return iteratorsBuilder_.getCount(); + } + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index) { + if (iteratorsBuilder_ == null) { + return iterators_.get(index); + } else { + return iteratorsBuilder_.getMessage(index); + } + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public Builder setIterators( + int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) { + if (iteratorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureIteratorsIsMutable(); + iterators_.set(index, value); + onChanged(); + } else { + iteratorsBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public Builder setIterators( + int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) { + if (iteratorsBuilder_ == null) { + ensureIteratorsIsMutable(); + iterators_.set(index, builderForValue.build()); + onChanged(); + } else { + iteratorsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public Builder addIterators(org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) { + if (iteratorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureIteratorsIsMutable(); + iterators_.add(value); + onChanged(); + } else { + iteratorsBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public Builder addIterators( + int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) { + if (iteratorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureIteratorsIsMutable(); + iterators_.add(index, value); + onChanged(); + } else { + iteratorsBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public Builder addIterators( + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) { + if (iteratorsBuilder_ == null) { + ensureIteratorsIsMutable(); + iterators_.add(builderForValue.build()); + onChanged(); + } else { + iteratorsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public Builder addIterators( + int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) { + if (iteratorsBuilder_ == null) { + ensureIteratorsIsMutable(); + iterators_.add(index, builderForValue.build()); + onChanged(); + } else { + iteratorsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public Builder addAllIterators( + java.lang.Iterable values) { + if (iteratorsBuilder_ == null) { + ensureIteratorsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, iterators_); + onChanged(); + } else { + iteratorsBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public Builder clearIterators() { + if (iteratorsBuilder_ == null) { + iterators_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + iteratorsBuilder_.clear(); + } + return this; + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public Builder removeIterators(int index) { + if (iteratorsBuilder_ == null) { + ensureIteratorsIsMutable(); + iterators_.remove(index); + onChanged(); + } else { + iteratorsBuilder_.remove(index); + } + return this; + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder getIteratorsBuilder( + int index) { + return getIteratorsFieldBuilder().getBuilder(index); + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder( + int index) { + if (iteratorsBuilder_ == null) { + return iterators_.get(index); } else { + return iteratorsBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public java.util.List + getIteratorsOrBuilderList() { + if (iteratorsBuilder_ != null) { + return iteratorsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(iterators_); + } + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder addIteratorsBuilder() { + return getIteratorsFieldBuilder().addBuilder( + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance()); + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder addIteratorsBuilder( + int index) { + return getIteratorsFieldBuilder().addBuilder( + index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance()); + } + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + public java.util.List + getIteratorsBuilderList() { + return getIteratorsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder> + getIteratorsFieldBuilder() { + if (iteratorsBuilder_ == null) { + iteratorsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder>( + iterators_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + iterators_ = null; + } + return iteratorsBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.PIteratorConfig) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.PIteratorConfig) + private static final org.apache.accumulo.core.compaction.protobuf.PIteratorConfig DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PIteratorConfig(); + } + + public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PIteratorConfig parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java new file mode 100644 index 00000000000..5982fc7c81c --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface PIteratorConfigOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.PIteratorConfig) + com.google.protobuf.MessageOrBuilder { + + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + java.util.List + getIteratorsList(); + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index); + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + int getIteratorsCount(); + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + java.util.List + getIteratorsOrBuilderList(); + /** + * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + */ + org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder( + int index); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java new file mode 100644 index 00000000000..2dfa614b0c7 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java @@ -0,0 +1,1041 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.PIteratorSetting} + */ +public final class PIteratorSetting extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.PIteratorSetting) + PIteratorSettingOrBuilder { +private static final long serialVersionUID = 0L; + // Use PIteratorSetting.newBuilder() to construct. + private PIteratorSetting(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PIteratorSetting() { + name_ = ""; + iteratorClass_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PIteratorSetting(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + @java.lang.Override + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection( + int number) { + switch (number) { + case 4: + return internalGetProperties(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.class, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder.class); + } + + public static final int PRIORITY_FIELD_NUMBER = 1; + private int priority_ = 0; + /** + * int32 priority = 1; + * @return The priority. + */ + @java.lang.Override + public int getPriority() { + return priority_; + } + + public static final int NAME_FIELD_NUMBER = 2; + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; + /** + * string name = 2; + * @return The name. + */ + @java.lang.Override + public java.lang.String getName() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } + } + /** + * string name = 2; + * @return The bytes for name. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int ITERATORCLASS_FIELD_NUMBER = 3; + @SuppressWarnings("serial") + private volatile java.lang.Object iteratorClass_ = ""; + /** + * string iteratorClass = 3; + * @return The iteratorClass. + */ + @java.lang.Override + public java.lang.String getIteratorClass() { + java.lang.Object ref = iteratorClass_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + iteratorClass_ = s; + return s; + } + } + /** + * string iteratorClass = 3; + * @return The bytes for iteratorClass. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getIteratorClassBytes() { + java.lang.Object ref = iteratorClass_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + iteratorClass_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int PROPERTIES_FIELD_NUMBER = 4; + private static final class PropertiesDefaultEntryHolder { + static final com.google.protobuf.MapEntry< + java.lang.String, java.lang.String> defaultEntry = + com.google.protobuf.MapEntry + .newDefaultInstance( + org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_descriptor, + com.google.protobuf.WireFormat.FieldType.STRING, + "", + com.google.protobuf.WireFormat.FieldType.STRING, + ""); + } + @SuppressWarnings("serial") + private com.google.protobuf.MapField< + java.lang.String, java.lang.String> properties_; + private com.google.protobuf.MapField + internalGetProperties() { + if (properties_ == null) { + return com.google.protobuf.MapField.emptyMapField( + PropertiesDefaultEntryHolder.defaultEntry); + } + return properties_; + } + public int getPropertiesCount() { + return internalGetProperties().getMap().size(); + } + /** + * map<string, string> properties = 4; + */ + @java.lang.Override + public boolean containsProperties( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + return internalGetProperties().getMap().containsKey(key); + } + /** + * Use {@link #getPropertiesMap()} instead. + */ + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getProperties() { + return getPropertiesMap(); + } + /** + * map<string, string> properties = 4; + */ + @java.lang.Override + public java.util.Map getPropertiesMap() { + return internalGetProperties().getMap(); + } + /** + * map<string, string> properties = 4; + */ + @java.lang.Override + public /* nullable */ +java.lang.String getPropertiesOrDefault( + java.lang.String key, + /* nullable */ +java.lang.String defaultValue) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetProperties().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * map<string, string> properties = 4; + */ + @java.lang.Override + public java.lang.String getPropertiesOrThrow( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetProperties().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (priority_ != 0) { + output.writeInt32(1, priority_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(iteratorClass_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, iteratorClass_); + } + com.google.protobuf.GeneratedMessageV3 + .serializeStringMapTo( + output, + internalGetProperties(), + PropertiesDefaultEntryHolder.defaultEntry, + 4); + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (priority_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, priority_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(iteratorClass_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, iteratorClass_); + } + for (java.util.Map.Entry entry + : internalGetProperties().getMap().entrySet()) { + com.google.protobuf.MapEntry + properties__ = PropertiesDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, properties__); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PIteratorSetting)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting other = (org.apache.accumulo.core.compaction.protobuf.PIteratorSetting) obj; + + if (getPriority() + != other.getPriority()) return false; + if (!getName() + .equals(other.getName())) return false; + if (!getIteratorClass() + .equals(other.getIteratorClass())) return false; + if (!internalGetProperties().equals( + other.internalGetProperties())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PRIORITY_FIELD_NUMBER; + hash = (53 * hash) + getPriority(); + hash = (37 * hash) + NAME_FIELD_NUMBER; + hash = (53 * hash) + getName().hashCode(); + hash = (37 * hash) + ITERATORCLASS_FIELD_NUMBER; + hash = (53 * hash) + getIteratorClass().hashCode(); + if (!internalGetProperties().getMap().isEmpty()) { + hash = (37 * hash) + PROPERTIES_FIELD_NUMBER; + hash = (53 * hash) + internalGetProperties().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PIteratorSetting prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.PIteratorSetting} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.PIteratorSetting) + org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection( + int number) { + switch (number) { + case 4: + return internalGetProperties(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection( + int number) { + switch (number) { + case 4: + return internalGetMutableProperties(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.class, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + priority_ = 0; + name_ = ""; + iteratorClass_ = ""; + internalGetMutableProperties().clear(); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting build() { + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting buildPartial() { + org.apache.accumulo.core.compaction.protobuf.PIteratorSetting result = new org.apache.accumulo.core.compaction.protobuf.PIteratorSetting(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PIteratorSetting result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.priority_ = priority_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.iteratorClass_ = iteratorClass_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.properties_ = internalGetProperties(); + result.properties_.makeImmutable(); + } + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.PIteratorSetting) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PIteratorSetting)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PIteratorSetting other) { + if (other == org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance()) return this; + if (other.getPriority() != 0) { + setPriority(other.getPriority()); + } + if (!other.getName().isEmpty()) { + name_ = other.name_; + bitField0_ |= 0x00000002; + onChanged(); + } + if (!other.getIteratorClass().isEmpty()) { + iteratorClass_ = other.iteratorClass_; + bitField0_ |= 0x00000004; + onChanged(); + } + internalGetMutableProperties().mergeFrom( + other.internalGetProperties()); + bitField0_ |= 0x00000008; + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + priority_ = input.readInt32(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 18: { + name_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + iteratorClass_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 34: { + com.google.protobuf.MapEntry + properties__ = input.readMessage( + PropertiesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + internalGetMutableProperties().getMutableMap().put( + properties__.getKey(), properties__.getValue()); + bitField0_ |= 0x00000008; + break; + } // case 34 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private int priority_ ; + /** + * int32 priority = 1; + * @return The priority. + */ + @java.lang.Override + public int getPriority() { + return priority_; + } + /** + * int32 priority = 1; + * @param value The priority to set. + * @return This builder for chaining. + */ + public Builder setPriority(int value) { + + priority_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * int32 priority = 1; + * @return This builder for chaining. + */ + public Builder clearPriority() { + bitField0_ = (bitField0_ & ~0x00000001); + priority_ = 0; + onChanged(); + return this; + } + + private java.lang.Object name_ = ""; + /** + * string name = 2; + * @return The name. + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string name = 2; + * @return The bytes for name. + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string name = 2; + * @param value The name to set. + * @return This builder for chaining. + */ + public Builder setName( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + name_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * string name = 2; + * @return This builder for chaining. + */ + public Builder clearName() { + name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + * string name = 2; + * @param value The bytes for name to set. + * @return This builder for chaining. + */ + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + name_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + + private java.lang.Object iteratorClass_ = ""; + /** + * string iteratorClass = 3; + * @return The iteratorClass. + */ + public java.lang.String getIteratorClass() { + java.lang.Object ref = iteratorClass_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + iteratorClass_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string iteratorClass = 3; + * @return The bytes for iteratorClass. + */ + public com.google.protobuf.ByteString + getIteratorClassBytes() { + java.lang.Object ref = iteratorClass_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + iteratorClass_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string iteratorClass = 3; + * @param value The iteratorClass to set. + * @return This builder for chaining. + */ + public Builder setIteratorClass( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + iteratorClass_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * string iteratorClass = 3; + * @return This builder for chaining. + */ + public Builder clearIteratorClass() { + iteratorClass_ = getDefaultInstance().getIteratorClass(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + return this; + } + /** + * string iteratorClass = 3; + * @param value The bytes for iteratorClass to set. + * @return This builder for chaining. + */ + public Builder setIteratorClassBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + iteratorClass_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + + private com.google.protobuf.MapField< + java.lang.String, java.lang.String> properties_; + private com.google.protobuf.MapField + internalGetProperties() { + if (properties_ == null) { + return com.google.protobuf.MapField.emptyMapField( + PropertiesDefaultEntryHolder.defaultEntry); + } + return properties_; + } + private com.google.protobuf.MapField + internalGetMutableProperties() { + if (properties_ == null) { + properties_ = com.google.protobuf.MapField.newMapField( + PropertiesDefaultEntryHolder.defaultEntry); + } + if (!properties_.isMutable()) { + properties_ = properties_.copy(); + } + bitField0_ |= 0x00000008; + onChanged(); + return properties_; + } + public int getPropertiesCount() { + return internalGetProperties().getMap().size(); + } + /** + * map<string, string> properties = 4; + */ + @java.lang.Override + public boolean containsProperties( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + return internalGetProperties().getMap().containsKey(key); + } + /** + * Use {@link #getPropertiesMap()} instead. + */ + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getProperties() { + return getPropertiesMap(); + } + /** + * map<string, string> properties = 4; + */ + @java.lang.Override + public java.util.Map getPropertiesMap() { + return internalGetProperties().getMap(); + } + /** + * map<string, string> properties = 4; + */ + @java.lang.Override + public /* nullable */ +java.lang.String getPropertiesOrDefault( + java.lang.String key, + /* nullable */ +java.lang.String defaultValue) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetProperties().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * map<string, string> properties = 4; + */ + @java.lang.Override + public java.lang.String getPropertiesOrThrow( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + java.util.Map map = + internalGetProperties().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + public Builder clearProperties() { + bitField0_ = (bitField0_ & ~0x00000008); + internalGetMutableProperties().getMutableMap() + .clear(); + return this; + } + /** + * map<string, string> properties = 4; + */ + public Builder removeProperties( + java.lang.String key) { + if (key == null) { throw new NullPointerException("map key"); } + internalGetMutableProperties().getMutableMap() + .remove(key); + return this; + } + /** + * Use alternate mutation accessors instead. + */ + @java.lang.Deprecated + public java.util.Map + getMutableProperties() { + bitField0_ |= 0x00000008; + return internalGetMutableProperties().getMutableMap(); + } + /** + * map<string, string> properties = 4; + */ + public Builder putProperties( + java.lang.String key, + java.lang.String value) { + if (key == null) { throw new NullPointerException("map key"); } + if (value == null) { throw new NullPointerException("map value"); } + internalGetMutableProperties().getMutableMap() + .put(key, value); + bitField0_ |= 0x00000008; + return this; + } + /** + * map<string, string> properties = 4; + */ + public Builder putAllProperties( + java.util.Map values) { + internalGetMutableProperties().getMutableMap() + .putAll(values); + bitField0_ |= 0x00000008; + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.PIteratorSetting) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.PIteratorSetting) + private static final org.apache.accumulo.core.compaction.protobuf.PIteratorSetting DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PIteratorSetting(); + } + + public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PIteratorSetting parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java new file mode 100644 index 00000000000..0aa85f66ff9 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface PIteratorSettingOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.PIteratorSetting) + com.google.protobuf.MessageOrBuilder { + + /** + * int32 priority = 1; + * @return The priority. + */ + int getPriority(); + + /** + * string name = 2; + * @return The name. + */ + java.lang.String getName(); + /** + * string name = 2; + * @return The bytes for name. + */ + com.google.protobuf.ByteString + getNameBytes(); + + /** + * string iteratorClass = 3; + * @return The iteratorClass. + */ + java.lang.String getIteratorClass(); + /** + * string iteratorClass = 3; + * @return The bytes for iteratorClass. + */ + com.google.protobuf.ByteString + getIteratorClassBytes(); + + /** + * map<string, string> properties = 4; + */ + int getPropertiesCount(); + /** + * map<string, string> properties = 4; + */ + boolean containsProperties( + java.lang.String key); + /** + * Use {@link #getPropertiesMap()} instead. + */ + @java.lang.Deprecated + java.util.Map + getProperties(); + /** + * map<string, string> properties = 4; + */ + java.util.Map + getPropertiesMap(); + /** + * map<string, string> properties = 4; + */ + /* nullable */ +java.lang.String getPropertiesOrDefault( + java.lang.String key, + /* nullable */ +java.lang.String defaultValue); + /** + * map<string, string> properties = 4; + */ + java.lang.String getPropertiesOrThrow( + java.lang.String key); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java new file mode 100644 index 00000000000..57bb728484f --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java @@ -0,0 +1,702 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.PKeyExtent} + */ +public final class PKeyExtent extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.PKeyExtent) + PKeyExtentOrBuilder { +private static final long serialVersionUID = 0L; + // Use PKeyExtent.newBuilder() to construct. + private PKeyExtent(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PKeyExtent() { + table_ = com.google.protobuf.ByteString.EMPTY; + endRow_ = com.google.protobuf.ByteString.EMPTY; + prevEndRow_ = com.google.protobuf.ByteString.EMPTY; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PKeyExtent(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PKeyExtent_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PKeyExtent_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PKeyExtent.class, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder.class); + } + + private int bitField0_; + public static final int TABLE_FIELD_NUMBER = 1; + private com.google.protobuf.ByteString table_ = com.google.protobuf.ByteString.EMPTY; + /** + * bytes table = 1; + * @return The table. + */ + @java.lang.Override + public com.google.protobuf.ByteString getTable() { + return table_; + } + + public static final int ENDROW_FIELD_NUMBER = 2; + private com.google.protobuf.ByteString endRow_ = com.google.protobuf.ByteString.EMPTY; + /** + * 
+   * optional to generate hasEndRow() and hasPrevEndRow() becuase
+   * of no nulls in protobuf
+   *
+ * + * optional bytes endRow = 2; + * @return Whether the endRow field is set. + */ + @java.lang.Override + public boolean hasEndRow() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * 
+   * optional to generate hasEndRow() and hasPrevEndRow() becuase
+   * of no nulls in protobuf
+   *
+ * + * optional bytes endRow = 2; + * @return The endRow. + */ + @java.lang.Override + public com.google.protobuf.ByteString getEndRow() { + return endRow_; + } + + public static final int PREVENDROW_FIELD_NUMBER = 3; + private com.google.protobuf.ByteString prevEndRow_ = com.google.protobuf.ByteString.EMPTY; + /** + * optional bytes prevEndRow = 3; + * @return Whether the prevEndRow field is set. + */ + @java.lang.Override + public boolean hasPrevEndRow() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * optional bytes prevEndRow = 3; + * @return The prevEndRow. + */ + @java.lang.Override + public com.google.protobuf.ByteString getPrevEndRow() { + return prevEndRow_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!table_.isEmpty()) { + output.writeBytes(1, table_); + } + if (((bitField0_ & 0x00000001) != 0)) { + output.writeBytes(2, endRow_); + } + if (((bitField0_ & 0x00000002) != 0)) { + output.writeBytes(3, prevEndRow_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!table_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, table_); + } + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(2, endRow_); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(3, prevEndRow_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PKeyExtent)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.PKeyExtent other = (org.apache.accumulo.core.compaction.protobuf.PKeyExtent) obj; + + if (!getTable() + .equals(other.getTable())) return false; + if (hasEndRow() != other.hasEndRow()) return false; + if (hasEndRow()) { + if (!getEndRow() + .equals(other.getEndRow())) return false; + } + if (hasPrevEndRow() != other.hasPrevEndRow()) return false; + if (hasPrevEndRow()) { + if (!getPrevEndRow() + .equals(other.getPrevEndRow())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + TABLE_FIELD_NUMBER; + hash = (53 * hash) + getTable().hashCode(); + if (hasEndRow()) { + hash = (37 * hash) + ENDROW_FIELD_NUMBER; + hash = (53 * hash) + getEndRow().hashCode(); + } + if (hasPrevEndRow()) { + hash = (37 * hash) + PREVENDROW_FIELD_NUMBER; + hash = (53 * hash) + getPrevEndRow().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PKeyExtent prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.PKeyExtent} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.PKeyExtent) + org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PKeyExtent_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PKeyExtent_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PKeyExtent.class, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.PKeyExtent.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + table_ = com.google.protobuf.ByteString.EMPTY; + endRow_ = com.google.protobuf.ByteString.EMPTY; + prevEndRow_ = com.google.protobuf.ByteString.EMPTY; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PKeyExtent_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent build() { + org.apache.accumulo.core.compaction.protobuf.PKeyExtent result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent buildPartial() { + org.apache.accumulo.core.compaction.protobuf.PKeyExtent result = new org.apache.accumulo.core.compaction.protobuf.PKeyExtent(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PKeyExtent result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.table_ = table_; + } + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.endRow_ = endRow_; + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.prevEndRow_ = prevEndRow_; + to_bitField0_ |= 0x00000002; + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.PKeyExtent) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PKeyExtent)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PKeyExtent other) { + if (other == org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance()) return this; + if (other.getTable() != com.google.protobuf.ByteString.EMPTY) { + setTable(other.getTable()); + } + if (other.hasEndRow()) { + setEndRow(other.getEndRow()); + } + if (other.hasPrevEndRow()) { + setPrevEndRow(other.getPrevEndRow()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + table_ = input.readBytes(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + endRow_ = input.readBytes(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + prevEndRow_ = input.readBytes(); + bitField0_ |= 0x00000004; + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private com.google.protobuf.ByteString table_ = com.google.protobuf.ByteString.EMPTY; + /** + * bytes table = 1; + * @return The table. + */ + @java.lang.Override + public com.google.protobuf.ByteString getTable() { + return table_; + } + /** + * bytes table = 1; + * @param value The table to set. + * @return This builder for chaining. + */ + public Builder setTable(com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + table_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * bytes table = 1; + * @return This builder for chaining. + */ + public Builder clearTable() { + bitField0_ = (bitField0_ & ~0x00000001); + table_ = getDefaultInstance().getTable(); + onChanged(); + return this; + } + + private com.google.protobuf.ByteString endRow_ = com.google.protobuf.ByteString.EMPTY; + /** + * 
+     * optional to generate hasEndRow() and hasPrevEndRow() becuase
+     * of no nulls in protobuf
+     *
+ * + * optional bytes endRow = 2; + * @return Whether the endRow field is set. + */ + @java.lang.Override + public boolean hasEndRow() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * 
+     * optional to generate hasEndRow() and hasPrevEndRow() becuase
+     * of no nulls in protobuf
+     *
+ * + * optional bytes endRow = 2; + * @return The endRow. + */ + @java.lang.Override + public com.google.protobuf.ByteString getEndRow() { + return endRow_; + } + /** + * 
+     * optional to generate hasEndRow() and hasPrevEndRow() becuase
+     * of no nulls in protobuf
+     *
+ * + * optional bytes endRow = 2; + * @param value The endRow to set. + * @return This builder for chaining. + */ + public Builder setEndRow(com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + endRow_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * 
+     * optional to generate hasEndRow() and hasPrevEndRow() becuase
+     * of no nulls in protobuf
+     *
+ * + * optional bytes endRow = 2; + * @return This builder for chaining. + */ + public Builder clearEndRow() { + bitField0_ = (bitField0_ & ~0x00000002); + endRow_ = getDefaultInstance().getEndRow(); + onChanged(); + return this; + } + + private com.google.protobuf.ByteString prevEndRow_ = com.google.protobuf.ByteString.EMPTY; + /** + * optional bytes prevEndRow = 3; + * @return Whether the prevEndRow field is set. + */ + @java.lang.Override + public boolean hasPrevEndRow() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * optional bytes prevEndRow = 3; + * @return The prevEndRow. + */ + @java.lang.Override + public com.google.protobuf.ByteString getPrevEndRow() { + return prevEndRow_; + } + /** + * optional bytes prevEndRow = 3; + * @param value The prevEndRow to set. + * @return This builder for chaining. + */ + public Builder setPrevEndRow(com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + prevEndRow_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * optional bytes prevEndRow = 3; + * @return This builder for chaining. + */ + public Builder clearPrevEndRow() { + bitField0_ = (bitField0_ & ~0x00000004); + prevEndRow_ = getDefaultInstance().getPrevEndRow(); + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.PKeyExtent) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.PKeyExtent) + private static final org.apache.accumulo.core.compaction.protobuf.PKeyExtent DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PKeyExtent(); + } + + public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PKeyExtent parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java new file mode 100644 index 00000000000..1e22d0777ea --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java @@ -0,0 +1,66 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface PKeyExtentOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.PKeyExtent) + com.google.protobuf.MessageOrBuilder { + + /** + * bytes table = 1; + * @return The table. + */ + com.google.protobuf.ByteString getTable(); + + /** + * 
+   * optional to generate hasEndRow() and hasPrevEndRow() becuase
+   * of no nulls in protobuf
+   *
+ * + * optional bytes endRow = 2; + * @return Whether the endRow field is set. + */ + boolean hasEndRow(); + /** + * 
+   * optional to generate hasEndRow() and hasPrevEndRow() becuase
+   * of no nulls in protobuf
+   *
+ * + * optional bytes endRow = 2; + * @return The endRow. + */ + com.google.protobuf.ByteString getEndRow(); + + /** + * optional bytes prevEndRow = 3; + * @return Whether the prevEndRow field is set. + */ + boolean hasPrevEndRow(); + /** + * optional bytes prevEndRow = 3; + * @return The prevEndRow. + */ + com.google.protobuf.ByteString getPrevEndRow(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java new file mode 100644 index 00000000000..9a696549514 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java @@ -0,0 +1,683 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.PNextCompactionJob} + */ +public final class PNextCompactionJob extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.PNextCompactionJob) + PNextCompactionJobOrBuilder { +private static final long serialVersionUID = 0L; + // Use PNextCompactionJob.newBuilder() to construct. + private PNextCompactionJob(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PNextCompactionJob() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PNextCompactionJob(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.class, org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.Builder.class); + } + + private int bitField0_; + public static final int JOB_FIELD_NUMBER = 1; + private org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob job_; + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + * @return Whether the job field is set. + */ + @java.lang.Override + public boolean hasJob() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + * @return The job. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob() { + return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_; + } + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() { + return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_; + } + + public static final int COMPACTORCOUNT_FIELD_NUMBER = 2; + private int compactorCount_ = 0; + /** + * int32 compactorCount = 2; + * @return The compactorCount. + */ + @java.lang.Override + public int getCompactorCount() { + return compactorCount_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(1, getJob()); + } + if (compactorCount_ != 0) { + output.writeInt32(2, compactorCount_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getJob()); + } + if (compactorCount_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, compactorCount_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob other = (org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob) obj; + + if (hasJob() != other.hasJob()) return false; + if (hasJob()) { + if (!getJob() + .equals(other.getJob())) return false; + } + if (getCompactorCount() + != other.getCompactorCount()) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasJob()) { + hash = (37 * hash) + JOB_FIELD_NUMBER; + hash = (53 * hash) + getJob().hashCode(); + } + hash = (37 * hash) + COMPACTORCOUNT_FIELD_NUMBER; + hash = (53 * hash) + getCompactorCount(); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.PNextCompactionJob} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.PNextCompactionJob) + org.apache.accumulo.core.compaction.protobuf.PNextCompactionJobOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.class, org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getJobFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + job_ = null; + if (jobBuilder_ != null) { + jobBuilder_.dispose(); + jobBuilder_ = null; + } + compactorCount_ = 0; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob build() { + org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob buildPartial() { + org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob result = new org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.job_ = jobBuilder_ == null + ? job_ + : jobBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.compactorCount_ = compactorCount_; + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob other) { + if (other == org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.getDefaultInstance()) return this; + if (other.hasJob()) { + mergeJob(other.getJob()); + } + if (other.getCompactorCount() != 0) { + setCompactorCount(other.getCompactorCount()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getJobFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + compactorCount_ = input.readInt32(); + bitField0_ |= 0x00000002; + break; + } // case 16 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob job_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder> jobBuilder_; + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + * @return Whether the job field is set. + */ + public boolean hasJob() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + * @return The job. + */ + public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob() { + if (jobBuilder_ == null) { + return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_; + } else { + return jobBuilder_.getMessage(); + } + } + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + */ + public Builder setJob(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob value) { + if (jobBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + job_ = value; + } else { + jobBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + */ + public Builder setJob( + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder builderForValue) { + if (jobBuilder_ == null) { + job_ = builderForValue.build(); + } else { + jobBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + */ + public Builder mergeJob(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob value) { + if (jobBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + job_ != null && + job_ != org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance()) { + getJobBuilder().mergeFrom(value); + } else { + job_ = value; + } + } else { + jobBuilder_.mergeFrom(value); + } + if (job_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } + return this; + } + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + */ + public Builder clearJob() { + bitField0_ = (bitField0_ & ~0x00000001); + job_ = null; + if (jobBuilder_ != null) { + jobBuilder_.dispose(); + jobBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder getJobBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getJobFieldBuilder().getBuilder(); + } + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() { + if (jobBuilder_ != null) { + return jobBuilder_.getMessageOrBuilder(); + } else { + return job_ == null ? + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_; + } + } + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder> + getJobFieldBuilder() { + if (jobBuilder_ == null) { + jobBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder>( + getJob(), + getParentForChildren(), + isClean()); + job_ = null; + } + return jobBuilder_; + } + + private int compactorCount_ ; + /** + * int32 compactorCount = 2; + * @return The compactorCount. + */ + @java.lang.Override + public int getCompactorCount() { + return compactorCount_; + } + /** + * int32 compactorCount = 2; + * @param value The compactorCount to set. + * @return This builder for chaining. + */ + public Builder setCompactorCount(int value) { + + compactorCount_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * int32 compactorCount = 2; + * @return This builder for chaining. + */ + public Builder clearCompactorCount() { + bitField0_ = (bitField0_ & ~0x00000002); + compactorCount_ = 0; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.PNextCompactionJob) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.PNextCompactionJob) + private static final org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob(); + } + + public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PNextCompactionJob parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java new file mode 100644 index 00000000000..4be982c7bfc --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface PNextCompactionJobOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.PNextCompactionJob) + com.google.protobuf.MessageOrBuilder { + + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + * @return Whether the job field is set. + */ + boolean hasJob(); + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + * @return The job. + */ + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob(); + /** + * .compaction_coordinator.PExternalCompactionJob job = 1; + */ + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder(); + + /** + * int32 compactorCount = 2; + * @return The compactorCount. + */ + int getCompactorCount(); +} From 00fcedd2a58a5d6d72bb0a9f4a74eb754f7f93c8 Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Sun, 30 Jun 2024 12:33:23 -0400 Subject: [PATCH 03/25] Update the Compactor and Compaction coordinator to use new grpc service getCompactionJob() now uses grpc. to minimize the changes the existing Thrift objects are converted between protobuf and back. If protobuf is kept then Thrift will eventually be removed entirely. --- .../accumulo/core/rpc/ThriftProtobufUtil.java | 319 ++++++++++++++++++ .../CompactionCoordinatorServiceServer.java | 71 ++++ .../apache/accumulo/compactor/Compactor.java | 42 ++- .../org/apache/accumulo/manager/Manager.java | 17 + .../coordinator/CompactionCoordinator.java | 51 +++ 5 files changed, 494 insertions(+), 6 deletions(-) create mode 100644 core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java create mode 100644 server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java new file mode 100644 index 00000000000..4196e41769f --- /dev/null +++ b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java @@ -0,0 +1,319 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.accumulo.core.rpc; + +import static java.util.stream.Collectors.toList; + +import java.util.Optional; + +import org.apache.accumulo.core.clientImpl.thrift.TInfo; +import org.apache.accumulo.core.compaction.protobuf.PCompactionKind; +import org.apache.accumulo.core.compaction.protobuf.PCredentials; +import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob; +import org.apache.accumulo.core.compaction.protobuf.PFateId; +import org.apache.accumulo.core.compaction.protobuf.PFateInstanceType; +import org.apache.accumulo.core.compaction.protobuf.PInfo; +import org.apache.accumulo.core.compaction.protobuf.PInputFile; +import org.apache.accumulo.core.compaction.protobuf.PIteratorConfig; +import org.apache.accumulo.core.compaction.protobuf.PIteratorSetting; +import org.apache.accumulo.core.compaction.protobuf.PKeyExtent; +import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob; +import org.apache.accumulo.core.compaction.thrift.TNextCompactionJob; +import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent; +import org.apache.accumulo.core.manager.thrift.TFateId; +import org.apache.accumulo.core.manager.thrift.TFateInstanceType; +import org.apache.accumulo.core.securityImpl.thrift.TCredentials; +import org.apache.accumulo.core.tabletserver.thrift.InputFile; +import org.apache.accumulo.core.tabletserver.thrift.IteratorConfig; +import org.apache.accumulo.core.tabletserver.thrift.TCompactionKind; +import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; +import org.apache.accumulo.core.tabletserver.thrift.TIteratorSetting; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.protobuf.ByteString; + +/** + * This is a utility class for converting between the equivalent Thrift and Protobuf versions of the + * objects needed using the GRPC service. + * + * TODO: This code may eventually be able to be removed + * + * This class is designed mostly just for this prototype/proof of concept and would probably not be + * needed if we plan to keep using protocol buffers and GRPC going forward. The Thrift API is used + * by the rest of the compaction code in the Compactor and Compaction Coordinator, so doing a + * conversion made it easy to isolate the GRPC changes to the one getCompactionJob() RPC call + * without having to impact the rest of the code for this prototype. + * + * Ideally, if we decide to go with GRPC and keep protocol buffers, then we would want to remove the + * Thrift conversion entirely for performance reasons and just go between the native objects and + * protocol buffer versions. + * + * Thrift and proto3 are pretty similar with their defintions and usage but there are a couple key + * differences to note: + * + * 1) Thrift uses constructors/setters for creation objects and protocol buffers uses the builder + * pattern + * + * 2) There are no nulls allowed in proto3. All values have a default value (empty string, etc) + * depending on the type. There are also no truly optional fields (everything is initialized), + * however, the latest versions of proto3 adds back support for the "optional" keyword. This allows + * us to replicate null because adding the keyword generates hasX() methods. + * + * Instead of checking if a field is null, we can check if the field was set by calling hasX(). For + * example, below with TCredentials, we would check if the instanceId was set by checking for null + * but for the proto version of PCredentials we can call credentials.hasInstanceId() and check that + * boolean. For more info see https://protobuf.dev/programming-guides/proto3/ + * + */ +public class ThriftProtobufUtil { + + private static final Logger LOG = LoggerFactory.getLogger(ThriftProtobufUtil.class); + + public static PInfo convert(TInfo tinfo) { + var builder = PInfo.newBuilder(); + Optional.ofNullable(tinfo.getHeaders()).ifPresent(builder::putAllHeaders); + return builder.build(); + } + + public static TInfo convert(PInfo pinfo) { + return new TInfo(pinfo.getHeadersMap()); + } + + public static PCredentials convert(TCredentials credentials) { + var builder = PCredentials.newBuilder(); + Optional.ofNullable(credentials.getPrincipal()).ifPresent(builder::setPrincipal); + Optional.ofNullable(credentials.getTokenClassName()).ifPresent(builder::setTokenClassName); + Optional.ofNullable(credentials.getToken()) + .ifPresent(token -> builder.setToken(ByteString.copyFrom(token))); + Optional.ofNullable(credentials.getInstanceId()).ifPresent(builder::setInstanceId); + return builder.build(); + } + + public static TCredentials convert(PCredentials credentials) { + var principal = credentials.hasPrincipal() ? credentials.getPrincipal() : null; + var tokenClassName = credentials.hasTokenClassName() ? credentials.getTokenClassName() : null; + var token = credentials.hasToken() ? credentials.getToken().asReadOnlyByteBuffer() : null; + var instanceId = credentials.hasInstanceId() ? credentials.getInstanceId() : null; + return new TCredentials(principal, tokenClassName, token, instanceId); + } + + public static TKeyExtent convert(PKeyExtent extent) { + TKeyExtent tExtent = new TKeyExtent(); + tExtent.setTable(extent.getTable().asReadOnlyByteBuffer()); + if (extent.hasPrevEndRow()) { + tExtent.setPrevEndRow(extent.getPrevEndRow().asReadOnlyByteBuffer()); + } + if (extent.hasEndRow()) { + tExtent.setEndRow(extent.getEndRow().asReadOnlyByteBuffer()); + } + return tExtent; + } + + public static PKeyExtent convert(TKeyExtent extent) { + var builder = PKeyExtent.newBuilder().setTable(ByteString.copyFrom(extent.getTable())); + Optional.ofNullable(extent.getPrevEndRow()) + .ifPresent(prevEndRow -> builder.setPrevEndRow(ByteString.copyFrom(prevEndRow))); + Optional.ofNullable(extent.getEndRow()) + .ifPresent(endRow -> builder.setEndRow(ByteString.copyFrom(endRow))); + return builder.build(); + } + + public static InputFile convert(PInputFile inputFile) { + InputFile tInputFile = new InputFile(); + tInputFile.setMetadataFileEntry(inputFile.getMetadataFileEntry()); + tInputFile.setSize(inputFile.getSize()); + tInputFile.setEntries(inputFile.getEntries()); + tInputFile.setTimestamp(inputFile.getTimestamp()); + return tInputFile; + } + + public static PInputFile convert(InputFile inputFile) { + return PInputFile.newBuilder().setMetadataFileEntry(inputFile.getMetadataFileEntry()) + .setSize(inputFile.getSize()).setEntries(inputFile.getEntries()) + .setTimestamp(inputFile.getTimestamp()).build(); + } + + public static TIteratorSetting convert(PIteratorSetting iteratorSetting) { + TIteratorSetting tIterSetting = new TIteratorSetting(); + tIterSetting.setPriority(iteratorSetting.getPriority()); + tIterSetting.setName(iteratorSetting.getName()); + tIterSetting.setIteratorClass(iteratorSetting.getIteratorClass()); + tIterSetting.setProperties(iteratorSetting.getPropertiesMap()); + return tIterSetting; + } + + public static PIteratorSetting convert(TIteratorSetting iteratorSetting) { + return PIteratorSetting.newBuilder().setPriority(iteratorSetting.getPriority()) + .setName(iteratorSetting.getName()).setIteratorClass(iteratorSetting.getIteratorClass()) + .putAllProperties(iteratorSetting.getProperties()).build(); + } + + public static IteratorConfig convert(PIteratorConfig setting) { + IteratorConfig tIterConfig = new IteratorConfig(); + tIterConfig.setIterators( + setting.getIteratorsList().stream().map(ThriftProtobufUtil::convert).collect(toList())); + return tIterConfig; + } + + public static PIteratorConfig convert(IteratorConfig setting) { + return PIteratorConfig.newBuilder() + .addAllIterators( + setting.getIterators().stream().map(ThriftProtobufUtil::convert).collect(toList())) + .build(); + } + + public static TCompactionKind convert(PCompactionKind kind) { + switch (kind) { + case CK_SYSTEM: + return TCompactionKind.SYSTEM; + case CK_USER: + return TCompactionKind.USER; + case CK_UNKNOWN: + return null; + default: + throw new IllegalArgumentException("Unexpected PCompactionKind: " + kind); + } + } + + public static PCompactionKind convert(TCompactionKind kind) { + if (kind == null) { + return PCompactionKind.CK_UNKNOWN; + } + switch (kind) { + case SYSTEM: + return PCompactionKind.CK_SYSTEM; + case USER: + return PCompactionKind.CK_USER; + default: + throw new IllegalArgumentException("Unexpected TCompactionKind: " + kind); + } + } + + public static TFateId convert(PFateId fateId) { + TFateInstanceType type; + + switch (fateId.getType()) { + case FI_META: + type = TFateInstanceType.META; + break; + case FI_USER: + type = TFateInstanceType.USER; + break; + case FI_UNKNOWN: + return null; + default: + throw new IllegalArgumentException("Unexpected TFateInstanceType: " + fateId.getType()); + } + + return new TFateId(type, fateId.getTxUUIDStr()); + } + + public static PFateId convert(TFateId fateId) { + PFateInstanceType type; + + switch (fateId.getType()) { + case META: + type = PFateInstanceType.FI_META; + break; + case USER: + type = PFateInstanceType.FI_USER; + break; + default: + throw new IllegalArgumentException("Unexpected TFateInstanceType: " + fateId.getType()); + } + + return PFateId.newBuilder().setTypeValue(type.getNumber()).setTxUUIDStr(fateId.getTxUUIDStr()) + .build(); + } + + public static PExternalCompactionJob convert(TExternalCompactionJob extJob) { + var builder = PExternalCompactionJob.newBuilder(); + + Optional.ofNullable(extJob.getExternalCompactionId()) + .ifPresent(builder::setExternalCompactionId); + Optional.ofNullable(extJob.getExtent()).map(ThriftProtobufUtil::convert) + .ifPresent(builder::setExtent); + Optional.ofNullable(extJob.getFiles()) + .map(files -> files.stream().map(ThriftProtobufUtil::convert).collect(toList())) + .ifPresent(builder::addAllFiles); + Optional.ofNullable(extJob.getIteratorSettings()).map(ThriftProtobufUtil::convert) + .ifPresent(builder::setIteratorSettings); + Optional.ofNullable(extJob.getOutputFile()).ifPresent(builder::setOutputFile); + builder.setPropagateDeletes(extJob.isPropagateDeletes()); + Optional.ofNullable(extJob.getKind()).map(ThriftProtobufUtil::convert) + .ifPresent(builder::setKind); + Optional.ofNullable(extJob.getFateId()).map(ThriftProtobufUtil::convert) + .ifPresent(builder::setFateId); + Optional.ofNullable(extJob.getOverrides()).ifPresent(builder::putAllOverrides); + + PExternalCompactionJob job = builder.build(); + + if (extJob.getExternalCompactionId() != null) { + LOG.debug("TExternalCompactionJob: {}", extJob); + LOG.debug("PExternalCompactionJob: {}", job); + } + + return job; + } + + public static TExternalCompactionJob convert(PExternalCompactionJob extJob) { + TExternalCompactionJob tExtJob = new TExternalCompactionJob(); + + var optExtJob = Optional.of(extJob); + optExtJob.filter(PExternalCompactionJob::hasExternalCompactionId) + .map(PExternalCompactionJob::getExternalCompactionId) + .ifPresent(tExtJob::setExternalCompactionId); + optExtJob.filter(PExternalCompactionJob::hasExtent).map(job -> convert(job.getExtent())) + .ifPresent(tExtJob::setExtent); + if (!extJob.getFilesList().isEmpty()) { + tExtJob.setFiles( + extJob.getFilesList().stream().map(ThriftProtobufUtil::convert).collect(toList())); + } + optExtJob.filter(PExternalCompactionJob::hasIteratorSettings) + .map(job -> convert(job.getIteratorSettings())).ifPresent(tExtJob::setIteratorSettings); + optExtJob.filter(PExternalCompactionJob::hasOutputFile) + .map(PExternalCompactionJob::getOutputFile).ifPresent(tExtJob::setOutputFile); + tExtJob.setPropagateDeletes(extJob.getPropagateDeletes()); + optExtJob.filter(PExternalCompactionJob::hasKind).map(job -> convert(job.getKind())) + .ifPresent(tExtJob::setKind); + optExtJob.filter(PExternalCompactionJob::hasFateId).map(job -> convert(job.getFateId())) + .ifPresent(tExtJob::setFateId); + tExtJob.setOverrides(extJob.getOverridesMap()); + + if (!extJob.getExternalCompactionId().isEmpty()) { + LOG.trace("PExternalCompactionJob: {}", extJob); + LOG.trace("TExternalCompactionJob: {}", tExtJob); + } + + return tExtJob; + } + + public static TNextCompactionJob convert(PNextCompactionJob nextJob) { + var job = new TNextCompactionJob(); + job.setJob(convert(nextJob.getJob())); + job.setCompactorCount(nextJob.getCompactorCount()); + return job; + } + + public static PNextCompactionJob convert(TNextCompactionJob nextJob) { + return PNextCompactionJob.newBuilder().setCompactorCount(nextJob.getCompactorCount()) + .setJob(convert(nextJob.getJob())).build(); + } +} diff --git a/server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java b/server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java new file mode 100644 index 00000000000..44d07dd5284 --- /dev/null +++ b/server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.accumulo.server.grpc; + +import java.io.IOException; +import java.util.concurrent.TimeUnit; + +import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.grpc.Grpc; +import io.grpc.InsecureServerCredentials; +import io.grpc.Server; +import io.grpc.ServerBuilder; + +/** + * Simple wrapper to start/stop the grpc server + */ +public class CompactionCoordinatorServiceServer { + + private static final Logger logger = + LoggerFactory.getLogger(CompactionCoordinatorServiceServer.class); + + private final int port; + private final Server server; + + public CompactionCoordinatorServiceServer( + CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceImplBase service, int port) + throws IOException { + this(Grpc.newServerBuilderForPort(port, InsecureServerCredentials.create()), service, port); + } + + public CompactionCoordinatorServiceServer(ServerBuilder serverBuilder, + CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceImplBase service, int port) { + this.port = port; + server = serverBuilder.addService(service).build(); + } + + public void start() throws IOException { + server.start(); + logger.info("Starting CompactionCoordinatorService, listening on {}", port); + } + + public void stop() { + logger.info("Stopping CompactionCoordinatorService"); + try { + server.shutdown().awaitTermination(30, TimeUnit.SECONDS); + } catch (InterruptedException e) { + // TODO Do we care or want to handle this? It's on shutdown so probably can just log + logger.debug(e.getMessage(), e); + } + } + +} diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java index 5e2b0e6cd0e..78523612912 100644 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java @@ -19,6 +19,7 @@ package org.apache.accumulo.compactor; import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.core.rpc.ThriftProtobufUtil.convert; import static org.apache.accumulo.core.util.LazySingletons.RANDOM; import java.io.IOException; @@ -50,6 +51,9 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType; import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException; import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException; +import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc; +import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceBlockingStub; +import org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest; import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService; import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService.Client; import org.apache.accumulo.core.compaction.thrift.CompactorService; @@ -128,6 +132,8 @@ import com.google.common.base.Preconditions; import com.google.common.net.HostAndPort; +import io.grpc.ManagedChannel; +import io.grpc.ManagedChannelBuilder; import io.micrometer.core.instrument.FunctionCounter; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.LongTaskTimer; @@ -473,20 +479,32 @@ protected TNextCompactionJob getNextJob(Supplier uuid) throws RetriesExcee RetryableThriftCall nextJobThriftCall = new RetryableThriftCall<>(startingWaitTime, maxWaitTime, 0, () -> { - Client coordinatorClient = getCoordinatorClient(); + var grpcClient = getGrpcCoordinatorClient(); try { ExternalCompactionId eci = ExternalCompactionId.generate(uuid.get()); LOG.trace("Attempting to get next job, eci = {}", eci); currentCompactionId.set(eci); - return coordinatorClient.getCompactionJob(TraceUtil.traceInfo(), - getContext().rpcCreds(), this.getResourceGroup(), - ExternalCompactionUtil.getHostPortString(compactorAddress.getAddress()), - eci.toString()); + /* + * GRPC is now used to make the compaction job request. We keep using the Thrift objects + * and convert to/from the equivalent protocol buffer objects for now to keep the + * changes isolated from the rest of the code. + */ + var request = CompactionJobRequest.newBuilder().setPinfo(convert(TraceUtil.traceInfo())) + .setCredentials(convert(getContext().rpcCreds())) + .setGroupName(this.getResourceGroup()) + .setCompactor( + ExternalCompactionUtil.getHostPortString(compactorAddress.getAddress())) + .setExternalCompactionId(eci.toString()).build(); + // The client is making a blocking sync call here and waiting for a response + // but this could be async + return convert(grpcClient.getCompactionJob(request)); } catch (Exception e) { currentCompactionId.set(null); throw e; } finally { - ThriftUtil.returnClient(coordinatorClient, getContext()); + // TODO: We'd likely want to re-use channels in pool like we do with thrift + ManagedChannel managedChannel = (ManagedChannel) grpcClient.getChannel(); + managedChannel.shutdown(); } }); return nextJobThriftCall.run(); @@ -508,6 +526,18 @@ protected CompactionCoordinatorService.Client getCoordinatorClient() throws TTra getContext()); } + protected CompactionCoordinatorServiceBlockingStub getGrpcCoordinatorClient() + throws TTransportException { + var coordinatorHost = ExternalCompactionUtil.findCompactionCoordinator(getContext()); + if (coordinatorHost.isEmpty()) { + throw new TTransportException("Unable to get CompactionCoordinator address from ZooKeeper"); + } + // TODO: The port is just hardcoded for now and will need to be configurable + ManagedChannel channel = ManagedChannelBuilder + .forAddress(coordinatorHost.orElseThrow().getHost(), 8980).usePlaintext().build(); + return CompactionCoordinatorServiceGrpc.newBlockingStub(channel); + } + /** * Create compaction runnable * diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java index d5778a44c58..9489b724d95 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java @@ -138,6 +138,7 @@ import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.compaction.CompactionConfigStorage; import org.apache.accumulo.server.fs.VolumeManager; +import org.apache.accumulo.server.grpc.CompactionCoordinatorServiceServer; import org.apache.accumulo.server.manager.LiveTServerSet; import org.apache.accumulo.server.manager.LiveTServerSet.LiveTServersSnapshot; import org.apache.accumulo.server.manager.LiveTServerSet.TServerConnection; @@ -220,6 +221,8 @@ public class Manager extends AbstractServer ServiceLock managerLock = null; private TServer clientService = null; + private CompactionCoordinatorServiceServer grpcClientService = null; + protected volatile TabletBalancer tabletBalancer; private final BalancerEnvironment balancerEnvironment; @@ -331,6 +334,7 @@ synchronized void setManagerState(ManagerState newState) { ScheduledFuture future = getContext().getScheduledExecutor().scheduleWithFixedDelay(() -> { // This frees the main thread and will cause the manager to exit clientService.stop(); + grpcClientService.stop(); Manager.this.nextEvent.event("stopped event loop"); }, 100L, 1000L, MILLISECONDS); ThreadPools.watchNonCriticalScheduledTask(future); @@ -1030,6 +1034,18 @@ public void run() { clientService = sa.server; log.info("Started Manager client service at {}", sa.address); + final CompactionCoordinatorServiceServer grpcService; + try { + // Start up the grpc compaction service + // TODO: The port is just hardcoded for now and will need to be configurable + grpcService = + new CompactionCoordinatorServiceServer(compactionCoordinator.getGrpcService(), 8980); + grpcService.start(); + } catch (IOException e) { + throw new IllegalStateException("Unable to start grpc server on host " + getHostname(), e); + } + grpcClientService = grpcService; + // block until we can obtain the ZK lock for the manager ServiceLockData sld; try { @@ -1219,6 +1235,7 @@ boolean canSuspendTablets() { while (clientService.isServing()) { sleepUninterruptibly(500, MILLISECONDS); } + log.info("Shutting down fate."); getFateRefs().keySet().forEach(type -> fate(type).shutdown(0, MINUTES)); diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java index 355d5a8a5e4..299ff4d0f7a 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java @@ -27,6 +27,7 @@ import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOCATION; import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.OPID; import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.SELECTED; +import static org.apache.accumulo.core.rpc.ThriftProtobufUtil.convert; import java.io.FileNotFoundException; import java.io.IOException; @@ -64,6 +65,9 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType; import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException; import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException; +import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc; +import org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest; +import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob; import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService; import org.apache.accumulo.core.compaction.thrift.TCompactionState; import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate; @@ -140,6 +144,7 @@ import com.google.common.collect.Sets; import com.google.common.net.HostAndPort; +import io.grpc.stub.StreamObserver; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; @@ -182,6 +187,8 @@ public class CompactionCoordinator private final LoadingCache compactorCounts; + private final GrpcCompactionCoordinatorService grpcService; + public CompactionCoordinator(ServerContext ctx, SecurityOperation security, AtomicReference>> fateInstances, final String resourceGroupName, Manager manager) { @@ -224,6 +231,8 @@ public CompactionCoordinator(ServerContext ctx, SecurityOperation security, compactorCounts = ctx.getCaches().createNewBuilder(CacheName.COMPACTOR_COUNTS, false) .expireAfterWrite(30, TimeUnit.SECONDS).build(this::countCompactors); // At this point the manager does not have its lock so no actions should be taken yet + + grpcService = new GrpcCompactionCoordinatorService(); } protected int countCompactors(String groupName) { @@ -429,6 +438,8 @@ public TNextCompactionJob getCompactionJob(TInfo tinfo, TCredentials credentials LOG.trace("No jobs found for group {}, returning empty job to compactor {}", groupName, compactorAddress); result = new TExternalCompactionJob(); + } else { + LOG.info("Found job {}", result.externalCompactionId); } return new TNextCompactionJob(result, compactorCounts.get(groupName)); @@ -1115,4 +1126,44 @@ private static Set getFilesReservedBySelection(TabletMetadata return Set.of(); } + + public CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceImplBase getGrpcService() { + return new GrpcCompactionCoordinatorService(); + } + + private class GrpcCompactionCoordinatorService + extends CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceImplBase { + + @Override + public void getCompactionJob(CompactionJobRequest request, + StreamObserver responseObserver) { + + var tinfo = convert(request.getPinfo()); + var credentials = convert(request.getCredentials()); + + try { + LOG.debug("Received compaction job grpc {}", request.getExternalCompactionId()); + + // TODO: This is a sync blocking call for now which replicates the current version with + // Thrift + // Eventually can return a CompletableFuture so it is completed async or we could + // offload this onto another thread and get a future because it will potentially wait + // for a long time for a job to be assigned + var result = CompactionCoordinator.this.getCompactionJob(tinfo, credentials, + request.getGroupName(), request.getCompactor(), request.getExternalCompactionId()); + LOG.debug("Result {}", result); + + // TODO: this can be offloaded to a new thread and completed async when we have a result + // or we can bind the to CompletableFuture to process when the future completes so we + // can free up the grpc io threads + responseObserver.onNext(convert(result)); + responseObserver.onCompleted(); + } catch (ThriftSecurityException e) { + throw new RuntimeException(e); + } catch (Exception e) { + LOG.error(e.getMessage(), e); + throw e; + } + } + } } From 1234d678547665acab23ee46bf2427de5ef9bd3a Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Sun, 30 Jun 2024 13:52:16 -0400 Subject: [PATCH 04/25] Clean up comments from example --- .../main/proto/compaction-coordinator.proto | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/core/src/main/proto/compaction-coordinator.proto b/core/src/main/proto/compaction-coordinator.proto index 528bebe4942..c6081e44f32 100644 --- a/core/src/main/proto/compaction-coordinator.proto +++ b/core/src/main/proto/compaction-coordinator.proto @@ -35,25 +35,6 @@ service CompactionCoordinatorService { // position. rpc GetCompactionJob(CompactionJobRequest) returns (PNextCompactionJob) {} - // A server-to-client streaming RPC. - // - // Obtains the Features available within the given Rectangle. Results are - // streamed rather than returned at once (e.g. in a response message with a - // repeated field), as the rectangle may cover a large area and contain a - // huge number of features. - //rpc ListFeatures(Rectangle) returns (stream Feature) {} - - // A client-to-server streaming RPC. - // - // Accepts a stream of Points on a route being traversed, returning a - // RouteSummary when traversal is completed. - //rpc RecordRoute(stream Point) returns (RouteSummary) {} - - // A Bidirectional streaming RPC. - // - // Accepts a stream of RouteNotes sent while a route is being traversed, - // while receiving other RouteNotes (e.g. from other users). - // rpc RouteChat(stream RouteNote) returns (stream RouteNote) {} } message PInfo { From 0dc1df80919dc977b6c9413209221a0ec69f03dc Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Mon, 1 Jul 2024 08:10:17 -0400 Subject: [PATCH 05/25] clean up comments in compaction-coordinator.proto --- core/src/main/proto/compaction-coordinator.proto | 7 ------- 1 file changed, 7 deletions(-) diff --git a/core/src/main/proto/compaction-coordinator.proto b/core/src/main/proto/compaction-coordinator.proto index c6081e44f32..d56004b6d74 100644 --- a/core/src/main/proto/compaction-coordinator.proto +++ b/core/src/main/proto/compaction-coordinator.proto @@ -27,14 +27,7 @@ package compaction_coordinator; // Interface exported by the server. service CompactionCoordinatorService { - // A simple RPC. - // - // Obtains the feature at a given position. - // - // A feature with an empty name is returned if there's no feature at the given - // position. rpc GetCompactionJob(CompactionJobRequest) returns (PNextCompactionJob) {} - } message PInfo { From 450d3715c708bcd856f6ad61e9bbe8f6fedc6143 Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Mon, 1 Jul 2024 11:50:49 -0400 Subject: [PATCH 06/25] Add generated protobuf to .gitattributes --- .gitattributes | 1 + .../org/apache/accumulo/core/rpc/ThriftProtobufUtil.java | 8 ++++---- .../java/org/apache/accumulo/compactor/Compactor.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index a701943f093..c133cc1db32 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,3 +18,4 @@ # core/src/main/thrift-gen-java/** linguist-generated=true +core/src/main/protobuf-gen-java/** linguist-generated=true diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java index 4196e41769f..b1414467f1c 100644 --- a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java @@ -51,17 +51,17 @@ /** * This is a utility class for converting between the equivalent Thrift and Protobuf versions of the - * objects needed using the GRPC service. + * objects needed using the gRPC service. * * TODO: This code may eventually be able to be removed * * This class is designed mostly just for this prototype/proof of concept and would probably not be - * needed if we plan to keep using protocol buffers and GRPC going forward. The Thrift API is used + * needed if we plan to keep using protocol buffers and gRPC going forward. The Thrift API is used * by the rest of the compaction code in the Compactor and Compaction Coordinator, so doing a - * conversion made it easy to isolate the GRPC changes to the one getCompactionJob() RPC call + * conversion made it easy to isolate the gRPC changes to the one getCompactionJob() RPC call * without having to impact the rest of the code for this prototype. * - * Ideally, if we decide to go with GRPC and keep protocol buffers, then we would want to remove the + * Ideally, if we decide to go with gRPC and keep protocol buffers, then we would want to remove the * Thrift conversion entirely for performance reasons and just go between the native objects and * protocol buffer versions. * diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java index 78523612912..3567ddc9a66 100644 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java @@ -485,7 +485,7 @@ protected TNextCompactionJob getNextJob(Supplier uuid) throws RetriesExcee LOG.trace("Attempting to get next job, eci = {}", eci); currentCompactionId.set(eci); /* - * GRPC is now used to make the compaction job request. We keep using the Thrift objects + * gRPC is now used to make the compaction job request. We keep using the Thrift objects * and convert to/from the equivalent protocol buffer objects for now to keep the * changes isolated from the rest of the code. */ From 17e7aa484164c19292ac30bfdb60c55dd2e15604 Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Fri, 5 Jul 2024 12:00:33 -0400 Subject: [PATCH 07/25] Switch gRPC getCompactionJob() to using new async method --- .../coordinator/CompactionCoordinator.java | 76 +++++++++++++++---- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java index 299ff4d0f7a..b8e4029b40b 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java @@ -44,6 +44,7 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ScheduledFuture; @@ -445,6 +446,58 @@ public TNextCompactionJob getCompactionJob(TInfo tinfo, TCredentials credentials return new TNextCompactionJob(result, compactorCounts.get(groupName)); } + protected CompletableFuture getAsyncCompactionJob(TCredentials credentials, + String groupName, String compactorAddress, String externalCompactionId) + throws ThriftSecurityException { + + // do not expect users to call this directly, expect compactors to call this method + if (!security.canPerformSystemActions(credentials)) { + throw new AccumuloSecurityException(credentials.getPrincipal(), + SecurityErrorCode.PERMISSION_DENIED).asThriftException(); + } + CompactorGroupId groupId = CompactorGroupId.of(groupName); + LOG.trace("getCompactionJob called for group {} by compactor {}", groupId, compactorAddress); + TIME_COMPACTOR_LAST_CHECKED.put(groupId, System.currentTimeMillis()); + + return jobQueues.getAsync(groupId).thenApply(metaJob -> { + LOG.trace("Next metaJob is ready {}", metaJob.getJob()); + Optional compactionConfig = getCompactionConfig(metaJob); + + // this method may reread the metadata, do not use the metadata in metaJob for anything after + // this method + CompactionMetadata ecm = null; + + var kind = metaJob.getJob().getKind(); + + // Only reserve user compactions when the config is present. When compactions are canceled the + // config is deleted. + var cid = ExternalCompactionId.from(externalCompactionId); + if (kind == CompactionKind.SYSTEM + || (kind == CompactionKind.USER && compactionConfig.isPresent())) { + ecm = reserveCompaction(metaJob, compactorAddress, cid); + } + + final TExternalCompactionJob result; + if (ecm != null) { + result = createThriftJob(externalCompactionId, ecm, metaJob, compactionConfig); + // It is possible that by the time this added that the the compactor that made this request + // is dead. In this cases the compaction is not actually running. + RUNNING_CACHE.put(ExternalCompactionId.of(result.getExternalCompactionId()), + new RunningCompaction(result, compactorAddress, groupName)); + TabletLogger.compacting(metaJob.getTabletMetadata(), cid, compactorAddress, + metaJob.getJob()); + LOG.info("Found job {}", result.externalCompactionId); + } else { + LOG.debug("Unable to reserve compaction job for {}, returning empty job to compactor {}", + metaJob.getTabletMetadata().getExtent(), compactorAddress); + result = new TExternalCompactionJob(); + } + + return new TNextCompactionJob(result, compactorCounts.get(groupName)); + }); + + } + @VisibleForTesting public static boolean canReserveCompaction(TabletMetadata tablet, CompactionKind kind, Set jobFiles, ServerContext ctx, SteadyTime steadyTime) { @@ -1138,26 +1191,23 @@ private class GrpcCompactionCoordinatorService public void getCompactionJob(CompactionJobRequest request, StreamObserver responseObserver) { - var tinfo = convert(request.getPinfo()); var credentials = convert(request.getCredentials()); try { LOG.debug("Received compaction job grpc {}", request.getExternalCompactionId()); - // TODO: This is a sync blocking call for now which replicates the current version with - // Thrift - // Eventually can return a CompletableFuture so it is completed async or we could - // offload this onto another thread and get a future because it will potentially wait - // for a long time for a job to be assigned - var result = CompactionCoordinator.this.getCompactionJob(tinfo, credentials, + // Get the next job as a future as we need to wait until something is available + var result = CompactionCoordinator.this.getAsyncCompactionJob(credentials, request.getGroupName(), request.getCompactor(), request.getExternalCompactionId()); - LOG.debug("Result {}", result); - // TODO: this can be offloaded to a new thread and completed async when we have a result - // or we can bind the to CompletableFuture to process when the future completes so we - // can free up the grpc io threads - responseObserver.onNext(convert(result)); - responseObserver.onCompleted(); + // Async send back to the compactor when a new job is ready + result.thenApply(ecj -> { + LOG.debug("Received next compaction job {}", ecj); + responseObserver.onNext(convert(ecj)); + responseObserver.onCompleted(); + return ecj; + }); + } catch (ThriftSecurityException e) { throw new RuntimeException(e); } catch (Exception e) { From edf7125c082a2919206179c9c290206457cc05ef Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Fri, 5 Jul 2024 12:14:35 -0400 Subject: [PATCH 08/25] Use thenAccept() as we don't need a return value --- .../manager/compaction/coordinator/CompactionCoordinator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java index b8e4029b40b..a420cf10dad 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java @@ -1201,11 +1201,10 @@ public void getCompactionJob(CompactionJobRequest request, request.getGroupName(), request.getCompactor(), request.getExternalCompactionId()); // Async send back to the compactor when a new job is ready - result.thenApply(ecj -> { + result.thenAccept(ecj -> { LOG.debug("Received next compaction job {}", ecj); responseObserver.onNext(convert(ecj)); responseObserver.onCompleted(); - return ecj; }); } catch (ThriftSecurityException e) { From dae30cf746c135b061e4de87f21542e98c001dda Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Fri, 5 Jul 2024 12:55:39 -0400 Subject: [PATCH 09/25] fix errorprone warning and send back exception on error to client --- .../compaction/coordinator/CompactionCoordinator.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java index a420cf10dad..ef07b78d8a1 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java @@ -145,6 +145,8 @@ import com.google.common.collect.Sets; import com.google.common.net.HostAndPort; +import io.grpc.Status; +import io.grpc.StatusRuntimeException; import io.grpc.stub.StreamObserver; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; @@ -1201,10 +1203,16 @@ public void getCompactionJob(CompactionJobRequest request, request.getGroupName(), request.getCompactor(), request.getExternalCompactionId()); // Async send back to the compactor when a new job is ready - result.thenAccept(ecj -> { + // Need the unused var for errorprone + var unused = result.thenAccept(ecj -> { LOG.debug("Received next compaction job {}", ecj); responseObserver.onNext(convert(ecj)); responseObserver.onCompleted(); + }).exceptionally(e -> { + LOG.warn("Received exception processing compaction job {}", e.getMessage()); + LOG.debug(e.getMessage(), e); + responseObserver.onError(new StatusRuntimeException(Status.INTERNAL)); + return null; }); } catch (ThriftSecurityException e) { From 4e72058b516d6387390c2b9cafdc932b88c60469 Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Fri, 12 Jul 2024 12:32:47 -0400 Subject: [PATCH 10/25] Move protobuf objects into correct packages Update getCompactionJob() to use native accumulo to protobuf conversion and skip thrift conversion where possible. --- .../core/clientImpl/ClientContext.java | 16 ++ .../accumulo/core/clientImpl/Credentials.java | 15 ++ .../accumulo/core/dataImpl/KeyExtent.java | 30 +++ .../system/SystemIteratorUtil.java | 24 +- .../accumulo/core/rpc/ThriftProtobufUtil.java | 32 ++- .../apache/accumulo/core/trace/TraceUtil.java | 9 + core/src/main/proto/client.proto | 30 +++ .../main/proto/compaction-coordinator.proto | 82 +------ core/src/main/proto/data.proto | 35 +++ core/src/main/proto/manager.proto | 38 +++ core/src/main/proto/security.proto | 37 +++ core/src/main/proto/tabletserver.proto | 55 +++++ .../core/compaction/protobuf/ClientProto.java | 63 +++++ .../CompactionCoordinatorServiceGrpc.java | 42 ---- .../CompactionCoordinatorServiceProto.java | 221 ++++-------------- .../protobuf/CompactionJobRequest.java | 216 ++++++++--------- .../CompactionJobRequestOrBuilder.java | 40 +--- .../core/compaction/protobuf/DataProto.java | 51 ++++ .../compaction/protobuf/ManagerProto.java | 52 +++++ .../compaction/protobuf/PCompactionKind.java | 61 ++--- .../compaction/protobuf/PCredentials.java | 42 +--- .../protobuf/PCredentialsOrBuilder.java | 22 +- .../protobuf/PExternalCompactionJob.java | 154 ++++++------ .../PExternalCompactionJobOrBuilder.java | 52 ++--- .../core/compaction/protobuf/PFateId.java | 60 ++--- .../compaction/protobuf/PFateIdOrBuilder.java | 26 +-- .../protobuf/PFateInstanceType.java | 56 ++--- .../core/compaction/protobuf/PInputFile.java | 42 +--- .../protobuf/PInputFileOrBuilder.java | 22 +- .../compaction/protobuf/PIteratorConfig.java | 88 +++---- .../protobuf/PIteratorConfigOrBuilder.java | 32 +-- .../compaction/protobuf/PIteratorSetting.java | 44 ++-- .../protobuf/PIteratorSettingOrBuilder.java | 22 +- .../core/compaction/protobuf/PKeyExtent.java | 42 +--- .../protobuf/PKeyExtentOrBuilder.java | 22 +- .../protobuf/PNextCompactionJob.java | 18 -- .../protobuf/PNextCompactionJobOrBuilder.java | 18 -- .../protobuf/{PInfo.java => ProtoTInfo.java} | 134 +++++------ ...rBuilder.java => ProtoTInfoOrBuilder.java} | 24 +- .../compaction/protobuf/SecurityProto.java | 53 +++++ .../protobuf/TabletServerProto.java | 93 ++++++++ ...eThriftCall.java => RetryableRpcCall.java} | 8 +- .../compactor/CompactionJobHolder.java | 12 +- .../apache/accumulo/compactor/Compactor.java | 99 ++++---- .../apache/accumulo/compactor/ExtCEnv.java | 14 +- .../coordinator/CompactionCoordinator.java | 142 +++++------ .../compaction/CompactionCoordinatorTest.java | 59 +++-- .../ExternalDoNothingCompactor.java | 20 +- 48 files changed, 1242 insertions(+), 1327 deletions(-) create mode 100644 core/src/main/proto/client.proto create mode 100644 core/src/main/proto/data.proto create mode 100644 core/src/main/proto/manager.proto create mode 100644 core/src/main/proto/security.proto create mode 100644 core/src/main/proto/tabletserver.proto create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ClientProto.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/DataProto.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ManagerProto.java rename core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/{PInfo.java => ProtoTInfo.java} (79%) rename core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/{PInfoOrBuilder.java => ProtoTInfoOrBuilder.java} (51%) create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/SecurityProto.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java rename server/base/src/main/java/org/apache/accumulo/server/compaction/{RetryableThriftCall.java => RetryableRpcCall.java} (95%) diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java index bee134896e2..4ec034db8e4 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java @@ -68,6 +68,7 @@ import org.apache.accumulo.core.client.admin.SecurityOperations; import org.apache.accumulo.core.client.admin.TableOperations; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; +import org.apache.accumulo.core.compaction.protobuf.PCredentials; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ClientProperty; import org.apache.accumulo.core.conf.Property; @@ -140,6 +141,7 @@ public class ClientContext implements AccumuloClient { private final Supplier sslSupplier; private final Supplier scanServerSelectorSupplier; private TCredentials rpcCreds; + private PCredentials gRpcCreds; private ThriftTransportPool thriftTransportPool; private volatile boolean closed = false; @@ -319,6 +321,7 @@ public synchronized void setCredentials(Credentials newCredentials) { checkArgument(newCredentials != null, "newCredentials is null"); creds = newCredentials; rpcCreds = null; + gRpcCreds = null; } /** @@ -470,6 +473,19 @@ public synchronized TCredentials rpcCreds() { return rpcCreds; } + public synchronized PCredentials gRpcCreds() { + ensureOpen(); + if (getCredentials().getToken().isDestroyed()) { + gRpcCreds = null; + } + + if (gRpcCreds == null) { + gRpcCreds = getCredentials().toProtobuf(getInstanceID()); + } + + return gRpcCreds; + } + /** * Returns the location(s) of the accumulo manager and any redundant servers. * diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java index eb7dad6b417..f1e73e9e3db 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java @@ -28,9 +28,12 @@ import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer; import org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode; +import org.apache.accumulo.core.compaction.protobuf.PCredentials; import org.apache.accumulo.core.data.InstanceId; import org.apache.accumulo.core.securityImpl.thrift.TCredentials; +import com.google.protobuf.ByteString; + /** * A wrapper for internal use. This class carries the instance, principal, and authentication token * for use in the public API, in a non-serialized form. This is important, so that the @@ -99,6 +102,18 @@ public TCredentials toThrift(InstanceId instanceID) { return tCreds; } + public PCredentials toProtobuf(InstanceId instanceID) { + PCredentials pCreds = PCredentials.newBuilder().setPrincipal(getPrincipal()) + .setTokenClassName(getToken().getClass().getName()) + .setToken(ByteString.copyFrom(AuthenticationTokenSerializer.serialize(getToken()))) + .setInstanceId(instanceID.canonical()).build(); + if (getToken().isDestroyed()) { + throw new IllegalStateException("Token has been destroyed", + new AccumuloSecurityException(getPrincipal(), SecurityErrorCode.TOKEN_EXPIRED)); + } + return pCreds; + } + /** * Converts a given thrift object to our internal Credentials representation. * diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java index a11b7a24714..4771beb635f 100644 --- a/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java +++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java @@ -42,6 +42,7 @@ import java.util.TreeSet; import java.util.UUID; +import org.apache.accumulo.core.compaction.protobuf.PKeyExtent; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.TableId; @@ -57,6 +58,8 @@ import org.apache.hadoop.io.BinaryComparable; import org.apache.hadoop.io.Text; +import com.google.protobuf.ByteString; + /** * keeps track of information needed to identify a tablet */ @@ -128,6 +131,33 @@ public TKeyExtent toThrift() { prevEndRow() == null ? null : TextUtil.getByteBuffer(prevEndRow())); } + /** + * Convert to Protobuf form. + */ + public PKeyExtent toProtobuf() { + PKeyExtent.Builder builder = PKeyExtent.newBuilder() + .setTable(ByteString.copyFrom(tableId().canonical().getBytes(UTF_8))); + if (endRow() != null) { + builder.setEndRow(ByteString.copyFrom(endRow().getBytes())); + } + if (prevEndRow() != null) { + builder.setPrevEndRow(ByteString.copyFrom(prevEndRow().getBytes())); + } + return builder.build(); + } + + /** + * Create a KeyExtent from its Protobuf form. + * + * @param pke the KeyExtent in its Protobuf object form + */ + public static KeyExtent fromProtobuf(PKeyExtent pke) { + TableId tableId = TableId.of(new String(pke.getTable().toByteArray(), UTF_8)); + Text endRow = !pke.hasEndRow() ? null : new Text(pke.getEndRow().toByteArray()); + Text prevEndRow = !pke.hasPrevEndRow() ? null : new Text(pke.getPrevEndRow().toByteArray()); + return new KeyExtent(tableId, endRow, prevEndRow); + } + /** * Create a KeyExtent from a metadata previous end row entry. * diff --git a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SystemIteratorUtil.java b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SystemIteratorUtil.java index cfad4ee1c96..73a8263ffa6 100644 --- a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SystemIteratorUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SystemIteratorUtil.java @@ -24,38 +24,38 @@ import java.util.Set; import org.apache.accumulo.core.client.IteratorSetting; +import org.apache.accumulo.core.compaction.protobuf.PIteratorConfig; +import org.apache.accumulo.core.compaction.protobuf.PIteratorSetting; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.data.Column; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.core.tabletserver.thrift.IteratorConfig; -import org.apache.accumulo.core.tabletserver.thrift.TIteratorSetting; /** * System utility class. Not for client use. */ public class SystemIteratorUtil { - public static TIteratorSetting toTIteratorSetting(IteratorSetting is) { - return new TIteratorSetting(is.getPriority(), is.getName(), is.getIteratorClass(), - is.getOptions()); + public static PIteratorSetting toPIteratorSetting(IteratorSetting is) { + return PIteratorSetting.newBuilder().setPriority(is.getPriority()).setName(is.getName()) + .setIteratorClass(is.getIteratorClass()).putAllProperties(is.getOptions()).build(); } - public static IteratorSetting toIteratorSetting(TIteratorSetting tis) { - return new IteratorSetting(tis.getPriority(), tis.getName(), tis.getIteratorClass(), - tis.getProperties()); + public static IteratorSetting toIteratorSetting(PIteratorSetting pis) { + return new IteratorSetting(pis.getPriority(), pis.getName(), pis.getIteratorClass(), + pis.getPropertiesMap()); } - public static IteratorConfig toIteratorConfig(List iterators) { - ArrayList tisList = new ArrayList<>(); + public static PIteratorConfig toIteratorConfig(List iterators) { + ArrayList pisList = new ArrayList<>(); for (IteratorSetting iteratorSetting : iterators) { - tisList.add(toTIteratorSetting(iteratorSetting)); + pisList.add(toPIteratorSetting(iteratorSetting)); } - return new IteratorConfig(tisList); + return PIteratorConfig.newBuilder().addAllIterators(pisList).build(); } public static SortedKeyValueIterator setupSystemScanIterators( diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java index b1414467f1c..fce62a90c52 100644 --- a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java @@ -28,12 +28,12 @@ import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob; import org.apache.accumulo.core.compaction.protobuf.PFateId; import org.apache.accumulo.core.compaction.protobuf.PFateInstanceType; -import org.apache.accumulo.core.compaction.protobuf.PInfo; import org.apache.accumulo.core.compaction.protobuf.PInputFile; import org.apache.accumulo.core.compaction.protobuf.PIteratorConfig; import org.apache.accumulo.core.compaction.protobuf.PIteratorSetting; import org.apache.accumulo.core.compaction.protobuf.PKeyExtent; import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob; +import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo; import org.apache.accumulo.core.compaction.thrift.TNextCompactionJob; import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent; import org.apache.accumulo.core.manager.thrift.TFateId; @@ -86,14 +86,14 @@ public class ThriftProtobufUtil { private static final Logger LOG = LoggerFactory.getLogger(ThriftProtobufUtil.class); - public static PInfo convert(TInfo tinfo) { - var builder = PInfo.newBuilder(); + public static ProtoTInfo convert(TInfo tinfo) { + var builder = ProtoTInfo.newBuilder(); Optional.ofNullable(tinfo.getHeaders()).ifPresent(builder::putAllHeaders); return builder.build(); } - public static TInfo convert(PInfo pinfo) { - return new TInfo(pinfo.getHeadersMap()); + public static TInfo convert(ProtoTInfo ptinfo) { + return new TInfo(ptinfo.getHeadersMap()); } public static PCredentials convert(TCredentials credentials) { @@ -181,12 +181,10 @@ public static PIteratorConfig convert(IteratorConfig setting) { public static TCompactionKind convert(PCompactionKind kind) { switch (kind) { - case CK_SYSTEM: + case SYSTEM: return TCompactionKind.SYSTEM; - case CK_USER: + case USER: return TCompactionKind.USER; - case CK_UNKNOWN: - return null; default: throw new IllegalArgumentException("Unexpected PCompactionKind: " + kind); } @@ -194,13 +192,13 @@ public static TCompactionKind convert(PCompactionKind kind) { public static PCompactionKind convert(TCompactionKind kind) { if (kind == null) { - return PCompactionKind.CK_UNKNOWN; + return PCompactionKind.UNKNOWN; } switch (kind) { case SYSTEM: - return PCompactionKind.CK_SYSTEM; + return PCompactionKind.SYSTEM; case USER: - return PCompactionKind.CK_USER; + return PCompactionKind.USER; default: throw new IllegalArgumentException("Unexpected TCompactionKind: " + kind); } @@ -210,14 +208,12 @@ public static TFateId convert(PFateId fateId) { TFateInstanceType type; switch (fateId.getType()) { - case FI_META: + case META: type = TFateInstanceType.META; break; - case FI_USER: + case USER: type = TFateInstanceType.USER; break; - case FI_UNKNOWN: - return null; default: throw new IllegalArgumentException("Unexpected TFateInstanceType: " + fateId.getType()); } @@ -230,10 +226,10 @@ public static PFateId convert(TFateId fateId) { switch (fateId.getType()) { case META: - type = PFateInstanceType.FI_META; + type = PFateInstanceType.META; break; case USER: - type = PFateInstanceType.FI_USER; + type = PFateInstanceType.USER; break; default: throw new IllegalArgumentException("Unexpected TFateInstanceType: " + fateId.getType()); diff --git a/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java b/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java index 78d658a38e1..8dc23add6fc 100644 --- a/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java @@ -26,6 +26,8 @@ import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.clientImpl.thrift.TInfo; +import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo; +import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; import org.slf4j.Logger; @@ -140,6 +142,13 @@ public static TInfo traceInfo() { return tinfo; } + public static ProtoTInfo protoTraceInfo() { + ProtoTInfo.Builder ptinfo = ProtoTInfo.newBuilder(); + W3CTraceContextPropagator.getInstance().inject(Context.current(), ptinfo, + ProtoTInfo.Builder::putHeaders); + return ptinfo.build(); + } + /** * Returns a newly created Context from the TInfo object sent by a remote process. The Context can * then be used in this process to continue the tracing. The Context is used like: diff --git a/core/src/main/proto/client.proto b/core/src/main/proto/client.proto new file mode 100644 index 00000000000..b2d54415b9e --- /dev/null +++ b/core/src/main/proto/client.proto @@ -0,0 +1,30 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +syntax = "proto3"; + +option java_multiple_files = true; +option java_package = "org.apache.accumulo.core.compaction.protobuf"; +option java_outer_classname = "ClientProto"; + +package client; + +message ProtoTInfo { + map headers = 1; +} diff --git a/core/src/main/proto/compaction-coordinator.proto b/core/src/main/proto/compaction-coordinator.proto index d56004b6d74..3dcb820e2e9 100644 --- a/core/src/main/proto/compaction-coordinator.proto +++ b/core/src/main/proto/compaction-coordinator.proto @@ -22,6 +22,11 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.apache.accumulo.core.compaction.protobuf"; option java_outer_classname = "CompactionCoordinatorServiceProto"; +import "security.proto"; +import "client.proto"; +import "data.proto"; +import "tabletserver.proto"; +import "manager.proto"; package compaction_coordinator; @@ -30,79 +35,16 @@ service CompactionCoordinatorService { rpc GetCompactionJob(CompactionJobRequest) returns (PNextCompactionJob) {} } -message PInfo { - map headers = 1; -} - -// There are no nulls with Protobuf3, so the default will be an empty string -// Our TCredentials version with thrift currently is using/checking for null so -// using the optional field will generate "has" methods which we can use to -// check if the value was set -message PCredentials { - optional string principal = 1; - optional string tokenClassName = 2; - optional bytes token = 3; - optional string instanceId = 4; -} - -message PKeyExtent { - bytes table = 1; - // optional to generate hasEndRow() and hasPrevEndRow() becuase - // of no nulls in protobuf - optional bytes endRow = 2; - optional bytes prevEndRow = 3; -} - -message PInputFile { - // This is nullable in Thrift but I am not marking as optional as - // I think it should always be set - string metadataFileEntry = 1; - int64 size = 2; - int64 entries = 3; - int64 timestamp = 4; -} - -message PIteratorSetting { - int32 priority = 1; - string name = 2; - string iteratorClass = 3; - map properties = 4; -} - -message PIteratorConfig { - repeated PIteratorSetting iterators = 1; -} - -// We can't use the same values in the different enums if in the same -// package so add a prefix to the values -enum PCompactionKind { - // SELECTOR was removed and used to be zero - // However protobuf3 requires starting with 0 which is the default - CK_UNKNOWN = 0; - CK_SYSTEM = 1; - CK_USER = 2; -} - -enum PFateInstanceType { - FI_UNKNOWN = 0; - FI_META = 1; - FI_USER = 2; -} - -message PFateId { - PFateInstanceType type = 1; - string txUUIDStr = 2; -} message PExternalCompactionJob { optional string externalCompactionId = 1; - optional PKeyExtent extent = 2; - repeated PInputFile files = 3; - optional PIteratorConfig iteratorSettings = 4; + optional data.PKeyExtent extent = 2; + repeated tablet_server.PInputFile files = 3; + optional tablet_server.PIteratorConfig iteratorSettings = 4; optional string outputFile = 5; optional bool propagateDeletes = 6; - optional PCompactionKind kind = 7; - optional PFateId fateId = 8; + optional tablet_server.PCompactionKind kind = 7; + optional manager.PFateId fateId = 8; map overrides = 9; } @@ -112,8 +54,8 @@ message PNextCompactionJob { } message CompactionJobRequest { - PInfo pinfo = 1; - PCredentials credentials = 2; + client.ProtoTInfo ptinfo = 1; + security.PCredentials credentials = 2; string groupName = 3; string compactor = 4; string externalCompactionId = 5; diff --git a/core/src/main/proto/data.proto b/core/src/main/proto/data.proto new file mode 100644 index 00000000000..8d531b61d93 --- /dev/null +++ b/core/src/main/proto/data.proto @@ -0,0 +1,35 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +syntax = "proto3"; + +option java_multiple_files = true; +option java_package = "org.apache.accumulo.core.compaction.protobuf"; +option java_outer_classname = "DataProto"; + +package data; + + +message PKeyExtent { + bytes table = 1; + // optional to generate hasEndRow() and hasPrevEndRow() becuase + // of no nulls in protobuf + optional bytes endRow = 2; + optional bytes prevEndRow = 3; +} diff --git a/core/src/main/proto/manager.proto b/core/src/main/proto/manager.proto new file mode 100644 index 00000000000..b3b2970c472 --- /dev/null +++ b/core/src/main/proto/manager.proto @@ -0,0 +1,38 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +syntax = "proto3"; + +option java_multiple_files = true; +option java_package = "org.apache.accumulo.core.compaction.protobuf"; +option java_outer_classname = "ManagerProto"; + +package manager; + + +enum PFateInstanceType { + UNKNOWN = 0; + META = 1; + USER = 2; +} + +message PFateId { + PFateInstanceType type = 1; + string txUUIDStr = 2; +} diff --git a/core/src/main/proto/security.proto b/core/src/main/proto/security.proto new file mode 100644 index 00000000000..80c85f3d1c4 --- /dev/null +++ b/core/src/main/proto/security.proto @@ -0,0 +1,37 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +syntax = "proto3"; + +option java_multiple_files = true; +option java_package = "org.apache.accumulo.core.compaction.protobuf"; +option java_outer_classname = "SecurityProto"; + +package security; + +// There are no nulls with Protobuf3, so the default will be an empty string +// Our TCredentials version with thrift currently is using/checking for null so +// using the optional field will generate "has" methods which we can use to +// check if the value was set +message PCredentials { + optional string principal = 1; + optional string tokenClassName = 2; + optional bytes token = 3; + optional string instanceId = 4; +} diff --git a/core/src/main/proto/tabletserver.proto b/core/src/main/proto/tabletserver.proto new file mode 100644 index 00000000000..a4b1f5008bf --- /dev/null +++ b/core/src/main/proto/tabletserver.proto @@ -0,0 +1,55 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +syntax = "proto3"; + +option java_multiple_files = true; +option java_package = "org.apache.accumulo.core.compaction.protobuf"; +option java_outer_classname = "TabletServerProto"; + +package tablet_server; + + +message PInputFile { + // This is nullable in Thrift but I am not marking as optional as + // I think it should always be set + string metadataFileEntry = 1; + int64 size = 2; + int64 entries = 3; + int64 timestamp = 4; +} + +message PIteratorSetting { + int32 priority = 1; + string name = 2; + string iteratorClass = 3; + map properties = 4; +} + +message PIteratorConfig { + repeated PIteratorSetting iterators = 1; +} + +enum PCompactionKind { + // SELECTOR was removed and used to be zero + // However protobuf3 requires starting with 0 which is the default + UNKNOWN = 0; + SYSTEM = 1; + USER = 2; +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ClientProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ClientProto.java new file mode 100644 index 00000000000..58c763c756a --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ClientProto.java @@ -0,0 +1,63 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: client.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public final class ClientProto { + private ClientProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_client_ProtoTInfo_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_client_ProtoTInfo_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_client_ProtoTInfo_HeadersEntry_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_client_ProtoTInfo_HeadersEntry_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\014client.proto\022\006client\"n\n\nProtoTInfo\0220\n\007" + + "headers\030\001 \003(\0132\037.client.ProtoTInfo.Header" + + "sEntry\032.\n\014HeadersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005v" + + "alue\030\002 \001(\t:\0028\001B=\n,org.apache.accumulo.co" + + "re.compaction.protobufB\013ClientProtoP\001b\006p" + + "roto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_client_ProtoTInfo_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_client_ProtoTInfo_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_client_ProtoTInfo_descriptor, + new java.lang.String[] { "Headers", }); + internal_static_client_ProtoTInfo_HeadersEntry_descriptor = + internal_static_client_ProtoTInfo_descriptor.getNestedTypes().get(0); + internal_static_client_ProtoTInfo_HeadersEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_client_ProtoTInfo_HeadersEntry_descriptor, + new java.lang.String[] { "Key", "Value", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java index 4bd6c9b4b48..16414a0a83b 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java @@ -1,21 +1,3 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ package org.apache.accumulo.core.compaction.protobuf; import static io.grpc.MethodDescriptor.generateFullMethodName; @@ -119,12 +101,6 @@ public CompactionCoordinatorServiceFutureStub newStub(io.grpc.Channel channel, i public interface AsyncService { /** - * 
-     * A simple RPC.
-     * Obtains the feature at a given position.
-     * A feature with an empty name is returned if there's no feature at the given
-     * position.
-     *
*/ default void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request, io.grpc.stub.StreamObserver responseObserver) { @@ -166,12 +142,6 @@ protected CompactionCoordinatorServiceStub build( } /** - * 
-     * A simple RPC.
-     * Obtains the feature at a given position.
-     * A feature with an empty name is returned if there's no feature at the given
-     * position.
-     *
*/ public void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request, io.grpc.stub.StreamObserver responseObserver) { @@ -200,12 +170,6 @@ protected CompactionCoordinatorServiceBlockingStub build( } /** - * 
-     * A simple RPC.
-     * Obtains the feature at a given position.
-     * A feature with an empty name is returned if there's no feature at the given
-     * position.
-     *
*/ public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( @@ -233,12 +197,6 @@ protected CompactionCoordinatorServiceFutureStub build( } /** - * 
-     * A simple RPC.
-     * Obtains the feature at a given position.
-     * A feature with an empty name is returned if there's no feature at the given
-     * position.
-     *
*/ public com.google.common.util.concurrent.ListenableFuture getCompactionJob( org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request) { diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java index e22a7638364..ee9537a2a20 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java @@ -1,21 +1,3 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto @@ -33,51 +15,6 @@ public static void registerAllExtensions( registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } - static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_PInfo_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_PInfo_fieldAccessorTable; - static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_PInfo_HeadersEntry_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_PInfo_HeadersEntry_fieldAccessorTable; - static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_PCredentials_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_PCredentials_fieldAccessorTable; - static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_PKeyExtent_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_PKeyExtent_fieldAccessorTable; - static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_PInputFile_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_PInputFile_fieldAccessorTable; - static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_PIteratorSetting_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_PIteratorSetting_fieldAccessorTable; - static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_fieldAccessorTable; - static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_PIteratorConfig_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_PIteratorConfig_fieldAccessorTable; - static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_PFateId_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_PFateId_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_compaction_coordinator_PExternalCompactionJob_descriptor; static final @@ -108,122 +45,49 @@ public static void registerAllExtensions( static { java.lang.String[] descriptorData = { "\n\034compaction-coordinator.proto\022\026compacti" + - "on_coordinator\"t\n\005PInfo\022;\n\007headers\030\001 \003(\013" + - "2*.compaction_coordinator.PInfo.HeadersE" + - "ntry\032.\n\014HeadersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" + - "ue\030\002 \001(\t:\0028\001\"\252\001\n\014PCredentials\022\026\n\tprincip" + - "al\030\001 \001(\tH\000\210\001\001\022\033\n\016tokenClassName\030\002 \001(\tH\001\210" + - "\001\001\022\022\n\005token\030\003 \001(\014H\002\210\001\001\022\027\n\ninstanceId\030\004 \001" + - "(\tH\003\210\001\001B\014\n\n_principalB\021\n\017_tokenClassName" + - "B\010\n\006_tokenB\r\n\013_instanceId\"c\n\nPKeyExtent\022" + - "\r\n\005table\030\001 \001(\014\022\023\n\006endRow\030\002 \001(\014H\000\210\001\001\022\027\n\np" + - "revEndRow\030\003 \001(\014H\001\210\001\001B\t\n\007_endRowB\r\n\013_prev" + - "EndRow\"Y\n\nPInputFile\022\031\n\021metadataFileEntr" + - "y\030\001 \001(\t\022\014\n\004size\030\002 \001(\003\022\017\n\007entries\030\003 \001(\003\022\021" + - "\n\ttimestamp\030\004 \001(\003\"\312\001\n\020PIteratorSetting\022\020" + - "\n\010priority\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\025\n\riterat" + - "orClass\030\003 \001(\t\022L\n\nproperties\030\004 \003(\01328.comp" + - "action_coordinator.PIteratorSetting.Prop" + - "ertiesEntry\0321\n\017PropertiesEntry\022\013\n\003key\030\001 " + - "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"N\n\017PIteratorConfi" + - "g\022;\n\titerators\030\001 \003(\0132(.compaction_coordi" + - "nator.PIteratorSetting\"U\n\007PFateId\0227\n\004typ" + - "e\030\001 \001(\0162).compaction_coordinator.PFateIn" + - "stanceType\022\021\n\ttxUUIDStr\030\002 \001(\t\"\216\005\n\026PExter" + - "nalCompactionJob\022!\n\024externalCompactionId" + - "\030\001 \001(\tH\000\210\001\001\0227\n\006extent\030\002 \001(\0132\".compaction" + - "_coordinator.PKeyExtentH\001\210\001\001\0221\n\005files\030\003 " + - "\003(\0132\".compaction_coordinator.PInputFile\022" + - "F\n\020iteratorSettings\030\004 \001(\0132\'.compaction_c" + - "oordinator.PIteratorConfigH\002\210\001\001\022\027\n\noutpu" + - "tFile\030\005 \001(\tH\003\210\001\001\022\035\n\020propagateDeletes\030\006 \001" + - "(\010H\004\210\001\001\022:\n\004kind\030\007 \001(\0162\'.compaction_coord" + - "inator.PCompactionKindH\005\210\001\001\0224\n\006fateId\030\010 " + - "\001(\0132\037.compaction_coordinator.PFateIdH\006\210\001" + - "\001\022P\n\toverrides\030\t \003(\0132=.compaction_coordi" + - "nator.PExternalCompactionJob.OverridesEn" + - "try\0320\n\016OverridesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" + - "lue\030\002 \001(\t:\0028\001B\027\n\025_externalCompactionIdB\t" + - "\n\007_extentB\023\n\021_iteratorSettingsB\r\n\013_outpu" + - "tFileB\023\n\021_propagateDeletesB\007\n\005_kindB\t\n\007_" + - "fateId\"i\n\022PNextCompactionJob\022;\n\003job\030\001 \001(" + - "\0132..compaction_coordinator.PExternalComp" + - "actionJob\022\026\n\016compactorCount\030\002 \001(\005\"\303\001\n\024Co" + - "mpactionJobRequest\022,\n\005pinfo\030\001 \001(\0132\035.comp" + - "action_coordinator.PInfo\0229\n\013credentials\030" + - "\002 \001(\0132$.compaction_coordinator.PCredenti" + - "als\022\021\n\tgroupName\030\003 \001(\t\022\021\n\tcompactor\030\004 \001(" + - "\t\022\034\n\024externalCompactionId\030\005 \001(\t*=\n\017PComp" + - "actionKind\022\016\n\nCK_UNKNOWN\020\000\022\r\n\tCK_SYSTEM\020" + - "\001\022\013\n\007CK_USER\020\002*=\n\021PFateInstanceType\022\016\n\nF" + - "I_UNKNOWN\020\000\022\013\n\007FI_META\020\001\022\013\n\007FI_USER\020\0022\216\001" + - "\n\034CompactionCoordinatorService\022n\n\020GetCom" + - "pactionJob\022,.compaction_coordinator.Comp" + - "actionJobRequest\032*.compaction_coordinato" + - "r.PNextCompactionJob\"\000BS\n,org.apache.acc" + - "umulo.core.compaction.protobufB!Compacti" + - "onCoordinatorServiceProtoP\001b\006proto3" + "on_coordinator\032\016security.proto\032\014client.p" + + "roto\032\ndata.proto\032\022tabletserver.proto\032\rma" + + "nager.proto\"\322\004\n\026PExternalCompactionJob\022!" + + "\n\024externalCompactionId\030\001 \001(\tH\000\210\001\001\022%\n\006ext" + + "ent\030\002 \001(\0132\020.data.PKeyExtentH\001\210\001\001\022(\n\005file" + + "s\030\003 \003(\0132\031.tablet_server.PInputFile\022=\n\020it" + + "eratorSettings\030\004 \001(\0132\036.tablet_server.PIt" + + "eratorConfigH\002\210\001\001\022\027\n\noutputFile\030\005 \001(\tH\003\210" + + "\001\001\022\035\n\020propagateDeletes\030\006 \001(\010H\004\210\001\001\0221\n\004kin" + + "d\030\007 \001(\0162\036.tablet_server.PCompactionKindH" + + "\005\210\001\001\022%\n\006fateId\030\010 \001(\0132\020.manager.PFateIdH\006" + + "\210\001\001\022P\n\toverrides\030\t \003(\0132=.compaction_coor" + + "dinator.PExternalCompactionJob.Overrides" + + "Entry\0320\n\016OverridesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" + + "value\030\002 \001(\t:\0028\001B\027\n\025_externalCompactionId" + + "B\t\n\007_extentB\023\n\021_iteratorSettingsB\r\n\013_out" + + "putFileB\023\n\021_propagateDeletesB\007\n\005_kindB\t\n" + + "\007_fateId\"i\n\022PNextCompactionJob\022;\n\003job\030\001 " + + "\001(\0132..compaction_coordinator.PExternalCo" + + "mpactionJob\022\026\n\016compactorCount\030\002 \001(\005\"\253\001\n\024" + + "CompactionJobRequest\022\"\n\006ptinfo\030\001 \001(\0132\022.c" + + "lient.ProtoTInfo\022+\n\013credentials\030\002 \001(\0132\026." + + "security.PCredentials\022\021\n\tgroupName\030\003 \001(\t" + + "\022\021\n\tcompactor\030\004 \001(\t\022\034\n\024externalCompactio" + + "nId\030\005 \001(\t2\216\001\n\034CompactionCoordinatorServi" + + "ce\022n\n\020GetCompactionJob\022,.compaction_coor" + + "dinator.CompactionJobRequest\032*.compactio" + + "n_coordinator.PNextCompactionJob\"\000BS\n,or" + + "g.apache.accumulo.core.compaction.protob" + + "ufB!CompactionCoordinatorServiceProtoP\001b" + + "\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { + org.apache.accumulo.core.compaction.protobuf.SecurityProto.getDescriptor(), + org.apache.accumulo.core.compaction.protobuf.ClientProto.getDescriptor(), + org.apache.accumulo.core.compaction.protobuf.DataProto.getDescriptor(), + org.apache.accumulo.core.compaction.protobuf.TabletServerProto.getDescriptor(), + org.apache.accumulo.core.compaction.protobuf.ManagerProto.getDescriptor(), }); - internal_static_compaction_coordinator_PInfo_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_compaction_coordinator_PInfo_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_PInfo_descriptor, - new java.lang.String[] { "Headers", }); - internal_static_compaction_coordinator_PInfo_HeadersEntry_descriptor = - internal_static_compaction_coordinator_PInfo_descriptor.getNestedTypes().get(0); - internal_static_compaction_coordinator_PInfo_HeadersEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_PInfo_HeadersEntry_descriptor, - new java.lang.String[] { "Key", "Value", }); - internal_static_compaction_coordinator_PCredentials_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_compaction_coordinator_PCredentials_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_PCredentials_descriptor, - new java.lang.String[] { "Principal", "TokenClassName", "Token", "InstanceId", }); - internal_static_compaction_coordinator_PKeyExtent_descriptor = - getDescriptor().getMessageTypes().get(2); - internal_static_compaction_coordinator_PKeyExtent_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_PKeyExtent_descriptor, - new java.lang.String[] { "Table", "EndRow", "PrevEndRow", }); - internal_static_compaction_coordinator_PInputFile_descriptor = - getDescriptor().getMessageTypes().get(3); - internal_static_compaction_coordinator_PInputFile_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_PInputFile_descriptor, - new java.lang.String[] { "MetadataFileEntry", "Size", "Entries", "Timestamp", }); - internal_static_compaction_coordinator_PIteratorSetting_descriptor = - getDescriptor().getMessageTypes().get(4); - internal_static_compaction_coordinator_PIteratorSetting_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_PIteratorSetting_descriptor, - new java.lang.String[] { "Priority", "Name", "IteratorClass", "Properties", }); - internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_descriptor = - internal_static_compaction_coordinator_PIteratorSetting_descriptor.getNestedTypes().get(0); - internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_descriptor, - new java.lang.String[] { "Key", "Value", }); - internal_static_compaction_coordinator_PIteratorConfig_descriptor = - getDescriptor().getMessageTypes().get(5); - internal_static_compaction_coordinator_PIteratorConfig_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_PIteratorConfig_descriptor, - new java.lang.String[] { "Iterators", }); - internal_static_compaction_coordinator_PFateId_descriptor = - getDescriptor().getMessageTypes().get(6); - internal_static_compaction_coordinator_PFateId_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_PFateId_descriptor, - new java.lang.String[] { "Type", "TxUUIDStr", }); internal_static_compaction_coordinator_PExternalCompactionJob_descriptor = - getDescriptor().getMessageTypes().get(7); + getDescriptor().getMessageTypes().get(0); internal_static_compaction_coordinator_PExternalCompactionJob_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_compaction_coordinator_PExternalCompactionJob_descriptor, @@ -235,17 +99,22 @@ public static void registerAllExtensions( internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_descriptor, new java.lang.String[] { "Key", "Value", }); internal_static_compaction_coordinator_PNextCompactionJob_descriptor = - getDescriptor().getMessageTypes().get(8); + getDescriptor().getMessageTypes().get(1); internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_compaction_coordinator_PNextCompactionJob_descriptor, new java.lang.String[] { "Job", "CompactorCount", }); internal_static_compaction_coordinator_CompactionJobRequest_descriptor = - getDescriptor().getMessageTypes().get(9); + getDescriptor().getMessageTypes().get(2); internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_compaction_coordinator_CompactionJobRequest_descriptor, - new java.lang.String[] { "Pinfo", "Credentials", "GroupName", "Compactor", "ExternalCompactionId", }); + new java.lang.String[] { "Ptinfo", "Credentials", "GroupName", "Compactor", "ExternalCompactionId", }); + org.apache.accumulo.core.compaction.protobuf.SecurityProto.getDescriptor(); + org.apache.accumulo.core.compaction.protobuf.ClientProto.getDescriptor(); + org.apache.accumulo.core.compaction.protobuf.DataProto.getDescriptor(); + org.apache.accumulo.core.compaction.protobuf.TabletServerProto.getDescriptor(); + org.apache.accumulo.core.compaction.protobuf.ManagerProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java index 75b57aeaee2..d2d21ad8f78 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java @@ -1,21 +1,3 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto @@ -61,36 +43,36 @@ protected java.lang.Object newInstance( } private int bitField0_; - public static final int PINFO_FIELD_NUMBER = 1; - private org.apache.accumulo.core.compaction.protobuf.PInfo pinfo_; + public static final int PTINFO_FIELD_NUMBER = 1; + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; /** - * .compaction_coordinator.PInfo pinfo = 1; - * @return Whether the pinfo field is set. + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. */ @java.lang.Override - public boolean hasPinfo() { + public boolean hasPtinfo() { return ((bitField0_ & 0x00000001) != 0); } /** - * .compaction_coordinator.PInfo pinfo = 1; - * @return The pinfo. + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PInfo getPinfo() { - return pinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance() : pinfo_; + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } /** - * .compaction_coordinator.PInfo pinfo = 1; + * .client.ProtoTInfo ptinfo = 1; */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder getPinfoOrBuilder() { - return pinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance() : pinfo_; + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } public static final int CREDENTIALS_FIELD_NUMBER = 2; private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; * @return Whether the credentials field is set. */ @java.lang.Override @@ -98,7 +80,7 @@ public boolean hasCredentials() { return ((bitField0_ & 0x00000002) != 0); } /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; * @return The credentials. */ @java.lang.Override @@ -106,7 +88,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials( return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { @@ -245,7 +227,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) != 0)) { - output.writeMessage(1, getPinfo()); + output.writeMessage(1, getPtinfo()); } if (((bitField0_ & 0x00000002) != 0)) { output.writeMessage(2, getCredentials()); @@ -270,7 +252,7 @@ public int getSerializedSize() { size = 0; if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getPinfo()); + .computeMessageSize(1, getPtinfo()); } if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.CodedOutputStream @@ -300,10 +282,10 @@ public boolean equals(final java.lang.Object obj) { } org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest other = (org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest) obj; - if (hasPinfo() != other.hasPinfo()) return false; - if (hasPinfo()) { - if (!getPinfo() - .equals(other.getPinfo())) return false; + if (hasPtinfo() != other.hasPtinfo()) return false; + if (hasPtinfo()) { + if (!getPtinfo() + .equals(other.getPtinfo())) return false; } if (hasCredentials() != other.hasCredentials()) return false; if (hasCredentials()) { @@ -327,9 +309,9 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasPinfo()) { - hash = (37 * hash) + PINFO_FIELD_NUMBER; - hash = (53 * hash) + getPinfo().hashCode(); + if (hasPtinfo()) { + hash = (37 * hash) + PTINFO_FIELD_NUMBER; + hash = (53 * hash) + getPtinfo().hashCode(); } if (hasCredentials()) { hash = (37 * hash) + CREDENTIALS_FIELD_NUMBER; @@ -471,7 +453,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getPinfoFieldBuilder(); + getPtinfoFieldBuilder(); getCredentialsFieldBuilder(); } } @@ -479,10 +461,10 @@ private void maybeForceBuilderInitialization() { public Builder clear() { super.clear(); bitField0_ = 0; - pinfo_ = null; - if (pinfoBuilder_ != null) { - pinfoBuilder_.dispose(); - pinfoBuilder_ = null; + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; } credentials_ = null; if (credentialsBuilder_ != null) { @@ -527,9 +509,9 @@ private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.Compacti int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { - result.pinfo_ = pinfoBuilder_ == null - ? pinfo_ - : pinfoBuilder_.build(); + result.ptinfo_ = ptinfoBuilder_ == null + ? ptinfo_ + : ptinfoBuilder_.build(); to_bitField0_ |= 0x00000001; } if (((from_bitField0_ & 0x00000002) != 0)) { @@ -594,8 +576,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest other) { if (other == org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.getDefaultInstance()) return this; - if (other.hasPinfo()) { - mergePinfo(other.getPinfo()); + if (other.hasPtinfo()) { + mergePtinfo(other.getPtinfo()); } if (other.hasCredentials()) { mergeCredentials(other.getCredentials()); @@ -643,7 +625,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getPinfoFieldBuilder().getBuilder(), + getPtinfoFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -687,139 +669,139 @@ public Builder mergeFrom( } private int bitField0_; - private org.apache.accumulo.core.compaction.protobuf.PInfo pinfo_; + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PInfo, org.apache.accumulo.core.compaction.protobuf.PInfo.Builder, org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder> pinfoBuilder_; + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; /** - * .compaction_coordinator.PInfo pinfo = 1; - * @return Whether the pinfo field is set. + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. */ - public boolean hasPinfo() { + public boolean hasPtinfo() { return ((bitField0_ & 0x00000001) != 0); } /** - * .compaction_coordinator.PInfo pinfo = 1; - * @return The pinfo. + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. */ - public org.apache.accumulo.core.compaction.protobuf.PInfo getPinfo() { - if (pinfoBuilder_ == null) { - return pinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance() : pinfo_; + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + if (ptinfoBuilder_ == null) { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } else { - return pinfoBuilder_.getMessage(); + return ptinfoBuilder_.getMessage(); } } /** - * .compaction_coordinator.PInfo pinfo = 1; + * .client.ProtoTInfo ptinfo = 1; */ - public Builder setPinfo(org.apache.accumulo.core.compaction.protobuf.PInfo value) { - if (pinfoBuilder_ == null) { + public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - pinfo_ = value; + ptinfo_ = value; } else { - pinfoBuilder_.setMessage(value); + ptinfoBuilder_.setMessage(value); } bitField0_ |= 0x00000001; onChanged(); return this; } /** - * .compaction_coordinator.PInfo pinfo = 1; + * .client.ProtoTInfo ptinfo = 1; */ - public Builder setPinfo( - org.apache.accumulo.core.compaction.protobuf.PInfo.Builder builderForValue) { - if (pinfoBuilder_ == null) { - pinfo_ = builderForValue.build(); + public Builder setPtinfo( + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) { + if (ptinfoBuilder_ == null) { + ptinfo_ = builderForValue.build(); } else { - pinfoBuilder_.setMessage(builderForValue.build()); + ptinfoBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000001; onChanged(); return this; } /** - * .compaction_coordinator.PInfo pinfo = 1; + * .client.ProtoTInfo ptinfo = 1; */ - public Builder mergePinfo(org.apache.accumulo.core.compaction.protobuf.PInfo value) { - if (pinfoBuilder_ == null) { + public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0) && - pinfo_ != null && - pinfo_ != org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance()) { - getPinfoBuilder().mergeFrom(value); + ptinfo_ != null && + ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { + getPtinfoBuilder().mergeFrom(value); } else { - pinfo_ = value; + ptinfo_ = value; } } else { - pinfoBuilder_.mergeFrom(value); + ptinfoBuilder_.mergeFrom(value); } - if (pinfo_ != null) { + if (ptinfo_ != null) { bitField0_ |= 0x00000001; onChanged(); } return this; } /** - * .compaction_coordinator.PInfo pinfo = 1; + * .client.ProtoTInfo ptinfo = 1; */ - public Builder clearPinfo() { + public Builder clearPtinfo() { bitField0_ = (bitField0_ & ~0x00000001); - pinfo_ = null; - if (pinfoBuilder_ != null) { - pinfoBuilder_.dispose(); - pinfoBuilder_ = null; + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; } onChanged(); return this; } /** - * .compaction_coordinator.PInfo pinfo = 1; + * .client.ProtoTInfo ptinfo = 1; */ - public org.apache.accumulo.core.compaction.protobuf.PInfo.Builder getPinfoBuilder() { + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getPinfoFieldBuilder().getBuilder(); + return getPtinfoFieldBuilder().getBuilder(); } /** - * .compaction_coordinator.PInfo pinfo = 1; + * .client.ProtoTInfo ptinfo = 1; */ - public org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder getPinfoOrBuilder() { - if (pinfoBuilder_ != null) { - return pinfoBuilder_.getMessageOrBuilder(); + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + if (ptinfoBuilder_ != null) { + return ptinfoBuilder_.getMessageOrBuilder(); } else { - return pinfo_ == null ? - org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance() : pinfo_; + return ptinfo_ == null ? + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } } /** - * .compaction_coordinator.PInfo pinfo = 1; + * .client.ProtoTInfo ptinfo = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PInfo, org.apache.accumulo.core.compaction.protobuf.PInfo.Builder, org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder> - getPinfoFieldBuilder() { - if (pinfoBuilder_ == null) { - pinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PInfo, org.apache.accumulo.core.compaction.protobuf.PInfo.Builder, org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder>( - getPinfo(), + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> + getPtinfoFieldBuilder() { + if (ptinfoBuilder_ == null) { + ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>( + getPtinfo(), getParentForChildren(), isClean()); - pinfo_ = null; + ptinfo_ = null; } - return pinfoBuilder_; + return ptinfoBuilder_; } private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; private com.google.protobuf.SingleFieldBuilderV3< org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; * @return Whether the credentials field is set. */ public boolean hasCredentials() { return ((bitField0_ & 0x00000002) != 0); } /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; * @return The credentials. */ public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { @@ -830,7 +812,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials( } } /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; */ public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { if (credentialsBuilder_ == null) { @@ -846,7 +828,7 @@ public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCred return this; } /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; */ public Builder setCredentials( org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) { @@ -860,7 +842,7 @@ public Builder setCredentials( return this; } /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; */ public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { if (credentialsBuilder_ == null) { @@ -881,7 +863,7 @@ public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCr return this; } /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; */ public Builder clearCredentials() { bitField0_ = (bitField0_ & ~0x00000002); @@ -894,7 +876,7 @@ public Builder clearCredentials() { return this; } /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; */ public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { bitField0_ |= 0x00000002; @@ -902,7 +884,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCred return getCredentialsFieldBuilder().getBuilder(); } /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; */ public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { if (credentialsBuilder_ != null) { @@ -913,7 +895,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCre } } /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; */ private com.google.protobuf.SingleFieldBuilderV3< org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java index defd26f12bd..957c265f770 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java @@ -1,21 +1,3 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto @@ -27,32 +9,32 @@ public interface CompactionJobRequestOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .compaction_coordinator.PInfo pinfo = 1; - * @return Whether the pinfo field is set. + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. */ - boolean hasPinfo(); + boolean hasPtinfo(); /** - * .compaction_coordinator.PInfo pinfo = 1; - * @return The pinfo. + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. */ - org.apache.accumulo.core.compaction.protobuf.PInfo getPinfo(); + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo(); /** - * .compaction_coordinator.PInfo pinfo = 1; + * .client.ProtoTInfo ptinfo = 1; */ - org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder getPinfoOrBuilder(); + org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; * @return Whether the credentials field is set. */ boolean hasCredentials(); /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; * @return The credentials. */ org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(); /** - * .compaction_coordinator.PCredentials credentials = 2; + * .security.PCredentials credentials = 2; */ org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/DataProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/DataProto.java new file mode 100644 index 00000000000..aacb1a65889 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/DataProto.java @@ -0,0 +1,51 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: data.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public final class DataProto { + private DataProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_data_PKeyExtent_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_data_PKeyExtent_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\ndata.proto\022\004data\"c\n\nPKeyExtent\022\r\n\005tabl" + + "e\030\001 \001(\014\022\023\n\006endRow\030\002 \001(\014H\000\210\001\001\022\027\n\nprevEndR" + + "ow\030\003 \001(\014H\001\210\001\001B\t\n\007_endRowB\r\n\013_prevEndRowB" + + ";\n,org.apache.accumulo.core.compaction.p" + + "rotobufB\tDataProtoP\001b\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_data_PKeyExtent_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_data_PKeyExtent_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_data_PKeyExtent_descriptor, + new java.lang.String[] { "Table", "EndRow", "PrevEndRow", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ManagerProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ManagerProto.java new file mode 100644 index 00000000000..8a7d0bb2a82 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ManagerProto.java @@ -0,0 +1,52 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: manager.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public final class ManagerProto { + private ManagerProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_manager_PFateId_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_manager_PFateId_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\rmanager.proto\022\007manager\"F\n\007PFateId\022(\n\004t" + + "ype\030\001 \001(\0162\032.manager.PFateInstanceType\022\021\n" + + "\ttxUUIDStr\030\002 \001(\t*4\n\021PFateInstanceType\022\013\n" + + "\007UNKNOWN\020\000\022\010\n\004META\020\001\022\010\n\004USER\020\002B>\n,org.ap" + + "ache.accumulo.core.compaction.protobufB\014" + + "ManagerProtoP\001b\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_manager_PFateId_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_manager_PFateId_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_manager_PFateId_descriptor, + new java.lang.String[] { "Type", "TxUUIDStr", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java index a4d063f0b54..9c6cd54f3b9 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java @@ -1,34 +1,11 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: tabletserver.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; /** - * 
- * We can't use the same values in the different enums if in the same
- * package so add a prefix to the values
- *
- * - * Protobuf enum {@code compaction_coordinator.PCompactionKind} + * Protobuf enum {@code tablet_server.PCompactionKind} */ public enum PCompactionKind implements com.google.protobuf.ProtocolMessageEnum { @@ -38,17 +15,17 @@ public enum PCompactionKind * However protobuf3 requires starting with 0 which is the default * * - * CK_UNKNOWN = 0; + * UNKNOWN = 0; */ - CK_UNKNOWN(0), + UNKNOWN(0), /** - * CK_SYSTEM = 1; + * SYSTEM = 1; */ - CK_SYSTEM(1), + SYSTEM(1), /** - * CK_USER = 2; + * USER = 2; */ - CK_USER(2), + USER(2), UNRECOGNIZED(-1), ; @@ -58,17 +35,17 @@ public enum PCompactionKind * However protobuf3 requires starting with 0 which is the default * * - * CK_UNKNOWN = 0; + * UNKNOWN = 0; */ - public static final int CK_UNKNOWN_VALUE = 0; + public static final int UNKNOWN_VALUE = 0; /** - * CK_SYSTEM = 1; + * SYSTEM = 1; */ - public static final int CK_SYSTEM_VALUE = 1; + public static final int SYSTEM_VALUE = 1; /** - * CK_USER = 2; + * USER = 2; */ - public static final int CK_USER_VALUE = 2; + public static final int USER_VALUE = 2; public final int getNumber() { @@ -95,9 +72,9 @@ public static PCompactionKind valueOf(int value) { */ public static PCompactionKind forNumber(int value) { switch (value) { - case 0: return CK_UNKNOWN; - case 1: return CK_SYSTEM; - case 2: return CK_USER; + case 0: return UNKNOWN; + case 1: return SYSTEM; + case 2: return USER; default: return null; } } @@ -128,7 +105,7 @@ public PCompactionKind findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.getDescriptor().getEnumTypes().get(0); + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.getDescriptor().getEnumTypes().get(0); } private static final PCompactionKind[] VALUES = values(); @@ -151,6 +128,6 @@ private PCompactionKind(int value) { this.value = value; } - // @@protoc_insertion_point(enum_scope:compaction_coordinator.PCompactionKind) + // @@protoc_insertion_point(enum_scope:tablet_server.PCompactionKind) } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java index 72dc09dcfe1..8ac1c52fde3 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java @@ -1,23 +1,5 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: security.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; @@ -30,11 +12,11 @@ * check if the value was set * * - * Protobuf type {@code compaction_coordinator.PCredentials} + * Protobuf type {@code security.PCredentials} */ public final class PCredentials extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:compaction_coordinator.PCredentials) + // @@protoc_insertion_point(message_implements:security.PCredentials) PCredentialsOrBuilder { private static final long serialVersionUID = 0L; // Use PCredentials.newBuilder() to construct. @@ -57,13 +39,13 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCredentials_descriptor; + return org.apache.accumulo.core.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCredentials_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PCredentials.class, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder.class); } @@ -444,21 +426,21 @@ protected Builder newBuilderForType( * check if the value was set * * - * Protobuf type {@code compaction_coordinator.PCredentials} + * Protobuf type {@code security.PCredentials} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:compaction_coordinator.PCredentials) + // @@protoc_insertion_point(builder_implements:security.PCredentials) org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCredentials_descriptor; + return org.apache.accumulo.core.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCredentials_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PCredentials.class, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder.class); } @@ -487,7 +469,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCredentials_descriptor; + return org.apache.accumulo.core.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_descriptor; } @java.lang.Override @@ -948,10 +930,10 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:compaction_coordinator.PCredentials) + // @@protoc_insertion_point(builder_scope:security.PCredentials) } - // @@protoc_insertion_point(class_scope:compaction_coordinator.PCredentials) + // @@protoc_insertion_point(class_scope:security.PCredentials) private static final org.apache.accumulo.core.compaction.protobuf.PCredentials DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PCredentials(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java index 8943894a9d0..1d29cb29cfe 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java @@ -1,29 +1,11 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: security.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; public interface PCredentialsOrBuilder extends - // @@protoc_insertion_point(interface_extends:compaction_coordinator.PCredentials) + // @@protoc_insertion_point(interface_extends:security.PCredentials) com.google.protobuf.MessageOrBuilder { /** diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java index 5402ffccd88..d9ff85720db 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java @@ -1,21 +1,3 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto @@ -124,7 +106,7 @@ public java.lang.String getExternalCompactionId() { public static final int EXTENT_FIELD_NUMBER = 2; private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_; /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; * @return Whether the extent field is set. */ @java.lang.Override @@ -132,7 +114,7 @@ public boolean hasExtent() { return ((bitField0_ & 0x00000002) != 0); } /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; * @return The extent. */ @java.lang.Override @@ -140,7 +122,7 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; } /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { @@ -151,14 +133,14 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExten @SuppressWarnings("serial") private java.util.List files_; /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ @java.lang.Override public java.util.List getFilesList() { return files_; } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ @java.lang.Override public java.util.List @@ -166,21 +148,21 @@ public java.util.List g return files_; } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ @java.lang.Override public int getFilesCount() { return files_.size(); } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index) { return files_.get(index); } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder( @@ -191,7 +173,7 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFiles public static final int ITERATORSETTINGS_FIELD_NUMBER = 4; private org.apache.accumulo.core.compaction.protobuf.PIteratorConfig iteratorSettings_; /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; * @return Whether the iteratorSettings field is set. */ @java.lang.Override @@ -199,7 +181,7 @@ public boolean hasIteratorSettings() { return ((bitField0_ & 0x00000004) != 0); } /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; * @return The iteratorSettings. */ @java.lang.Override @@ -207,7 +189,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorS return iteratorSettings_ == null ? org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_; } /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder() { @@ -283,21 +265,21 @@ public boolean getPropagateDeletes() { public static final int KIND_FIELD_NUMBER = 7; private int kind_ = 0; /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @return Whether the kind field is set. */ @java.lang.Override public boolean hasKind() { return ((bitField0_ & 0x00000020) != 0); } /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @return The enum numeric value on the wire for kind. */ @java.lang.Override public int getKindValue() { return kind_; } /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @return The kind. */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind() { @@ -308,7 +290,7 @@ public boolean getPropagateDeletes() { public static final int FATEID_FIELD_NUMBER = 8; private org.apache.accumulo.core.compaction.protobuf.PFateId fateId_; /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; * @return Whether the fateId field is set. */ @java.lang.Override @@ -316,7 +298,7 @@ public boolean hasFateId() { return ((bitField0_ & 0x00000040) != 0); } /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; * @return The fateId. */ @java.lang.Override @@ -324,7 +306,7 @@ public org.apache.accumulo.core.compaction.protobuf.PFateId getFateId() { return fateId_ == null ? org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance() : fateId_; } /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder() { @@ -1168,14 +1150,14 @@ public Builder setExternalCompactionIdBytes( private com.google.protobuf.SingleFieldBuilderV3< org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> extentBuilder_; /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; * @return Whether the extent field is set. */ public boolean hasExtent() { return ((bitField0_ & 0x00000002) != 0); } /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; * @return The extent. */ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { @@ -1186,7 +1168,7 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { } } /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; */ public Builder setExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) { if (extentBuilder_ == null) { @@ -1202,7 +1184,7 @@ public Builder setExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent return this; } /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; */ public Builder setExtent( org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder builderForValue) { @@ -1216,7 +1198,7 @@ public Builder setExtent( return this; } /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; */ public Builder mergeExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) { if (extentBuilder_ == null) { @@ -1237,7 +1219,7 @@ public Builder mergeExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExte return this; } /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; */ public Builder clearExtent() { bitField0_ = (bitField0_ & ~0x00000002); @@ -1250,7 +1232,7 @@ public Builder clearExtent() { return this; } /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; */ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder getExtentBuilder() { bitField0_ |= 0x00000002; @@ -1258,7 +1240,7 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder getExtent return getExtentFieldBuilder().getBuilder(); } /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; */ public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { if (extentBuilder_ != null) { @@ -1269,7 +1251,7 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExten } } /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; */ private com.google.protobuf.SingleFieldBuilderV3< org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> @@ -1298,7 +1280,7 @@ private void ensureFilesIsMutable() { org.apache.accumulo.core.compaction.protobuf.PInputFile, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder, org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder> filesBuilder_; /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public java.util.List getFilesList() { if (filesBuilder_ == null) { @@ -1308,7 +1290,7 @@ public java.util.List g } } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public int getFilesCount() { if (filesBuilder_ == null) { @@ -1318,7 +1300,7 @@ public int getFilesCount() { } } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index) { if (filesBuilder_ == null) { @@ -1328,7 +1310,7 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int inde } } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public Builder setFiles( int index, org.apache.accumulo.core.compaction.protobuf.PInputFile value) { @@ -1345,7 +1327,7 @@ public Builder setFiles( return this; } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public Builder setFiles( int index, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) { @@ -1359,7 +1341,7 @@ public Builder setFiles( return this; } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public Builder addFiles(org.apache.accumulo.core.compaction.protobuf.PInputFile value) { if (filesBuilder_ == null) { @@ -1375,7 +1357,7 @@ public Builder addFiles(org.apache.accumulo.core.compaction.protobuf.PInputFile return this; } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public Builder addFiles( int index, org.apache.accumulo.core.compaction.protobuf.PInputFile value) { @@ -1392,7 +1374,7 @@ public Builder addFiles( return this; } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public Builder addFiles( org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) { @@ -1406,7 +1388,7 @@ public Builder addFiles( return this; } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public Builder addFiles( int index, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) { @@ -1420,7 +1402,7 @@ public Builder addFiles( return this; } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public Builder addAllFiles( java.lang.Iterable values) { @@ -1435,7 +1417,7 @@ public Builder addAllFiles( return this; } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public Builder clearFiles() { if (filesBuilder_ == null) { @@ -1448,7 +1430,7 @@ public Builder clearFiles() { return this; } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public Builder removeFiles(int index) { if (filesBuilder_ == null) { @@ -1461,14 +1443,14 @@ public Builder removeFiles(int index) { return this; } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder getFilesBuilder( int index) { return getFilesFieldBuilder().getBuilder(index); } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder( int index) { @@ -1478,7 +1460,7 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFiles } } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public java.util.List getFilesOrBuilderList() { @@ -1489,14 +1471,14 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFiles } } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesBuilder() { return getFilesFieldBuilder().addBuilder( org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance()); } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesBuilder( int index) { @@ -1504,7 +1486,7 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesB index, org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance()); } /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ public java.util.List getFilesBuilderList() { @@ -1529,14 +1511,14 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesB private com.google.protobuf.SingleFieldBuilderV3< org.apache.accumulo.core.compaction.protobuf.PIteratorConfig, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder> iteratorSettingsBuilder_; /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; * @return Whether the iteratorSettings field is set. */ public boolean hasIteratorSettings() { return ((bitField0_ & 0x00000008) != 0); } /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; * @return The iteratorSettings. */ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorSettings() { @@ -1547,7 +1529,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorS } } /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; */ public Builder setIteratorSettings(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig value) { if (iteratorSettingsBuilder_ == null) { @@ -1563,7 +1545,7 @@ public Builder setIteratorSettings(org.apache.accumulo.core.compaction.protobuf. return this; } /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; */ public Builder setIteratorSettings( org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder builderForValue) { @@ -1577,7 +1559,7 @@ public Builder setIteratorSettings( return this; } /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; */ public Builder mergeIteratorSettings(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig value) { if (iteratorSettingsBuilder_ == null) { @@ -1598,7 +1580,7 @@ public Builder mergeIteratorSettings(org.apache.accumulo.core.compaction.protobu return this; } /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; */ public Builder clearIteratorSettings() { bitField0_ = (bitField0_ & ~0x00000008); @@ -1611,7 +1593,7 @@ public Builder clearIteratorSettings() { return this; } /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder getIteratorSettingsBuilder() { bitField0_ |= 0x00000008; @@ -1619,7 +1601,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder getI return getIteratorSettingsFieldBuilder().getBuilder(); } /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder() { if (iteratorSettingsBuilder_ != null) { @@ -1630,7 +1612,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder get } } /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; */ private com.google.protobuf.SingleFieldBuilderV3< org.apache.accumulo.core.compaction.protobuf.PIteratorConfig, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder> @@ -1767,21 +1749,21 @@ public Builder clearPropagateDeletes() { private int kind_ = 0; /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @return Whether the kind field is set. */ @java.lang.Override public boolean hasKind() { return ((bitField0_ & 0x00000040) != 0); } /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @return The enum numeric value on the wire for kind. */ @java.lang.Override public int getKindValue() { return kind_; } /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @param value The enum numeric value on the wire for kind to set. * @return This builder for chaining. */ @@ -1792,7 +1774,7 @@ public Builder setKindValue(int value) { return this; } /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @return The kind. */ @java.lang.Override @@ -1801,7 +1783,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind() { return result == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionKind.UNRECOGNIZED : result; } /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @param value The kind to set. * @return This builder for chaining. */ @@ -1815,7 +1797,7 @@ public Builder setKind(org.apache.accumulo.core.compaction.protobuf.PCompactionK return this; } /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @return This builder for chaining. */ public Builder clearKind() { @@ -1829,14 +1811,14 @@ public Builder clearKind() { private com.google.protobuf.SingleFieldBuilderV3< org.apache.accumulo.core.compaction.protobuf.PFateId, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder, org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder> fateIdBuilder_; /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; * @return Whether the fateId field is set. */ public boolean hasFateId() { return ((bitField0_ & 0x00000080) != 0); } /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; * @return The fateId. */ public org.apache.accumulo.core.compaction.protobuf.PFateId getFateId() { @@ -1847,7 +1829,7 @@ public org.apache.accumulo.core.compaction.protobuf.PFateId getFateId() { } } /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; */ public Builder setFateId(org.apache.accumulo.core.compaction.protobuf.PFateId value) { if (fateIdBuilder_ == null) { @@ -1863,7 +1845,7 @@ public Builder setFateId(org.apache.accumulo.core.compaction.protobuf.PFateId va return this; } /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; */ public Builder setFateId( org.apache.accumulo.core.compaction.protobuf.PFateId.Builder builderForValue) { @@ -1877,7 +1859,7 @@ public Builder setFateId( return this; } /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; */ public Builder mergeFateId(org.apache.accumulo.core.compaction.protobuf.PFateId value) { if (fateIdBuilder_ == null) { @@ -1898,7 +1880,7 @@ public Builder mergeFateId(org.apache.accumulo.core.compaction.protobuf.PFateId return this; } /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; */ public Builder clearFateId() { bitField0_ = (bitField0_ & ~0x00000080); @@ -1911,7 +1893,7 @@ public Builder clearFateId() { return this; } /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; */ public org.apache.accumulo.core.compaction.protobuf.PFateId.Builder getFateIdBuilder() { bitField0_ |= 0x00000080; @@ -1919,7 +1901,7 @@ public org.apache.accumulo.core.compaction.protobuf.PFateId.Builder getFateIdBui return getFateIdFieldBuilder().getBuilder(); } /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; */ public org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder() { if (fateIdBuilder_ != null) { @@ -1930,7 +1912,7 @@ public org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder getFateIdOr } } /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; */ private com.google.protobuf.SingleFieldBuilderV3< org.apache.accumulo.core.compaction.protobuf.PFateId, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder, org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder> diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java index d56402d5c4c..271f73b9628 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java @@ -1,21 +1,3 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto @@ -44,56 +26,56 @@ public interface PExternalCompactionJobOrBuilder extends getExternalCompactionIdBytes(); /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; * @return Whether the extent field is set. */ boolean hasExtent(); /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; * @return The extent. */ org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent(); /** - * optional .compaction_coordinator.PKeyExtent extent = 2; + * optional .data.PKeyExtent extent = 2; */ org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder(); /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ java.util.List getFilesList(); /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index); /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ int getFilesCount(); /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ java.util.List getFilesOrBuilderList(); /** - * repeated .compaction_coordinator.PInputFile files = 3; + * repeated .tablet_server.PInputFile files = 3; */ org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder( int index); /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; * @return Whether the iteratorSettings field is set. */ boolean hasIteratorSettings(); /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; * @return The iteratorSettings. */ org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorSettings(); /** - * optional .compaction_coordinator.PIteratorConfig iteratorSettings = 4; + * optional .tablet_server.PIteratorConfig iteratorSettings = 4; */ org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder(); @@ -126,33 +108,33 @@ org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuild boolean getPropagateDeletes(); /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @return Whether the kind field is set. */ boolean hasKind(); /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @return The enum numeric value on the wire for kind. */ int getKindValue(); /** - * optional .compaction_coordinator.PCompactionKind kind = 7; + * optional .tablet_server.PCompactionKind kind = 7; * @return The kind. */ org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind(); /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; * @return Whether the fateId field is set. */ boolean hasFateId(); /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; * @return The fateId. */ org.apache.accumulo.core.compaction.protobuf.PFateId getFateId(); /** - * optional .compaction_coordinator.PFateId fateId = 8; + * optional .manager.PFateId fateId = 8; */ org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java index 142546632a5..81793593b9d 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java @@ -1,33 +1,15 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: manager.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf type {@code compaction_coordinator.PFateId} + * Protobuf type {@code manager.PFateId} */ public final class PFateId extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:compaction_coordinator.PFateId) + // @@protoc_insertion_point(message_implements:manager.PFateId) PFateIdOrBuilder { private static final long serialVersionUID = 0L; // Use PFateId.newBuilder() to construct. @@ -48,13 +30,13 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PFateId_descriptor; + return org.apache.accumulo.core.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PFateId_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PFateId.class, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder.class); } @@ -62,14 +44,14 @@ protected java.lang.Object newInstance( public static final int TYPE_FIELD_NUMBER = 1; private int type_ = 0; /** - * .compaction_coordinator.PFateInstanceType type = 1; + * .manager.PFateInstanceType type = 1; * @return The enum numeric value on the wire for type. */ @java.lang.Override public int getTypeValue() { return type_; } /** - * .compaction_coordinator.PFateInstanceType type = 1; + * .manager.PFateInstanceType type = 1; * @return The type. */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PFateInstanceType getType() { @@ -130,7 +112,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (type_ != org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.FI_UNKNOWN.getNumber()) { + if (type_ != org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.UNKNOWN.getNumber()) { output.writeEnum(1, type_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(txUUIDStr_)) { @@ -145,7 +127,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (type_ != org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.FI_UNKNOWN.getNumber()) { + if (type_ != org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.UNKNOWN.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(1, type_); } @@ -283,21 +265,21 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code compaction_coordinator.PFateId} + * Protobuf type {@code manager.PFateId} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:compaction_coordinator.PFateId) + // @@protoc_insertion_point(builder_implements:manager.PFateId) org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PFateId_descriptor; + return org.apache.accumulo.core.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PFateId_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PFateId.class, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder.class); } @@ -324,7 +306,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PFateId_descriptor; + return org.apache.accumulo.core.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_descriptor; } @java.lang.Override @@ -466,14 +448,14 @@ public Builder mergeFrom( private int type_ = 0; /** - * .compaction_coordinator.PFateInstanceType type = 1; + * .manager.PFateInstanceType type = 1; * @return The enum numeric value on the wire for type. */ @java.lang.Override public int getTypeValue() { return type_; } /** - * .compaction_coordinator.PFateInstanceType type = 1; + * .manager.PFateInstanceType type = 1; * @param value The enum numeric value on the wire for type to set. * @return This builder for chaining. */ @@ -484,7 +466,7 @@ public Builder setTypeValue(int value) { return this; } /** - * .compaction_coordinator.PFateInstanceType type = 1; + * .manager.PFateInstanceType type = 1; * @return The type. */ @java.lang.Override @@ -493,7 +475,7 @@ public org.apache.accumulo.core.compaction.protobuf.PFateInstanceType getType() return result == null ? org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.UNRECOGNIZED : result; } /** - * .compaction_coordinator.PFateInstanceType type = 1; + * .manager.PFateInstanceType type = 1; * @param value The type to set. * @return This builder for chaining. */ @@ -507,7 +489,7 @@ public Builder setType(org.apache.accumulo.core.compaction.protobuf.PFateInstanc return this; } /** - * .compaction_coordinator.PFateInstanceType type = 1; + * .manager.PFateInstanceType type = 1; * @return This builder for chaining. */ public Builder clearType() { @@ -601,10 +583,10 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:compaction_coordinator.PFateId) + // @@protoc_insertion_point(builder_scope:manager.PFateId) } - // @@protoc_insertion_point(class_scope:compaction_coordinator.PFateId) + // @@protoc_insertion_point(class_scope:manager.PFateId) private static final org.apache.accumulo.core.compaction.protobuf.PFateId DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PFateId(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java index a0a6ce3746f..62ff7903ac6 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java @@ -1,38 +1,20 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: manager.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; public interface PFateIdOrBuilder extends - // @@protoc_insertion_point(interface_extends:compaction_coordinator.PFateId) + // @@protoc_insertion_point(interface_extends:manager.PFateId) com.google.protobuf.MessageOrBuilder { /** - * .compaction_coordinator.PFateInstanceType type = 1; + * .manager.PFateInstanceType type = 1; * @return The enum numeric value on the wire for type. */ int getTypeValue(); /** - * .compaction_coordinator.PFateInstanceType type = 1; + * .manager.PFateInstanceType type = 1; * @return The type. */ org.apache.accumulo.core.compaction.protobuf.PFateInstanceType getType(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java index d4cb0cdb4a2..b7141cf05ca 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java @@ -1,59 +1,41 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: manager.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf enum {@code compaction_coordinator.PFateInstanceType} + * Protobuf enum {@code manager.PFateInstanceType} */ public enum PFateInstanceType implements com.google.protobuf.ProtocolMessageEnum { /** - * FI_UNKNOWN = 0; + * UNKNOWN = 0; */ - FI_UNKNOWN(0), + UNKNOWN(0), /** - * FI_META = 1; + * META = 1; */ - FI_META(1), + META(1), /** - * FI_USER = 2; + * USER = 2; */ - FI_USER(2), + USER(2), UNRECOGNIZED(-1), ; /** - * FI_UNKNOWN = 0; + * UNKNOWN = 0; */ - public static final int FI_UNKNOWN_VALUE = 0; + public static final int UNKNOWN_VALUE = 0; /** - * FI_META = 1; + * META = 1; */ - public static final int FI_META_VALUE = 1; + public static final int META_VALUE = 1; /** - * FI_USER = 2; + * USER = 2; */ - public static final int FI_USER_VALUE = 2; + public static final int USER_VALUE = 2; public final int getNumber() { @@ -80,9 +62,9 @@ public static PFateInstanceType valueOf(int value) { */ public static PFateInstanceType forNumber(int value) { switch (value) { - case 0: return FI_UNKNOWN; - case 1: return FI_META; - case 2: return FI_USER; + case 0: return UNKNOWN; + case 1: return META; + case 2: return USER; default: return null; } } @@ -113,7 +95,7 @@ public PFateInstanceType findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.getDescriptor().getEnumTypes().get(1); + return org.apache.accumulo.core.compaction.protobuf.ManagerProto.getDescriptor().getEnumTypes().get(0); } private static final PFateInstanceType[] VALUES = values(); @@ -136,6 +118,6 @@ private PFateInstanceType(int value) { this.value = value; } - // @@protoc_insertion_point(enum_scope:compaction_coordinator.PFateInstanceType) + // @@protoc_insertion_point(enum_scope:manager.PFateInstanceType) } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java index 5fadd5bed5d..2b77a2b0ff2 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java @@ -1,33 +1,15 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: tabletserver.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf type {@code compaction_coordinator.PInputFile} + * Protobuf type {@code tablet_server.PInputFile} */ public final class PInputFile extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:compaction_coordinator.PInputFile) + // @@protoc_insertion_point(message_implements:tablet_server.PInputFile) PInputFileOrBuilder { private static final long serialVersionUID = 0L; // Use PInputFile.newBuilder() to construct. @@ -47,13 +29,13 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInputFile_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PInputFile_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInputFile_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PInputFile_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PInputFile.class, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder.class); } @@ -333,21 +315,21 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code compaction_coordinator.PInputFile} + * Protobuf type {@code tablet_server.PInputFile} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:compaction_coordinator.PInputFile) + // @@protoc_insertion_point(builder_implements:tablet_server.PInputFile) org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInputFile_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PInputFile_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInputFile_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PInputFile_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PInputFile.class, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder.class); } @@ -376,7 +358,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInputFile_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PInputFile_descriptor; } @java.lang.Override @@ -743,10 +725,10 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:compaction_coordinator.PInputFile) + // @@protoc_insertion_point(builder_scope:tablet_server.PInputFile) } - // @@protoc_insertion_point(class_scope:compaction_coordinator.PInputFile) + // @@protoc_insertion_point(class_scope:tablet_server.PInputFile) private static final org.apache.accumulo.core.compaction.protobuf.PInputFile DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PInputFile(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java index 17214c13d76..0c0adb574f9 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java @@ -1,29 +1,11 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: tabletserver.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; public interface PInputFileOrBuilder extends - // @@protoc_insertion_point(interface_extends:compaction_coordinator.PInputFile) + // @@protoc_insertion_point(interface_extends:tablet_server.PInputFile) com.google.protobuf.MessageOrBuilder { /** diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java index 19a2d7121d3..d38a792f30d 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java @@ -1,33 +1,15 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: tabletserver.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf type {@code compaction_coordinator.PIteratorConfig} + * Protobuf type {@code tablet_server.PIteratorConfig} */ public final class PIteratorConfig extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:compaction_coordinator.PIteratorConfig) + // @@protoc_insertion_point(message_implements:tablet_server.PIteratorConfig) PIteratorConfigOrBuilder { private static final long serialVersionUID = 0L; // Use PIteratorConfig.newBuilder() to construct. @@ -47,13 +29,13 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorConfig_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorConfig_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorConfig_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorConfig_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.class, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder.class); } @@ -62,14 +44,14 @@ protected java.lang.Object newInstance( @SuppressWarnings("serial") private java.util.List iterators_; /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ @java.lang.Override public java.util.List getIteratorsList() { return iterators_; } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ @java.lang.Override public java.util.List @@ -77,21 +59,21 @@ public java.util.Listrepeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ @java.lang.Override public int getIteratorsCount() { return iterators_.size(); } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index) { return iterators_.get(index); } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder( @@ -259,21 +241,21 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code compaction_coordinator.PIteratorConfig} + * Protobuf type {@code tablet_server.PIteratorConfig} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:compaction_coordinator.PIteratorConfig) + // @@protoc_insertion_point(builder_implements:tablet_server.PIteratorConfig) org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorConfig_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorConfig_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorConfig_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorConfig_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.class, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder.class); } @@ -305,7 +287,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorConfig_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorConfig_descriptor; } @java.lang.Override @@ -486,7 +468,7 @@ private void ensureIteratorsIsMutable() { org.apache.accumulo.core.compaction.protobuf.PIteratorSetting, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder> iteratorsBuilder_; /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public java.util.List getIteratorsList() { if (iteratorsBuilder_ == null) { @@ -496,7 +478,7 @@ public java.util.Listrepeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public int getIteratorsCount() { if (iteratorsBuilder_ == null) { @@ -506,7 +488,7 @@ public int getIteratorsCount() { } } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index) { if (iteratorsBuilder_ == null) { @@ -516,7 +498,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterator } } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public Builder setIterators( int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) { @@ -533,7 +515,7 @@ public Builder setIterators( return this; } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public Builder setIterators( int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) { @@ -547,7 +529,7 @@ public Builder setIterators( return this; } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public Builder addIterators(org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) { if (iteratorsBuilder_ == null) { @@ -563,7 +545,7 @@ public Builder addIterators(org.apache.accumulo.core.compaction.protobuf.PIterat return this; } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public Builder addIterators( int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) { @@ -580,7 +562,7 @@ public Builder addIterators( return this; } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public Builder addIterators( org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) { @@ -594,7 +576,7 @@ public Builder addIterators( return this; } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public Builder addIterators( int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) { @@ -608,7 +590,7 @@ public Builder addIterators( return this; } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public Builder addAllIterators( java.lang.Iterable values) { @@ -623,7 +605,7 @@ public Builder addAllIterators( return this; } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public Builder clearIterators() { if (iteratorsBuilder_ == null) { @@ -636,7 +618,7 @@ public Builder clearIterators() { return this; } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public Builder removeIterators(int index) { if (iteratorsBuilder_ == null) { @@ -649,14 +631,14 @@ public Builder removeIterators(int index) { return this; } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder getIteratorsBuilder( int index) { return getIteratorsFieldBuilder().getBuilder(index); } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder( int index) { @@ -666,7 +648,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder ge } } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public java.util.List getIteratorsOrBuilderList() { @@ -677,14 +659,14 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder ge } } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder addIteratorsBuilder() { return getIteratorsFieldBuilder().addBuilder( org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance()); } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder addIteratorsBuilder( int index) { @@ -692,7 +674,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder add index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance()); } /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ public java.util.List getIteratorsBuilderList() { @@ -725,10 +707,10 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:compaction_coordinator.PIteratorConfig) + // @@protoc_insertion_point(builder_scope:tablet_server.PIteratorConfig) } - // @@protoc_insertion_point(class_scope:compaction_coordinator.PIteratorConfig) + // @@protoc_insertion_point(class_scope:tablet_server.PIteratorConfig) private static final org.apache.accumulo.core.compaction.protobuf.PIteratorConfig DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PIteratorConfig(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java index 5982fc7c81c..bd2166aa6f4 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java @@ -1,51 +1,33 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: tabletserver.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; public interface PIteratorConfigOrBuilder extends - // @@protoc_insertion_point(interface_extends:compaction_coordinator.PIteratorConfig) + // @@protoc_insertion_point(interface_extends:tablet_server.PIteratorConfig) com.google.protobuf.MessageOrBuilder { /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ java.util.List getIteratorsList(); /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index); /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ int getIteratorsCount(); /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ java.util.List getIteratorsOrBuilderList(); /** - * repeated .compaction_coordinator.PIteratorSetting iterators = 1; + * repeated .tablet_server.PIteratorSetting iterators = 1; */ org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder( int index); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java index 2dfa614b0c7..0e748c3921d 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java @@ -1,33 +1,15 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: tabletserver.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf type {@code compaction_coordinator.PIteratorSetting} + * Protobuf type {@code tablet_server.PIteratorSetting} */ public final class PIteratorSetting extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:compaction_coordinator.PIteratorSetting) + // @@protoc_insertion_point(message_implements:tablet_server.PIteratorSetting) PIteratorSettingOrBuilder { private static final long serialVersionUID = 0L; // Use PIteratorSetting.newBuilder() to construct. @@ -48,7 +30,7 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_descriptor; } @SuppressWarnings({"rawtypes"}) @@ -66,7 +48,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.class, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder.class); } @@ -166,7 +148,7 @@ private static final class PropertiesDefaultEntryHolder { java.lang.String, java.lang.String> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_PropertiesEntry_descriptor, + org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_PropertiesEntry_descriptor, com.google.protobuf.WireFormat.FieldType.STRING, "", com.google.protobuf.WireFormat.FieldType.STRING, @@ -439,15 +421,15 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code compaction_coordinator.PIteratorSetting} + * Protobuf type {@code tablet_server.PIteratorSetting} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:compaction_coordinator.PIteratorSetting) + // @@protoc_insertion_point(builder_implements:tablet_server.PIteratorSetting) org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_descriptor; } @SuppressWarnings({"rawtypes"}) @@ -475,7 +457,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.class, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder.class); } @@ -504,7 +486,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PIteratorSetting_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_descriptor; } @java.lang.Override @@ -988,10 +970,10 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:compaction_coordinator.PIteratorSetting) + // @@protoc_insertion_point(builder_scope:tablet_server.PIteratorSetting) } - // @@protoc_insertion_point(class_scope:compaction_coordinator.PIteratorSetting) + // @@protoc_insertion_point(class_scope:tablet_server.PIteratorSetting) private static final org.apache.accumulo.core.compaction.protobuf.PIteratorSetting DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PIteratorSetting(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java index 0aa85f66ff9..a66096a5f06 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java @@ -1,29 +1,11 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: tabletserver.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; public interface PIteratorSettingOrBuilder extends - // @@protoc_insertion_point(interface_extends:compaction_coordinator.PIteratorSetting) + // @@protoc_insertion_point(interface_extends:tablet_server.PIteratorSetting) com.google.protobuf.MessageOrBuilder { /** diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java index 57bb728484f..ce049c4fc8c 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java @@ -1,33 +1,15 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: data.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf type {@code compaction_coordinator.PKeyExtent} + * Protobuf type {@code data.PKeyExtent} */ public final class PKeyExtent extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:compaction_coordinator.PKeyExtent) + // @@protoc_insertion_point(message_implements:data.PKeyExtent) PKeyExtentOrBuilder { private static final long serialVersionUID = 0L; // Use PKeyExtent.newBuilder() to construct. @@ -49,13 +31,13 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PKeyExtent_descriptor; + return org.apache.accumulo.core.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PKeyExtent_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PKeyExtent.class, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder.class); } @@ -310,21 +292,21 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code compaction_coordinator.PKeyExtent} + * Protobuf type {@code data.PKeyExtent} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:compaction_coordinator.PKeyExtent) + // @@protoc_insertion_point(builder_implements:data.PKeyExtent) org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PKeyExtent_descriptor; + return org.apache.accumulo.core.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PKeyExtent_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PKeyExtent.class, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder.class); } @@ -352,7 +334,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PKeyExtent_descriptor; + return org.apache.accumulo.core.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_descriptor; } @java.lang.Override @@ -649,10 +631,10 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:compaction_coordinator.PKeyExtent) + // @@protoc_insertion_point(builder_scope:data.PKeyExtent) } - // @@protoc_insertion_point(class_scope:compaction_coordinator.PKeyExtent) + // @@protoc_insertion_point(class_scope:data.PKeyExtent) private static final org.apache.accumulo.core.compaction.protobuf.PKeyExtent DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PKeyExtent(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java index 1e22d0777ea..caed01c37c6 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java @@ -1,29 +1,11 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: data.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; public interface PKeyExtentOrBuilder extends - // @@protoc_insertion_point(interface_extends:compaction_coordinator.PKeyExtent) + // @@protoc_insertion_point(interface_extends:data.PKeyExtent) com.google.protobuf.MessageOrBuilder { /** diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java index 9a696549514..f4093f99092 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java @@ -1,21 +1,3 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java index 4be982c7bfc..b2af47ae0f3 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java @@ -1,21 +1,3 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfo.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfo.java similarity index 79% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfo.java rename to core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfo.java index 883b9a22894..53c75a35c49 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfo.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfo.java @@ -1,52 +1,34 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: client.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf type {@code compaction_coordinator.PInfo} + * Protobuf type {@code client.ProtoTInfo} */ -public final class PInfo extends +public final class ProtoTInfo extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:compaction_coordinator.PInfo) - PInfoOrBuilder { + // @@protoc_insertion_point(message_implements:client.ProtoTInfo) + ProtoTInfoOrBuilder { private static final long serialVersionUID = 0L; - // Use PInfo.newBuilder() to construct. - private PInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use ProtoTInfo.newBuilder() to construct. + private ProtoTInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private PInfo() { + private ProtoTInfo() { } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new PInfo(); + return new ProtoTInfo(); } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_descriptor; + return org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_descriptor; } @SuppressWarnings({"rawtypes"}) @@ -64,9 +46,9 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.PInfo.class, org.apache.accumulo.core.compaction.protobuf.PInfo.Builder.class); + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.class, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder.class); } public static final int HEADERS_FIELD_NUMBER = 1; @@ -75,7 +57,7 @@ private static final class HeadersDefaultEntryHolder { java.lang.String, java.lang.String> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_HeadersEntry_descriptor, + org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_HeadersEntry_descriptor, com.google.protobuf.WireFormat.FieldType.STRING, "", com.google.protobuf.WireFormat.FieldType.STRING, @@ -197,10 +179,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PInfo)) { + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.ProtoTInfo)) { return super.equals(obj); } - org.apache.accumulo.core.compaction.protobuf.PInfo other = (org.apache.accumulo.core.compaction.protobuf.PInfo) obj; + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo other = (org.apache.accumulo.core.compaction.protobuf.ProtoTInfo) obj; if (!internalGetHeaders().equals( other.internalGetHeaders())) return false; @@ -224,44 +206,44 @@ public int hashCode() { return hash; } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom(byte[] data) + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom(java.io.InputStream input) + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -269,26 +251,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseDelimitedFrom(java.io.InputStream input) + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseDelimitedFrom( + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -301,7 +283,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PInfo parseFrom( public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PInfo prototype) { + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -317,15 +299,15 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code compaction_coordinator.PInfo} + * Protobuf type {@code client.ProtoTInfo} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:compaction_coordinator.PInfo) - org.apache.accumulo.core.compaction.protobuf.PInfoOrBuilder { + // @@protoc_insertion_point(builder_implements:client.ProtoTInfo) + org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_descriptor; + return org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_descriptor; } @SuppressWarnings({"rawtypes"}) @@ -353,12 +335,12 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.PInfo.class, org.apache.accumulo.core.compaction.protobuf.PInfo.Builder.class); + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.class, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder.class); } - // Construct using org.apache.accumulo.core.compaction.protobuf.PInfo.newBuilder() + // Construct using org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.newBuilder() private Builder() { } @@ -379,17 +361,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PInfo_descriptor; + return org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_descriptor; } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PInfo getDefaultInstanceForType() { - return org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance(); + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance(); } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PInfo build() { - org.apache.accumulo.core.compaction.protobuf.PInfo result = buildPartial(); + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo build() { + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -397,14 +379,14 @@ public org.apache.accumulo.core.compaction.protobuf.PInfo build() { } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PInfo buildPartial() { - org.apache.accumulo.core.compaction.protobuf.PInfo result = new org.apache.accumulo.core.compaction.protobuf.PInfo(this); + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo buildPartial() { + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo result = new org.apache.accumulo.core.compaction.protobuf.ProtoTInfo(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PInfo result) { + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { result.headers_ = internalGetHeaders(); @@ -446,16 +428,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.apache.accumulo.core.compaction.protobuf.PInfo) { - return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PInfo)other); + if (other instanceof org.apache.accumulo.core.compaction.protobuf.ProtoTInfo) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.ProtoTInfo)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PInfo other) { - if (other == org.apache.accumulo.core.compaction.protobuf.PInfo.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo other) { + if (other == org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) return this; internalGetMutableHeaders().mergeFrom( other.internalGetHeaders()); bitField0_ |= 0x00000001; @@ -650,23 +632,23 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:compaction_coordinator.PInfo) + // @@protoc_insertion_point(builder_scope:client.ProtoTInfo) } - // @@protoc_insertion_point(class_scope:compaction_coordinator.PInfo) - private static final org.apache.accumulo.core.compaction.protobuf.PInfo DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:client.ProtoTInfo) + private static final org.apache.accumulo.core.compaction.protobuf.ProtoTInfo DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PInfo(); + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.ProtoTInfo(); } - public static org.apache.accumulo.core.compaction.protobuf.PInfo getDefaultInstance() { + public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public PInfo parsePartialFrom( + public ProtoTInfo parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -685,17 +667,17 @@ public PInfo parsePartialFrom( } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PInfo getDefaultInstanceForType() { + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfoOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfoOrBuilder.java similarity index 51% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfoOrBuilder.java rename to core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfoOrBuilder.java index f49eaad9288..14f3e690e2f 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInfoOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfoOrBuilder.java @@ -1,29 +1,11 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compaction-coordinator.proto +// source: client.proto // Protobuf Java Version: 3.25.3 package org.apache.accumulo.core.compaction.protobuf; -public interface PInfoOrBuilder extends - // @@protoc_insertion_point(interface_extends:compaction_coordinator.PInfo) +public interface ProtoTInfoOrBuilder extends + // @@protoc_insertion_point(interface_extends:client.ProtoTInfo) com.google.protobuf.MessageOrBuilder { /** diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/SecurityProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/SecurityProto.java new file mode 100644 index 00000000000..900aa653cb6 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/SecurityProto.java @@ -0,0 +1,53 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: security.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public final class SecurityProto { + private SecurityProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_security_PCredentials_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_security_PCredentials_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\016security.proto\022\010security\"\252\001\n\014PCredenti" + + "als\022\026\n\tprincipal\030\001 \001(\tH\000\210\001\001\022\033\n\016tokenClas" + + "sName\030\002 \001(\tH\001\210\001\001\022\022\n\005token\030\003 \001(\014H\002\210\001\001\022\027\n\n" + + "instanceId\030\004 \001(\tH\003\210\001\001B\014\n\n_principalB\021\n\017_" + + "tokenClassNameB\010\n\006_tokenB\r\n\013_instanceIdB" + + "?\n,org.apache.accumulo.core.compaction.p" + + "rotobufB\rSecurityProtoP\001b\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_security_PCredentials_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_security_PCredentials_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_security_PCredentials_descriptor, + new java.lang.String[] { "Principal", "TokenClassName", "Token", "InstanceId", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java new file mode 100644 index 00000000000..5ac1dfbf98c --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java @@ -0,0 +1,93 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: tabletserver.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public final class TabletServerProto { + private TabletServerProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_tablet_server_PInputFile_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_tablet_server_PInputFile_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_tablet_server_PIteratorSetting_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_tablet_server_PIteratorSetting_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_tablet_server_PIteratorSetting_PropertiesEntry_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_tablet_server_PIteratorSetting_PropertiesEntry_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_tablet_server_PIteratorConfig_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_tablet_server_PIteratorConfig_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\022tabletserver.proto\022\rtablet_server\"Y\n\nP" + + "InputFile\022\031\n\021metadataFileEntry\030\001 \001(\t\022\014\n\004" + + "size\030\002 \001(\003\022\017\n\007entries\030\003 \001(\003\022\021\n\ttimestamp" + + "\030\004 \001(\003\"\301\001\n\020PIteratorSetting\022\020\n\010priority\030" + + "\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\025\n\riteratorClass\030\003 \001" + + "(\t\022C\n\nproperties\030\004 \003(\0132/.tablet_server.P" + + "IteratorSetting.PropertiesEntry\0321\n\017Prope" + + "rtiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\002" + + "8\001\"E\n\017PIteratorConfig\0222\n\titerators\030\001 \003(\013" + + "2\037.tablet_server.PIteratorSetting*4\n\017PCo" + + "mpactionKind\022\013\n\007UNKNOWN\020\000\022\n\n\006SYSTEM\020\001\022\010\n" + + "\004USER\020\002BC\n,org.apache.accumulo.core.comp" + + "action.protobufB\021TabletServerProtoP\001b\006pr" + + "oto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_tablet_server_PInputFile_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_tablet_server_PInputFile_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_tablet_server_PInputFile_descriptor, + new java.lang.String[] { "MetadataFileEntry", "Size", "Entries", "Timestamp", }); + internal_static_tablet_server_PIteratorSetting_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_tablet_server_PIteratorSetting_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_tablet_server_PIteratorSetting_descriptor, + new java.lang.String[] { "Priority", "Name", "IteratorClass", "Properties", }); + internal_static_tablet_server_PIteratorSetting_PropertiesEntry_descriptor = + internal_static_tablet_server_PIteratorSetting_descriptor.getNestedTypes().get(0); + internal_static_tablet_server_PIteratorSetting_PropertiesEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_tablet_server_PIteratorSetting_PropertiesEntry_descriptor, + new java.lang.String[] { "Key", "Value", }); + internal_static_tablet_server_PIteratorConfig_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_tablet_server_PIteratorConfig_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_tablet_server_PIteratorConfig_descriptor, + new java.lang.String[] { "Iterators", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/server/base/src/main/java/org/apache/accumulo/server/compaction/RetryableThriftCall.java b/server/base/src/main/java/org/apache/accumulo/server/compaction/RetryableRpcCall.java similarity index 95% rename from server/base/src/main/java/org/apache/accumulo/server/compaction/RetryableThriftCall.java rename to server/base/src/main/java/org/apache/accumulo/server/compaction/RetryableRpcCall.java index 2d5d83afa31..a038e18ea39 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/compaction/RetryableThriftCall.java +++ b/server/base/src/main/java/org/apache/accumulo/server/compaction/RetryableRpcCall.java @@ -18,8 +18,6 @@ */ package org.apache.accumulo.server.compaction; -import static java.time.Duration.ofMillis; - import java.time.Duration; import org.apache.accumulo.core.util.Retry; @@ -28,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RetryableThriftCall { +public class RetryableRpcCall { public static class RetriesExceededException extends Exception { @@ -55,7 +53,7 @@ public RetriesExceededException(Throwable cause) { } - private static final Logger LOG = LoggerFactory.getLogger(RetryableThriftCall.class); + private static final Logger LOG = LoggerFactory.getLogger(RetryableRpcCall.class); public static final long MAX_WAIT_TIME = 60000; private final RetryableThriftFunction function; @@ -69,7 +67,7 @@ public RetriesExceededException(Throwable cause) { * @param maxNumRetries number of times to retry, 0 to retry forever * @param function function to execute */ - public RetryableThriftCall(long start, long maxWaitTime, int maxNumRetries, + public RetryableRpcCall(long start, long maxWaitTime, int maxNumRetries, RetryableThriftFunction function) { this.function = function; NeedsRetryDelay builder = null; diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java index 38d03faaf2d..796cec1abec 100644 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java @@ -21,15 +21,15 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; +import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob; import org.apache.accumulo.core.data.TableId; import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; -import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.server.compaction.FileCompactor; public class CompactionJobHolder { - private TExternalCompactionJob job; + private PExternalCompactionJob job; private Thread compactionThread; private AtomicReference compactor; private volatile boolean cancelled = false; @@ -45,13 +45,13 @@ public synchronized void reset() { stats = null; } - public synchronized TExternalCompactionJob getJob() { + public synchronized PExternalCompactionJob getJob() { return job; } public TableId getTableId() { - var tKeyExtent = getJob().getExtent(); - return KeyExtent.fromThrift(tKeyExtent).tableId(); + var pKeyExtent = getJob().getExtent(); + return KeyExtent.fromProtobuf(pKeyExtent).tableId(); } public TCompactionStats getStats() { @@ -82,7 +82,7 @@ public synchronized boolean isSet() { return (null != this.job); } - public synchronized void set(TExternalCompactionJob job, Thread compactionThread, + public synchronized void set(PExternalCompactionJob job, Thread compactionThread, AtomicReference compactor) { Objects.requireNonNull(job, "CompactionJob is null"); Objects.requireNonNull(compactionThread, "Compaction thread is null"); diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java index 54f085d242a..68fea886796 100644 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java @@ -54,12 +54,14 @@ import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc; import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceBlockingStub; import org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest; +import org.apache.accumulo.core.compaction.protobuf.PCompactionKind; +import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob; +import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob; import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService; import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService.Client; import org.apache.accumulo.core.compaction.thrift.CompactorService; import org.apache.accumulo.core.compaction.thrift.TCompactionState; import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate; -import org.apache.accumulo.core.compaction.thrift.TNextCompactionJob; import org.apache.accumulo.core.compaction.thrift.UnknownCompactionIdException; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ConfigurationCopy; @@ -95,7 +97,6 @@ import org.apache.accumulo.core.securityImpl.thrift.TCredentials; import org.apache.accumulo.core.spi.crypto.CryptoService; import org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction; -import org.apache.accumulo.core.tabletserver.thrift.TCompactionKind; import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.core.trace.TraceUtil; @@ -113,8 +114,8 @@ import org.apache.accumulo.server.compaction.CompactionWatcher; import org.apache.accumulo.server.compaction.FileCompactor; import org.apache.accumulo.server.compaction.PausedCompactionMetrics; -import org.apache.accumulo.server.compaction.RetryableThriftCall; -import org.apache.accumulo.server.compaction.RetryableThriftCall.RetriesExceededException; +import org.apache.accumulo.server.compaction.RetryableRpcCall; +import org.apache.accumulo.server.compaction.RetryableRpcCall.RetriesExceededException; import org.apache.accumulo.server.conf.TableConfiguration; import org.apache.accumulo.server.fs.VolumeManager; import org.apache.accumulo.server.rpc.ServerAddress; @@ -210,10 +211,10 @@ protected void startCancelChecker(ScheduledThreadPoolExecutor schedExecutor, } protected void checkIfCanceled() { - TExternalCompactionJob job = JOB_HOLDER.getJob(); + PExternalCompactionJob job = JOB_HOLDER.getJob(); if (job != null) { try { - var extent = KeyExtent.fromThrift(job.getExtent()); + var extent = KeyExtent.fromProtobuf(job.getExtent()); var ecid = ExternalCompactionId.of(job.getExternalCompactionId()); TabletMetadata tabletMeta = @@ -234,20 +235,20 @@ protected void checkIfCanceled() { return; } - if (job.getKind() == TCompactionKind.USER) { + if (job.getKind() == PCompactionKind.USER) { - var cconf = - CompactionConfigStorage.getConfig(getContext(), FateId.fromThrift(job.getFateId())); + var cconf = CompactionConfigStorage.getConfig(getContext(), + FateId.fromThrift(convert(job.getFateId()))); if (cconf == null) { LOG.info("Cancelling compaction {} for user compaction that no longer exists {} {}", - ecid, FateId.fromThrift(job.getFateId()), extent); + ecid, FateId.fromThrift(convert(job.getFateId())), extent); JOB_HOLDER.cancel(job.getExternalCompactionId()); } } } catch (RuntimeException | KeeperException e) { LOG.warn("Failed to check if compaction {} for {} was canceled.", - job.getExternalCompactionId(), KeyExtent.fromThrift(job.getExtent()), e); + job.getExternalCompactionId(), KeyExtent.fromProtobuf(job.getExtent()), e); } catch (InterruptedException e) { Thread.currentThread().interrupt(); throw new RuntimeException(e); @@ -395,10 +396,10 @@ public void cancel(TInfo tinfo, TCredentials credentials, String externalCompact * @param update status update * @throws RetriesExceededException thrown when retries have been exceeded */ - protected void updateCompactionState(TExternalCompactionJob job, TCompactionStatusUpdate update) + protected void updateCompactionState(PExternalCompactionJob job, TCompactionStatusUpdate update) throws RetriesExceededException { - RetryableThriftCall thriftCall = - new RetryableThriftCall<>(1000, RetryableThriftCall.MAX_WAIT_TIME, 25, () -> { + RetryableRpcCall thriftCall = + new RetryableRpcCall<>(1000, RetryableRpcCall.MAX_WAIT_TIME, 25, () -> { Client coordinatorClient = getCoordinatorClient(); try { coordinatorClient.updateCompactionStatus(TraceUtil.traceInfo(), getContext().rpcCreds(), @@ -417,14 +418,14 @@ protected void updateCompactionState(TExternalCompactionJob job, TCompactionStat * @param job current compaction job * @throws RetriesExceededException thrown when retries have been exceeded */ - protected void updateCompactionFailed(TExternalCompactionJob job) + protected void updateCompactionFailed(PExternalCompactionJob job) throws RetriesExceededException { - RetryableThriftCall thriftCall = - new RetryableThriftCall<>(1000, RetryableThriftCall.MAX_WAIT_TIME, 25, () -> { + RetryableRpcCall thriftCall = + new RetryableRpcCall<>(1000, RetryableRpcCall.MAX_WAIT_TIME, 25, () -> { Client coordinatorClient = getCoordinatorClient(); try { coordinatorClient.compactionFailed(TraceUtil.traceInfo(), getContext().rpcCreds(), - job.getExternalCompactionId(), job.extent); + job.getExternalCompactionId(), convert(job.getExtent())); return ""; } finally { ThriftUtil.returnClient(coordinatorClient, getContext()); @@ -440,14 +441,14 @@ protected void updateCompactionFailed(TExternalCompactionJob job) * @param stats compaction stats * @throws RetriesExceededException thrown when retries have been exceeded */ - protected void updateCompactionCompleted(TExternalCompactionJob job, TCompactionStats stats) + protected void updateCompactionCompleted(PExternalCompactionJob job, TCompactionStats stats) throws RetriesExceededException { - RetryableThriftCall thriftCall = - new RetryableThriftCall<>(1000, RetryableThriftCall.MAX_WAIT_TIME, 25, () -> { + RetryableRpcCall thriftCall = + new RetryableRpcCall<>(1000, RetryableRpcCall.MAX_WAIT_TIME, 25, () -> { Client coordinatorClient = getCoordinatorClient(); try { coordinatorClient.compactionCompleted(TraceUtil.traceInfo(), getContext().rpcCreds(), - job.getExternalCompactionId(), job.extent, stats); + job.getExternalCompactionId(), convert(job.getExtent()), stats); return ""; } finally { ThriftUtil.returnClient(coordinatorClient, getContext()); @@ -463,14 +464,14 @@ protected void updateCompactionCompleted(TExternalCompactionJob job, TCompaction * @return CompactionJob * @throws RetriesExceededException thrown when retries have been exceeded */ - protected TNextCompactionJob getNextJob(Supplier uuid) throws RetriesExceededException { + protected PNextCompactionJob getNextJob(Supplier uuid) throws RetriesExceededException { final long startingWaitTime = getConfiguration().getTimeInMillis(Property.COMPACTOR_MIN_JOB_WAIT_TIME); final long maxWaitTime = getConfiguration().getTimeInMillis(Property.COMPACTOR_MAX_JOB_WAIT_TIME); - RetryableThriftCall nextJobThriftCall = - new RetryableThriftCall<>(startingWaitTime, maxWaitTime, 0, () -> { + RetryableRpcCall nextJobRpcCall = + new RetryableRpcCall<>(startingWaitTime, maxWaitTime, 0, () -> { var grpcClient = getGrpcCoordinatorClient(); try { ExternalCompactionId eci = ExternalCompactionId.generate(uuid.get()); @@ -481,15 +482,13 @@ protected TNextCompactionJob getNextJob(Supplier uuid) throws RetriesExcee * and convert to/from the equivalent protocol buffer objects for now to keep the * changes isolated from the rest of the code. */ - var request = CompactionJobRequest.newBuilder().setPinfo(convert(TraceUtil.traceInfo())) - .setCredentials(convert(getContext().rpcCreds())) - .setGroupName(this.getResourceGroup()) + var request = CompactionJobRequest.newBuilder().setPtinfo(TraceUtil.protoTraceInfo()) + .setCredentials(getContext().gRpcCreds()).setGroupName(this.getResourceGroup()) .setCompactor( ExternalCompactionUtil.getHostPortString(compactorAddress.getAddress())) .setExternalCompactionId(eci.toString()).build(); - // The client is making a blocking sync call here and waiting for a response - // but this could be async - return convert(grpcClient.getCompactionJob(request)); + + return grpcClient.getCompactionJob(request); } catch (Exception e) { currentCompactionId.set(null); throw e; @@ -499,7 +498,7 @@ protected TNextCompactionJob getNextJob(Supplier uuid) throws RetriesExcee managedChannel.shutdown(); } }); - return nextJobThriftCall.run(); + return nextJobRpcCall.run(); } /** @@ -541,7 +540,7 @@ protected CompactionCoordinatorServiceBlockingStub getGrpcCoordinatorClient() * @param err reference to error * @return Runnable compaction job */ - protected FileCompactorRunnable createCompactionJob(final TExternalCompactionJob job, + protected FileCompactorRunnable createCompactionJob(final PExternalCompactionJob job, final LongAdder totalInputEntries, final LongAdder totalInputBytes, final CountDownLatch started, final CountDownLatch stopped, final AtomicReference err) { @@ -558,14 +557,14 @@ public void initialize() throws RetriesExceededException { TCompactionStatusUpdate update = new TCompactionStatusUpdate(TCompactionState.STARTED, "Compaction started", -1, -1, -1, getCompactionAge().toNanos()); updateCompactionState(job, update); - final var extent = KeyExtent.fromThrift(job.getExtent()); + final var extent = KeyExtent.fromProtobuf(job.getExtent()); final AccumuloConfiguration aConfig; final TableConfiguration tConfig = getContext().getTableConfiguration(extent.tableId()); - if (!job.getOverrides().isEmpty()) { + if (!job.getOverridesMap().isEmpty()) { aConfig = new ConfigurationCopy(tConfig); - job.getOverrides().forEach(((ConfigurationCopy) aConfig)::set); - LOG.debug("Overriding table properties with {}", job.getOverrides()); + job.getOverridesMap().forEach(((ConfigurationCopy) aConfig)::set); + LOG.debug("Overriding table properties with {}", job.getOverridesMap()); } else { aConfig = tConfig; } @@ -574,7 +573,7 @@ public void initialize() throws RetriesExceededException { new ReferencedTabletFile(new Path(job.getOutputFile())); final Map files = new TreeMap<>(); - job.getFiles().forEach(f -> { + job.getFilesList().forEach(f -> { long estEntries = f.getEntries(); StoredTabletFile stf = new StoredTabletFile(f.getMetadataFileEntry()); // This happens with bulk import files @@ -588,12 +587,12 @@ public void initialize() throws RetriesExceededException { }); final List iters = new ArrayList<>(); - job.getIteratorSettings().getIterators() + job.getIteratorSettings().getIteratorsList() .forEach(tis -> iters.add(SystemIteratorUtil.toIteratorSetting(tis))); final ExtCEnv cenv = new ExtCEnv(JOB_HOLDER, getResourceGroup()); compactor.set( - new FileCompactor(getContext(), extent, files, outputFile, job.isPropagateDeletes(), + new FileCompactor(getContext(), extent, files, outputFile, job.getPropagateDeletes(), cenv, iters, aConfig, tConfig.getCryptoService(), pausedMetrics)); } @@ -632,9 +631,9 @@ public void run() { LOG.debug("Compaction canceled {}", job.getExternalCompactionId()); err.set(cce); } catch (Exception e) { - KeyExtent fromThriftExtent = KeyExtent.fromThrift(job.getExtent()); + KeyExtent fromProtobufExtent = KeyExtent.fromProtobuf(job.getExtent()); LOG.error("Compaction failed: id: {}, extent: {}", job.getExternalCompactionId(), - fromThriftExtent, e); + fromProtobufExtent, e); err.set(e); } finally { stopped.countDown(); @@ -764,11 +763,11 @@ public void run() { nextSortLogsCheckTime = logSorter.sortLogsIfNeeded(); } - TExternalCompactionJob job; + PExternalCompactionJob job; try { - TNextCompactionJob next = getNextJob(getNextId()); + PNextCompactionJob next = getNextJob(getNextId()); job = next.getJob(); - if (!job.isSetExternalCompactionId()) { + if (!job.hasExternalCompactionId()) { LOG.trace("No external compactions in group {}", this.getResourceGroup()); UtilWaitThread.sleep(getWaitTimeBetweenCompactionChecks(next.getCompactorCount())); continue; @@ -866,10 +865,10 @@ public void run() { currentCompactionId.set(null); } } else if (err.get() != null) { - KeyExtent fromThriftExtent = KeyExtent.fromThrift(job.getExtent()); + KeyExtent fromProtobufExtent = KeyExtent.fromProtobuf(job.getExtent()); try { LOG.info("Updating coordinator with compaction failure: id: {}, extent: {}", - job.getExternalCompactionId(), fromThriftExtent); + job.getExternalCompactionId(), fromProtobufExtent); TCompactionStatusUpdate update = new TCompactionStatusUpdate(TCompactionState.FAILED, "Compaction failed due to: " + err.get().getMessage(), -1, -1, -1, fcr.getCompactionAge().toNanos()); @@ -877,7 +876,7 @@ public void run() { updateCompactionFailed(job); } catch (RetriesExceededException e) { LOG.error("Error updating coordinator with compaction failure: id: {}, extent: {}", - job.getExternalCompactionId(), fromThriftExtent, e); + job.getExternalCompactionId(), fromProtobufExtent, e); } finally { currentCompactionId.set(null); } @@ -998,7 +997,7 @@ public TExternalCompactionJob getRunningCompaction(TInfo tinfo, TCredentials cre // method is called by a coordinator starting up to determine what is currently running on all // compactors. - TExternalCompactionJob job = null; + PExternalCompactionJob job = null; synchronized (JOB_HOLDER) { job = JOB_HOLDER.getJob(); } @@ -1006,7 +1005,7 @@ public TExternalCompactionJob getRunningCompaction(TInfo tinfo, TCredentials cre if (null == job) { return new TExternalCompactionJob(); } else { - return job; + return convert(job); } } diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java index 490e5908ba1..1228122453c 100644 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java @@ -18,6 +18,9 @@ */ package org.apache.accumulo.compactor; +import static org.apache.accumulo.core.rpc.ThriftProtobufUtil.convert; + +import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.TableId; @@ -26,18 +29,18 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.spi.compaction.CompactionKind; import org.apache.accumulo.core.tabletserver.thrift.TCompactionReason; -import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.compaction.FileCompactor.CompactionEnv; import org.apache.accumulo.server.iterators.SystemIteratorEnvironment; import org.apache.accumulo.server.iterators.TabletIteratorEnvironment; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; public class ExtCEnv implements CompactionEnv { private final CompactionJobHolder jobHolder; - private TExternalCompactionJob job; + private PExternalCompactionJob job; private String groupName; public static class CompactorIterEnv extends TabletIteratorEnvironment { @@ -76,7 +79,7 @@ public IteratorScope getIteratorScope() { public SystemIteratorEnvironment createIteratorEnv(ServerContext context, AccumuloConfiguration acuTableConf, TableId tableId) { return new CompactorIterEnv(context, IteratorScope.majc, - !jobHolder.getJob().isPropagateDeletes(), acuTableConf, tableId, + !jobHolder.getJob().getPropagateDeletes(), acuTableConf, tableId, CompactionKind.valueOf(job.getKind().name()), groupName); } @@ -87,7 +90,10 @@ public SortedKeyValueIterator getMinCIterator() { @Override public TCompactionReason getReason() { - switch (job.getKind()) { + var reason = convert(job.getKind()); + Preconditions.checkState(reason != null, "Unknown compaction kind %s", job.getKind()); + + switch (reason) { case USER: return TCompactionReason.USER; case SYSTEM: diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java index ef07b78d8a1..13cba7f27b7 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java @@ -68,7 +68,13 @@ import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException; import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc; import org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest; +import org.apache.accumulo.core.compaction.protobuf.PCompactionKind; +import org.apache.accumulo.core.compaction.protobuf.PCredentials; +import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob; +import org.apache.accumulo.core.compaction.protobuf.PInputFile; +import org.apache.accumulo.core.compaction.protobuf.PIteratorConfig; import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob; +import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo; import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService; import org.apache.accumulo.core.compaction.thrift.TCompactionState; import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate; @@ -104,11 +110,7 @@ import org.apache.accumulo.core.spi.compaction.CompactionJob; import org.apache.accumulo.core.spi.compaction.CompactionKind; import org.apache.accumulo.core.spi.compaction.CompactorGroupId; -import org.apache.accumulo.core.tabletserver.thrift.InputFile; -import org.apache.accumulo.core.tabletserver.thrift.IteratorConfig; -import org.apache.accumulo.core.tabletserver.thrift.TCompactionKind; import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; -import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.core.util.Retry; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.util.cache.Caches.CacheName; @@ -384,76 +386,15 @@ public long getNumRunningCompactions() { public TNextCompactionJob getCompactionJob(TInfo tinfo, TCredentials credentials, String groupName, String compactorAddress, String externalCompactionId) throws ThriftSecurityException { - - // do not expect users to call this directly, expect compactors to call this method - if (!security.canPerformSystemActions(credentials)) { - throw new AccumuloSecurityException(credentials.getPrincipal(), - SecurityErrorCode.PERMISSION_DENIED).asThriftException(); - } - CompactorGroupId groupId = CompactorGroupId.of(groupName); - LOG.trace("getCompactionJob called for group {} by compactor {}", groupId, compactorAddress); - TIME_COMPACTOR_LAST_CHECKED.put(groupId, System.currentTimeMillis()); - - TExternalCompactionJob result = null; - - CompactionJobQueues.MetaJob metaJob = jobQueues.poll(groupId); - - while (metaJob != null) { - - Optional compactionConfig = getCompactionConfig(metaJob); - - // this method may reread the metadata, do not use the metadata in metaJob for anything after - // this method - CompactionMetadata ecm = null; - - var kind = metaJob.getJob().getKind(); - - // Only reserve user compactions when the config is present. When compactions are canceled the - // config is deleted. - var cid = ExternalCompactionId.from(externalCompactionId); - if (kind == CompactionKind.SYSTEM - || (kind == CompactionKind.USER && compactionConfig.isPresent())) { - ecm = reserveCompaction(metaJob, compactorAddress, cid); - } - - if (ecm != null) { - result = createThriftJob(externalCompactionId, ecm, metaJob, compactionConfig); - // It is possible that by the time this added that the the compactor that made this request - // is dead. In this cases the compaction is not actually running. - RUNNING_CACHE.put(ExternalCompactionId.of(result.getExternalCompactionId()), - new RunningCompaction(result, compactorAddress, groupName)); - TabletLogger.compacting(metaJob.getTabletMetadata(), cid, compactorAddress, - metaJob.getJob()); - break; - } else { - LOG.debug( - "Unable to reserve compaction job for {}, pulling another off the queue for group {}", - metaJob.getTabletMetadata().getExtent(), groupName); - metaJob = jobQueues.poll(CompactorGroupId.of(groupName)); - } - } - - if (metaJob == null) { - LOG.debug("No jobs found in group {} ", groupName); - } - - if (result == null) { - LOG.trace("No jobs found for group {}, returning empty job to compactor {}", groupName, - compactorAddress); - result = new TExternalCompactionJob(); - } else { - LOG.info("Found job {}", result.externalCompactionId); - } - - return new TNextCompactionJob(result, compactorCounts.get(groupName)); + throw new UnsupportedOperationException(); } - protected CompletableFuture getAsyncCompactionJob(TCredentials credentials, - String groupName, String compactorAddress, String externalCompactionId) - throws ThriftSecurityException { + public CompletableFuture getAsyncCompactionJob(ProtoTInfo ptinfo, + PCredentials credentials, String groupName, String compactorAddress, + String externalCompactionId) throws ThriftSecurityException { // do not expect users to call this directly, expect compactors to call this method - if (!security.canPerformSystemActions(credentials)) { + if (!security.canPerformSystemActions(convert(credentials))) { throw new AccumuloSecurityException(credentials.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED).asThriftException(); } @@ -479,23 +420,24 @@ protected CompletableFuture getAsyncCompactionJob(TCredentia ecm = reserveCompaction(metaJob, compactorAddress, cid); } - final TExternalCompactionJob result; + final PExternalCompactionJob result; if (ecm != null) { - result = createThriftJob(externalCompactionId, ecm, metaJob, compactionConfig); + result = createRpcJob(externalCompactionId, ecm, metaJob, compactionConfig); // It is possible that by the time this added that the the compactor that made this request // is dead. In this cases the compaction is not actually running. RUNNING_CACHE.put(ExternalCompactionId.of(result.getExternalCompactionId()), - new RunningCompaction(result, compactorAddress, groupName)); + new RunningCompaction(convert(result), compactorAddress, groupName)); TabletLogger.compacting(metaJob.getTabletMetadata(), cid, compactorAddress, metaJob.getJob()); - LOG.info("Found job {}", result.externalCompactionId); + LOG.info("Found job {}", result.getExternalCompactionId()); } else { LOG.debug("Unable to reserve compaction job for {}, returning empty job to compactor {}", metaJob.getTabletMetadata().getExtent(), compactorAddress); - result = new TExternalCompactionJob(); + result = PExternalCompactionJob.newBuilder().build(); } - return new TNextCompactionJob(result, compactorCounts.get(groupName)); + return PNextCompactionJob.newBuilder().setJob(result) + .setCompactorCount(compactorCounts.get(groupName)).build(); }); } @@ -680,9 +622,8 @@ protected CompactionMetadata reserveCompaction(CompactionJobQueues.MetaJob metaJ return null; } - protected TExternalCompactionJob createThriftJob(String externalCompactionId, - CompactionMetadata ecm, CompactionJobQueues.MetaJob metaJob, - Optional compactionConfig) { + protected PExternalCompactionJob createRpcJob(String externalCompactionId, CompactionMetadata ecm, + CompactionJobQueues.MetaJob metaJob, Optional compactionConfig) { Set selectedFiles; if (metaJob.getJob().getKind() == CompactionKind.SYSTEM) { @@ -697,13 +638,14 @@ protected TExternalCompactionJob createThriftJob(String externalCompactionId, Map overrides = CompactionPluginUtils.computeOverrides(compactionConfig, ctx, metaJob.getTabletMetadata().getExtent(), metaJob.getJob().getFiles(), selectedFiles); - IteratorConfig iteratorSettings = SystemIteratorUtil + PIteratorConfig iteratorSettings = SystemIteratorUtil .toIteratorConfig(compactionConfig.map(CompactionConfig::getIterators).orElse(List.of())); var files = ecm.getJobFiles().stream().map(storedTabletFile -> { var dfv = metaJob.getTabletMetadata().getFilesMap().get(storedTabletFile); - return new InputFile(storedTabletFile.getMetadata(), dfv.getSize(), dfv.getNumEntries(), - dfv.getTime()); + return PInputFile.newBuilder().setMetadataFileEntry(storedTabletFile.getMetadata()) + .setSize(dfv.getSize()).setEntries(dfv.getNumEntries()).setTimestamp(dfv.getTime()) + .build(); }).collect(toList()); // The fateId here corresponds to the Fate transaction that is driving a user initiated @@ -715,11 +657,30 @@ protected TExternalCompactionJob createThriftJob(String externalCompactionId, fateId = metaJob.getTabletMetadata().getSelectedFiles().getFateId(); } - return new TExternalCompactionJob(externalCompactionId, - metaJob.getTabletMetadata().getExtent().toThrift(), files, iteratorSettings, - ecm.getCompactTmpName().getNormalizedPathStr(), ecm.getPropagateDeletes(), - TCompactionKind.valueOf(ecm.getKind().name()), fateId == null ? null : fateId.toThrift(), - overrides); + PExternalCompactionJob.Builder builder = + PExternalCompactionJob.newBuilder().setExternalCompactionId(externalCompactionId) + .setExtent(metaJob.getTabletMetadata().getExtent().toProtobuf()).addAllFiles(files) + .setIteratorSettings(iteratorSettings) + .setOutputFile(ecm.getCompactTmpName().getNormalizedPathStr()) + .setPropagateDeletes(ecm.getPropagateDeletes()).setKind(convertKind(ecm.getKind())) + .putAllOverrides(overrides); + + if (fateId != null) { + builder.setFateId(convert(fateId.toThrift())); + } + + return builder.build(); + } + + protected static PCompactionKind convertKind(CompactionKind kind) { + switch (kind) { + case SYSTEM: + return PCompactionKind.SYSTEM; + case USER: + return PCompactionKind.USER; + default: + throw new IllegalArgumentException("Unexpected TCompactionKind: " + kind); + } } @Override @@ -1193,20 +1154,21 @@ private class GrpcCompactionCoordinatorService public void getCompactionJob(CompactionJobRequest request, StreamObserver responseObserver) { - var credentials = convert(request.getCredentials()); + var credentials = request.getCredentials(); + var ptinfo = request.getPtinfo(); try { LOG.debug("Received compaction job grpc {}", request.getExternalCompactionId()); // Get the next job as a future as we need to wait until something is available - var result = CompactionCoordinator.this.getAsyncCompactionJob(credentials, + var result = CompactionCoordinator.this.getAsyncCompactionJob(ptinfo, credentials, request.getGroupName(), request.getCompactor(), request.getExternalCompactionId()); // Async send back to the compactor when a new job is ready // Need the unused var for errorprone var unused = result.thenAccept(ecj -> { LOG.debug("Received next compaction job {}", ecj); - responseObserver.onNext(convert(ecj)); + responseObserver.onNext(ecj); responseObserver.onCompleted(); }).exceptionally(e -> { LOG.warn("Received exception processing compaction job {}", e.getMessage()); diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java index 5c7a913d911..4c93cd5a128 100644 --- a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java +++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java @@ -22,6 +22,7 @@ import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.OPID; import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.SELECTED; import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.USER_COMPACTION_REQUESTED; +import static org.apache.accumulo.core.rpc.ThriftProtobufUtil.convert; import static org.apache.accumulo.manager.compaction.coordinator.CompactionCoordinator.canReserveCompaction; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.createMock; @@ -30,7 +31,6 @@ import static org.easymock.EasyMock.replay; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.URI; @@ -42,6 +42,7 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -50,8 +51,11 @@ import org.apache.accumulo.core.client.admin.CompactionConfig; import org.apache.accumulo.core.clientImpl.thrift.TInfo; import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException; +import org.apache.accumulo.core.compaction.protobuf.PCredentials; +import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob; +import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob; +import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo; import org.apache.accumulo.core.compaction.thrift.TExternalCompaction; -import org.apache.accumulo.core.compaction.thrift.TNextCompactionJob; import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.TableId; @@ -77,7 +81,6 @@ import org.apache.accumulo.core.spi.compaction.CompactionJob; import org.apache.accumulo.core.spi.compaction.CompactionKind; import org.apache.accumulo.core.spi.compaction.CompactorGroupId; -import org.apache.accumulo.core.tabletserver.thrift.TCompactionKind; import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.core.trace.TraceUtil; @@ -217,18 +220,19 @@ protected CompactionMetadata createExternalCompactionMetadata(CompactionJob job, } @Override - protected TExternalCompactionJob createThriftJob(String externalCompactionId, + protected PExternalCompactionJob createRpcJob(String externalCompactionId, CompactionMetadata ecm, MetaJob metaJob, Optional compactionConfig) { - return new TExternalCompactionJob(externalCompactionId, - metaJob.getTabletMetadata().getExtent().toThrift(), List.of(), - SystemIteratorUtil.toIteratorConfig(List.of()), - ecm.getCompactTmpName().getNormalizedPathStr(), ecm.getPropagateDeletes(), - TCompactionKind.valueOf(ecm.getKind().name()), - FateId - .from(FateInstanceType.fromTableId(metaJob.getTabletMetadata().getExtent().tableId()), - UUID.randomUUID()) - .toThrift(), - Map.of()); + return PExternalCompactionJob.newBuilder().setExternalCompactionId(externalCompactionId) + .setExtent(metaJob.getTabletMetadata().getExtent().toProtobuf()) + .setIteratorSettings(SystemIteratorUtil.toIteratorConfig(List.of())) + .setOutputFile(ecm.getCompactTmpName().getNormalizedPathStr()) + .setPropagateDeletes(ecm.getPropagateDeletes()).setKind(convertKind(ecm.getKind())) + .setFateId( + convert(FateId + .from(FateInstanceType.fromTableId( + metaJob.getTabletMetadata().getExtent().tableId()), UUID.randomUUID()) + .toThrift())) + .build(); } @Override @@ -326,10 +330,12 @@ public void testGetCompactionJob() throws Exception { expect(context.getMetricsInfo()).andReturn(metricsInfo).anyTimes(); TCredentials creds = EasyMock.createNiceMock(TCredentials.class); + expect(context.rpcCreds()).andReturn(creds).anyTimes(); AuditedSecurityOperation security = EasyMock.createNiceMock(AuditedSecurityOperation.class); - expect(security.canPerformSystemActions(creds)).andReturn(true).anyTimes(); + expect(security.canPerformSystemActions(anyObject(TCredentials.class))).andReturn(true) + .anyTimes(); KeyExtent ke = new KeyExtent(TableId.of("2a"), new Text("z"), new Text("b")); TabletMetadata tm = EasyMock.createNiceMock(TabletMetadata.class); @@ -362,12 +368,13 @@ public void testGetCompactionJob() throws Exception { // Get the next job ExternalCompactionId eci = ExternalCompactionId.generate(UUID.randomUUID()); - TNextCompactionJob nextJob = coordinator.getCompactionJob(new TInfo(), creds, - GROUP_ID.toString(), "localhost:10241", eci.toString()); - assertEquals(3, nextJob.getCompactorCount()); - TExternalCompactionJob createdJob = nextJob.getJob(); + CompletableFuture nextJob = coordinator.getAsyncCompactionJob( + ProtoTInfo.newBuilder().build(), PCredentials.newBuilder().build(), GROUP_ID.toString(), + "localhost:10241", eci.toString()); + assertEquals(3, nextJob.get().getCompactorCount()); + PExternalCompactionJob createdJob = nextJob.get().getJob(); assertEquals(eci.toString(), createdJob.getExternalCompactionId()); - assertEquals(ke, KeyExtent.fromThrift(createdJob.getExtent())); + assertEquals(ke, KeyExtent.fromProtobuf(createdJob.getExtent())); assertEquals(0, coordinator.getJobQueues().getQueuedJobCount()); assertEquals(1, coordinator.getRunning().size()); @@ -390,7 +397,7 @@ public void testGetCompactionJobNoJobs() throws Exception { TCredentials creds = EasyMock.createNiceMock(TCredentials.class); AuditedSecurityOperation security = EasyMock.createNiceMock(AuditedSecurityOperation.class); - expect(security.canPerformSystemActions(creds)).andReturn(true); + expect(security.canPerformSystemActions(anyObject(TCredentials.class))).andReturn(true); Manager manager = EasyMock.createNiceMock(Manager.class); expect(manager.getSteadyTime()).andReturn(SteadyTime.from(100000, TimeUnit.NANOSECONDS)) @@ -399,10 +406,12 @@ public void testGetCompactionJobNoJobs() throws Exception { EasyMock.replay(context, creds, security, manager); var coordinator = new TestCoordinator(context, security, new ArrayList<>(), manager); - TNextCompactionJob nextJob = coordinator.getCompactionJob(TraceUtil.traceInfo(), creds, - GROUP_ID.toString(), "localhost:10240", UUID.randomUUID().toString()); - assertEquals(3, nextJob.getCompactorCount()); - assertNull(nextJob.getJob().getExternalCompactionId()); + CompletableFuture nextJob = coordinator.getAsyncCompactionJob( + TraceUtil.protoTraceInfo(), PCredentials.newBuilder().build(), GROUP_ID.toString(), + "localhost:10240", UUID.randomUUID().toString()); + Thread.sleep(100); + // No jobs + assertFalse(nextJob.isDone()); EasyMock.verify(context, creds, security); } diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java index afd4b271e25..3b3e049eabf 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java @@ -28,6 +28,7 @@ import org.apache.accumulo.compactor.Compactor; import org.apache.accumulo.core.cli.ConfigOpts; +import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob; import org.apache.accumulo.core.compaction.thrift.CompactorService.Iface; import org.apache.accumulo.core.compaction.thrift.TCompactionState; import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate; @@ -36,11 +37,10 @@ import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType; -import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.server.compaction.FileCompactor; import org.apache.accumulo.server.compaction.FileCompactor.CompactionCanceledException; -import org.apache.accumulo.server.compaction.RetryableThriftCall.RetriesExceededException; +import org.apache.accumulo.server.compaction.RetryableRpcCall.RetriesExceededException; import org.apache.accumulo.server.tablets.TabletNameGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +61,7 @@ protected void startCancelChecker(ScheduledThreadPoolExecutor schedExecutor, } @Override - protected FileCompactorRunnable createCompactionJob(TExternalCompactionJob job, + protected FileCompactorRunnable createCompactionJob(PExternalCompactionJob job, LongAdder totalInputEntries, LongAdder totalInputBytes, CountDownLatch started, CountDownLatch stopped, AtomicReference err) { @@ -92,10 +92,10 @@ public void run() { // Create tmp output file final TabletMetadata tm = getContext().getAmple() - .readTablet(KeyExtent.fromThrift(job.getExtent()), ColumnType.DIR); - ReferencedTabletFile newFile = - TabletNameGenerator.getNextDataFilenameForMajc(job.isPropagateDeletes(), getContext(), - tm, (dir) -> {}, ExternalCompactionId.from(job.getExternalCompactionId())); + .readTablet(KeyExtent.fromProtobuf(job.getExtent()), ColumnType.DIR); + ReferencedTabletFile newFile = TabletNameGenerator.getNextDataFilenameForMajc( + job.getPropagateDeletes(), getContext(), tm, (dir) -> {}, + ExternalCompactionId.from(job.getExternalCompactionId())); LOG.info("Creating tmp file: {}", newFile.getPath()); getContext().getVolumeManager().createNewFile(newFile.getPath()); @@ -110,9 +110,9 @@ public void run() { throw new CompactionCanceledException(); } catch (Exception e) { - KeyExtent fromThriftExtent = KeyExtent.fromThrift(job.getExtent()); + KeyExtent fromProtobufExtent = KeyExtent.fromProtobuf(job.getExtent()); LOG.error("Compaction failed: id: {}, extent: {}", job.getExternalCompactionId(), - fromThriftExtent, e); + fromProtobufExtent, e); err.set(e); } finally { stopped.countDown(); @@ -122,7 +122,7 @@ public void run() { @Override public void initialize() throws RetriesExceededException { // This isn't used, just need to create and return something - ref.set(new FileCompactor(getContext(), KeyExtent.fromThrift(job.getExtent()), null, null, + ref.set(new FileCompactor(getContext(), KeyExtent.fromProtobuf(job.getExtent()), null, null, false, null, null, null, null, null)); } From 3fb40bd18edfc87538bb3fa4a799a42ae5b1d494 Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Fri, 12 Jul 2024 15:39:40 -0400 Subject: [PATCH 11/25] Add license headers to generated protobuf --- .../core/compaction/protobuf/ClientProto.java | 18 ++++++++++++++++++ .../CompactionCoordinatorServiceGrpc.java | 18 ++++++++++++++++++ .../CompactionCoordinatorServiceProto.java | 18 ++++++++++++++++++ .../protobuf/CompactionJobRequest.java | 18 ++++++++++++++++++ .../CompactionJobRequestOrBuilder.java | 18 ++++++++++++++++++ .../core/compaction/protobuf/DataProto.java | 18 ++++++++++++++++++ .../core/compaction/protobuf/ManagerProto.java | 18 ++++++++++++++++++ .../compaction/protobuf/PCompactionKind.java | 18 ++++++++++++++++++ .../core/compaction/protobuf/PCredentials.java | 18 ++++++++++++++++++ .../protobuf/PCredentialsOrBuilder.java | 18 ++++++++++++++++++ .../protobuf/PExternalCompactionJob.java | 18 ++++++++++++++++++ .../PExternalCompactionJobOrBuilder.java | 18 ++++++++++++++++++ .../core/compaction/protobuf/PFateId.java | 18 ++++++++++++++++++ .../compaction/protobuf/PFateIdOrBuilder.java | 18 ++++++++++++++++++ .../compaction/protobuf/PFateInstanceType.java | 18 ++++++++++++++++++ .../core/compaction/protobuf/PInputFile.java | 18 ++++++++++++++++++ .../protobuf/PInputFileOrBuilder.java | 18 ++++++++++++++++++ .../compaction/protobuf/PIteratorConfig.java | 18 ++++++++++++++++++ .../protobuf/PIteratorConfigOrBuilder.java | 18 ++++++++++++++++++ .../compaction/protobuf/PIteratorSetting.java | 18 ++++++++++++++++++ .../protobuf/PIteratorSettingOrBuilder.java | 18 ++++++++++++++++++ .../core/compaction/protobuf/PKeyExtent.java | 18 ++++++++++++++++++ .../protobuf/PKeyExtentOrBuilder.java | 18 ++++++++++++++++++ .../protobuf/PNextCompactionJob.java | 18 ++++++++++++++++++ .../protobuf/PNextCompactionJobOrBuilder.java | 18 ++++++++++++++++++ .../core/compaction/protobuf/ProtoTInfo.java | 18 ++++++++++++++++++ .../protobuf/ProtoTInfoOrBuilder.java | 18 ++++++++++++++++++ .../compaction/protobuf/SecurityProto.java | 18 ++++++++++++++++++ .../compaction/protobuf/TabletServerProto.java | 18 ++++++++++++++++++ 29 files changed, 522 insertions(+) diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ClientProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ClientProto.java index 58c763c756a..a26042b416d 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ClientProto.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ClientProto.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: client.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java index 16414a0a83b..32d4ec857c9 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.accumulo.core.compaction.protobuf; import static io.grpc.MethodDescriptor.generateFullMethodName; diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java index ee9537a2a20..d7a0a87634e 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java index d2d21ad8f78..3e32f8c2bf3 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java index 957c265f770..377f66f0b84 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/DataProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/DataProto.java index aacb1a65889..e92b09545ea 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/DataProto.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/DataProto.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: data.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ManagerProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ManagerProto.java index 8a7d0bb2a82..1106572fe4f 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ManagerProto.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ManagerProto.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: manager.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java index 9c6cd54f3b9..b5c747bad79 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: tabletserver.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java index 8ac1c52fde3..f2f7027fcfa 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: security.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java index 1d29cb29cfe..f7818dcc780 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: security.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java index d9ff85720db..f3ae5104930 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java index 271f73b9628..c32b9724d26 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java index 81793593b9d..9afa2d524de 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: manager.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java index 62ff7903ac6..4b7ab2322a9 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: manager.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java index b7141cf05ca..8e296d7c03d 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: manager.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java index 2b77a2b0ff2..4b602f86929 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: tabletserver.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java index 0c0adb574f9..a0e2ea778d2 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: tabletserver.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java index d38a792f30d..5767102eec5 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: tabletserver.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java index bd2166aa6f4..47680dff60d 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: tabletserver.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java index 0e748c3921d..055e1465d7a 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: tabletserver.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java index a66096a5f06..ffee250a489 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: tabletserver.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java index ce049c4fc8c..82558ae4d58 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: data.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java index caed01c37c6..78057373aab 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: data.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java index f4093f99092..9a696549514 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java index b2af47ae0f3..4be982c7bfc 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: compaction-coordinator.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfo.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfo.java index 53c75a35c49..bb2256fe673 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfo.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfo.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: client.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfoOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfoOrBuilder.java index 14f3e690e2f..6b445c45329 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfoOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfoOrBuilder.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: client.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/SecurityProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/SecurityProto.java index 900aa653cb6..b74b844a45f 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/SecurityProto.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/SecurityProto.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: security.proto diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java index 5ac1dfbf98c..729f4076c8f 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: tabletserver.proto From c5c09af06369c43da875436baf489a16197bf921 Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Sat, 13 Jul 2024 12:43:03 -0400 Subject: [PATCH 12/25] Move compactionCompleted to gRPC, share grpc connection --- .../main/proto/compaction-coordinator.proto | 60 +- core/src/main/proto/tabletserver.proto | 8 +- .../protobuf/CompactionCompletedRequest.java | 1308 +++++++++++++++++ .../CompactionCompletedRequestOrBuilder.java | 100 ++ .../CompactionCoordinatorServiceGrpc.java | 98 ++ .../CompactionCoordinatorServiceProto.java | 116 +- .../compaction/protobuf/PCompactionKind.java | 4 +- .../compaction/protobuf/PCompactionStats.java | 625 ++++++++ .../protobuf/PCompactionStatsOrBuilder.java | 46 + .../protobuf/PExternalCompactionJob.java | 88 +- .../PExternalCompactionJobOrBuilder.java | 22 +- .../core/compaction/protobuf/PInputFile.java | 22 +- .../protobuf/PInputFileOrBuilder.java | 2 +- .../compaction/protobuf/PIteratorConfig.java | 68 +- .../protobuf/PIteratorConfigOrBuilder.java | 12 +- .../compaction/protobuf/PIteratorSetting.java | 24 +- .../protobuf/PIteratorSettingOrBuilder.java | 2 +- .../compaction/protobuf/TCompactionState.java | 216 +++ .../protobuf/TCompactionStatusUpdate.java | 922 ++++++++++++ .../TCompactionStatusUpdateOrBuilder.java | 75 + .../protobuf/TabletServerProto.java | 75 +- .../compactor/CompactionJobHolder.java | 8 +- .../apache/accumulo/compactor/Compactor.java | 60 +- .../coordinator/CompactionCoordinator.java | 157 +- .../coordinator/commit/CommitCompaction.java | 4 +- .../commit/CompactionCommitData.java | 6 +- 26 files changed, 3847 insertions(+), 281 deletions(-) create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequest.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequestOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStats.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatsOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionState.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdate.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdateOrBuilder.java diff --git a/core/src/main/proto/compaction-coordinator.proto b/core/src/main/proto/compaction-coordinator.proto index 3dcb820e2e9..225bf38a48f 100644 --- a/core/src/main/proto/compaction-coordinator.proto +++ b/core/src/main/proto/compaction-coordinator.proto @@ -22,6 +22,8 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.apache.accumulo.core.compaction.protobuf"; option java_outer_classname = "CompactionCoordinatorServiceProto"; + +import "google/protobuf/empty.proto"; import "security.proto"; import "client.proto"; import "data.proto"; @@ -32,18 +34,42 @@ package compaction_coordinator; // Interface exported by the server. service CompactionCoordinatorService { + /* + * Called by Compactor on successful completion of compaction job + */ rpc GetCompactionJob(CompactionJobRequest) returns (PNextCompactionJob) {} + + /* + * Called by Compactor on successful completion of compaction job + */ + rpc CompactionCompleted(CompactionCompletedRequest) returns (google.protobuf.Empty); + +} +message CompactionJobRequest { + client.ProtoTInfo ptinfo = 1; + security.PCredentials credentials = 2; + string groupName = 3; + string compactor = 4; + string externalCompactionId = 5; +} + +message CompactionCompletedRequest { + client.ProtoTInfo ptinfo = 1; + security.PCredentials credentials = 2; + string externalCompactionId = 3; + data.PKeyExtent extent = 4; + tabletserver.PCompactionStats stats = 5; } message PExternalCompactionJob { optional string externalCompactionId = 1; optional data.PKeyExtent extent = 2; - repeated tablet_server.PInputFile files = 3; - optional tablet_server.PIteratorConfig iteratorSettings = 4; + repeated tabletserver.PInputFile files = 3; + optional tabletserver.PIteratorConfig iteratorSettings = 4; optional string outputFile = 5; optional bool propagateDeletes = 6; - optional tablet_server.PCompactionKind kind = 7; + optional tabletserver.PCompactionKind kind = 7; optional manager.PFateId fateId = 8; map overrides = 9; } @@ -53,10 +79,26 @@ message PNextCompactionJob { int32 compactorCount = 2; } -message CompactionJobRequest { - client.ProtoTInfo ptinfo = 1; - security.PCredentials credentials = 2; - string groupName = 3; - string compactor = 4; - string externalCompactionId = 5; +enum TCompactionState { + // Coordinator should set state to ASSIGNED when getCompactionJob is called by Compactor + ASSIGNED = 0; + // Compactor should set state to STARTED when compaction has successfully begun + STARTED = 1; + // Compactor can call repeatedly with an updated message to reflect percentage complete + IN_PROGRESS = 2; + // Compactor should set state to SUCCEEDED when compaction job has successfully finished + SUCCEEDED = 3; + // Compactor should set state to FAILED when compaction job fails, message should be mandatory + FAILED = 4; + // Compactor should set state to CANCELLED to acknowledge that it has stopped compacting + CANCELLED = 5; +} + +message TCompactionStatusUpdate { + TCompactionState state = 1; + string message = 2; + int64 entriesToBeCompacted = 3; + int64 entriesRead = 4; + int64 entriesWritten = 5; + int64 compactionAgeNanos = 6; } diff --git a/core/src/main/proto/tabletserver.proto b/core/src/main/proto/tabletserver.proto index a4b1f5008bf..e0879ac5527 100644 --- a/core/src/main/proto/tabletserver.proto +++ b/core/src/main/proto/tabletserver.proto @@ -23,7 +23,7 @@ option java_multiple_files = true; option java_package = "org.apache.accumulo.core.compaction.protobuf"; option java_outer_classname = "TabletServerProto"; -package tablet_server; +package tabletserver; message PInputFile { @@ -53,3 +53,9 @@ enum PCompactionKind { SYSTEM = 1; USER = 2; } + +message PCompactionStats { + int64 entriesRead = 1; + int64 entriesWritten = 2; + int64 fileSize = 3; +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequest.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequest.java new file mode 100644 index 00000000000..516c02fd5e7 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequest.java @@ -0,0 +1,1308 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.CompactionCompletedRequest} + */ +public final class CompactionCompletedRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.CompactionCompletedRequest) + CompactionCompletedRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use CompactionCompletedRequest.newBuilder() to construct. + private CompactionCompletedRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private CompactionCompletedRequest() { + externalCompactionId_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new CompactionCompletedRequest(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.Builder.class); + } + + private int bitField0_; + public static final int PTINFO_FIELD_NUMBER = 1; + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + @java.lang.Override + public boolean hasPtinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + + public static final int CREDENTIALS_FIELD_NUMBER = 2; + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + @java.lang.Override + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + /** + * .security.PCredentials credentials = 2; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + + public static final int EXTERNALCOMPACTIONID_FIELD_NUMBER = 3; + @SuppressWarnings("serial") + private volatile java.lang.Object externalCompactionId_ = ""; + /** + * string externalCompactionId = 3; + * @return The externalCompactionId. + */ + @java.lang.Override + public java.lang.String getExternalCompactionId() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + externalCompactionId_ = s; + return s; + } + } + /** + * string externalCompactionId = 3; + * @return The bytes for externalCompactionId. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getExternalCompactionIdBytes() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + externalCompactionId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int EXTENT_FIELD_NUMBER = 4; + private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_; + /** + * .data.PKeyExtent extent = 4; + * @return Whether the extent field is set. + */ + @java.lang.Override + public boolean hasExtent() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * .data.PKeyExtent extent = 4; + * @return The extent. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { + return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } + /** + * .data.PKeyExtent extent = 4; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { + return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } + + public static final int STATS_FIELD_NUMBER = 5; + private org.apache.accumulo.core.compaction.protobuf.PCompactionStats stats_; + /** + * .tabletserver.PCompactionStats stats = 5; + * @return Whether the stats field is set. + */ + @java.lang.Override + public boolean hasStats() { + return ((bitField0_ & 0x00000008) != 0); + } + /** + * .tabletserver.PCompactionStats stats = 5; + * @return The stats. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCompactionStats getStats() { + return stats_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_; + } + /** + * .tabletserver.PCompactionStats stats = 5; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder getStatsOrBuilder() { + return stats_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(1, getPtinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + output.writeMessage(2, getCredentials()); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(externalCompactionId_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, externalCompactionId_); + } + if (((bitField0_ & 0x00000004) != 0)) { + output.writeMessage(4, getExtent()); + } + if (((bitField0_ & 0x00000008) != 0)) { + output.writeMessage(5, getStats()); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getPtinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getCredentials()); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(externalCompactionId_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, externalCompactionId_); + } + if (((bitField0_ & 0x00000004) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, getExtent()); + } + if (((bitField0_ & 0x00000008) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, getStats()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest other = (org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest) obj; + + if (hasPtinfo() != other.hasPtinfo()) return false; + if (hasPtinfo()) { + if (!getPtinfo() + .equals(other.getPtinfo())) return false; + } + if (hasCredentials() != other.hasCredentials()) return false; + if (hasCredentials()) { + if (!getCredentials() + .equals(other.getCredentials())) return false; + } + if (!getExternalCompactionId() + .equals(other.getExternalCompactionId())) return false; + if (hasExtent() != other.hasExtent()) return false; + if (hasExtent()) { + if (!getExtent() + .equals(other.getExtent())) return false; + } + if (hasStats() != other.hasStats()) return false; + if (hasStats()) { + if (!getStats() + .equals(other.getStats())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPtinfo()) { + hash = (37 * hash) + PTINFO_FIELD_NUMBER; + hash = (53 * hash) + getPtinfo().hashCode(); + } + if (hasCredentials()) { + hash = (37 * hash) + CREDENTIALS_FIELD_NUMBER; + hash = (53 * hash) + getCredentials().hashCode(); + } + hash = (37 * hash) + EXTERNALCOMPACTIONID_FIELD_NUMBER; + hash = (53 * hash) + getExternalCompactionId().hashCode(); + if (hasExtent()) { + hash = (37 * hash) + EXTENT_FIELD_NUMBER; + hash = (53 * hash) + getExtent().hashCode(); + } + if (hasStats()) { + hash = (37 * hash) + STATS_FIELD_NUMBER; + hash = (53 * hash) + getStats().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.CompactionCompletedRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.CompactionCompletedRequest) + org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getPtinfoFieldBuilder(); + getCredentialsFieldBuilder(); + getExtentFieldBuilder(); + getStatsFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; + } + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + externalCompactionId_ = ""; + extent_ = null; + if (extentBuilder_ != null) { + extentBuilder_.dispose(); + extentBuilder_ = null; + } + stats_ = null; + if (statsBuilder_ != null) { + statsBuilder_.dispose(); + statsBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest build() { + org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest buildPartial() { + org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest result = new org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.ptinfo_ = ptinfoBuilder_ == null + ? ptinfo_ + : ptinfoBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.credentials_ = credentialsBuilder_ == null + ? credentials_ + : credentialsBuilder_.build(); + to_bitField0_ |= 0x00000002; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.externalCompactionId_ = externalCompactionId_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.extent_ = extentBuilder_ == null + ? extent_ + : extentBuilder_.build(); + to_bitField0_ |= 0x00000004; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.stats_ = statsBuilder_ == null + ? stats_ + : statsBuilder_.build(); + to_bitField0_ |= 0x00000008; + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest other) { + if (other == org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.getDefaultInstance()) return this; + if (other.hasPtinfo()) { + mergePtinfo(other.getPtinfo()); + } + if (other.hasCredentials()) { + mergeCredentials(other.getCredentials()); + } + if (!other.getExternalCompactionId().isEmpty()) { + externalCompactionId_ = other.externalCompactionId_; + bitField0_ |= 0x00000004; + onChanged(); + } + if (other.hasExtent()) { + mergeExtent(other.getExtent()); + } + if (other.hasStats()) { + mergeStats(other.getStats()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getPtinfoFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + input.readMessage( + getCredentialsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + externalCompactionId_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 34: { + input.readMessage( + getExtentFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000008; + break; + } // case 34 + case 42: { + input.readMessage( + getStatsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000010; + break; + } // case 42 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + public boolean hasPtinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + if (ptinfoBuilder_ == null) { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } else { + return ptinfoBuilder_.getMessage(); + } + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ptinfo_ = value; + } else { + ptinfoBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder setPtinfo( + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) { + if (ptinfoBuilder_ == null) { + ptinfo_ = builderForValue.build(); + } else { + ptinfoBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + ptinfo_ != null && + ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { + getPtinfoBuilder().mergeFrom(value); + } else { + ptinfo_ = value; + } + } else { + ptinfoBuilder_.mergeFrom(value); + } + if (ptinfo_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder clearPtinfo() { + bitField0_ = (bitField0_ & ~0x00000001); + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getPtinfoFieldBuilder().getBuilder(); + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + if (ptinfoBuilder_ != null) { + return ptinfoBuilder_.getMessageOrBuilder(); + } else { + return ptinfo_ == null ? + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> + getPtinfoFieldBuilder() { + if (ptinfoBuilder_ == null) { + ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>( + getPtinfo(), + getParentForChildren(), + isClean()); + ptinfo_ = null; + } + return ptinfoBuilder_; + } + + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + if (credentialsBuilder_ == null) { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } else { + return credentialsBuilder_.getMessage(); + } + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + credentials_ = value; + } else { + credentialsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder setCredentials( + org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) { + if (credentialsBuilder_ == null) { + credentials_ = builderForValue.build(); + } else { + credentialsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0) && + credentials_ != null && + credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) { + getCredentialsBuilder().mergeFrom(value); + } else { + credentials_ = value; + } + } else { + credentialsBuilder_.mergeFrom(value); + } + if (credentials_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder clearCredentials() { + bitField0_ = (bitField0_ & ~0x00000002); + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getCredentialsFieldBuilder().getBuilder(); + } + /** + * .security.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + if (credentialsBuilder_ != null) { + return credentialsBuilder_.getMessageOrBuilder(); + } else { + return credentials_ == null ? + org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + } + /** + * .security.PCredentials credentials = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> + getCredentialsFieldBuilder() { + if (credentialsBuilder_ == null) { + credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>( + getCredentials(), + getParentForChildren(), + isClean()); + credentials_ = null; + } + return credentialsBuilder_; + } + + private java.lang.Object externalCompactionId_ = ""; + /** + * string externalCompactionId = 3; + * @return The externalCompactionId. + */ + public java.lang.String getExternalCompactionId() { + java.lang.Object ref = externalCompactionId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + externalCompactionId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string externalCompactionId = 3; + * @return The bytes for externalCompactionId. + */ + public com.google.protobuf.ByteString + getExternalCompactionIdBytes() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + externalCompactionId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string externalCompactionId = 3; + * @param value The externalCompactionId to set. + * @return This builder for chaining. + */ + public Builder setExternalCompactionId( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + externalCompactionId_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * string externalCompactionId = 3; + * @return This builder for chaining. + */ + public Builder clearExternalCompactionId() { + externalCompactionId_ = getDefaultInstance().getExternalCompactionId(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + return this; + } + /** + * string externalCompactionId = 3; + * @param value The bytes for externalCompactionId to set. + * @return This builder for chaining. + */ + public Builder setExternalCompactionIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + externalCompactionId_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + + private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> extentBuilder_; + /** + * .data.PKeyExtent extent = 4; + * @return Whether the extent field is set. + */ + public boolean hasExtent() { + return ((bitField0_ & 0x00000008) != 0); + } + /** + * .data.PKeyExtent extent = 4; + * @return The extent. + */ + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { + if (extentBuilder_ == null) { + return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } else { + return extentBuilder_.getMessage(); + } + } + /** + * .data.PKeyExtent extent = 4; + */ + public Builder setExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) { + if (extentBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + extent_ = value; + } else { + extentBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * .data.PKeyExtent extent = 4; + */ + public Builder setExtent( + org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder builderForValue) { + if (extentBuilder_ == null) { + extent_ = builderForValue.build(); + } else { + extentBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * .data.PKeyExtent extent = 4; + */ + public Builder mergeExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) { + if (extentBuilder_ == null) { + if (((bitField0_ & 0x00000008) != 0) && + extent_ != null && + extent_ != org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance()) { + getExtentBuilder().mergeFrom(value); + } else { + extent_ = value; + } + } else { + extentBuilder_.mergeFrom(value); + } + if (extent_ != null) { + bitField0_ |= 0x00000008; + onChanged(); + } + return this; + } + /** + * .data.PKeyExtent extent = 4; + */ + public Builder clearExtent() { + bitField0_ = (bitField0_ & ~0x00000008); + extent_ = null; + if (extentBuilder_ != null) { + extentBuilder_.dispose(); + extentBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .data.PKeyExtent extent = 4; + */ + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder getExtentBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getExtentFieldBuilder().getBuilder(); + } + /** + * .data.PKeyExtent extent = 4; + */ + public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { + if (extentBuilder_ != null) { + return extentBuilder_.getMessageOrBuilder(); + } else { + return extent_ == null ? + org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } + } + /** + * .data.PKeyExtent extent = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> + getExtentFieldBuilder() { + if (extentBuilder_ == null) { + extentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder>( + getExtent(), + getParentForChildren(), + isClean()); + extent_ = null; + } + return extentBuilder_; + } + + private org.apache.accumulo.core.compaction.protobuf.PCompactionStats stats_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCompactionStats, org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder> statsBuilder_; + /** + * .tabletserver.PCompactionStats stats = 5; + * @return Whether the stats field is set. + */ + public boolean hasStats() { + return ((bitField0_ & 0x00000010) != 0); + } + /** + * .tabletserver.PCompactionStats stats = 5; + * @return The stats. + */ + public org.apache.accumulo.core.compaction.protobuf.PCompactionStats getStats() { + if (statsBuilder_ == null) { + return stats_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_; + } else { + return statsBuilder_.getMessage(); + } + } + /** + * .tabletserver.PCompactionStats stats = 5; + */ + public Builder setStats(org.apache.accumulo.core.compaction.protobuf.PCompactionStats value) { + if (statsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + stats_ = value; + } else { + statsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * .tabletserver.PCompactionStats stats = 5; + */ + public Builder setStats( + org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder builderForValue) { + if (statsBuilder_ == null) { + stats_ = builderForValue.build(); + } else { + statsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * .tabletserver.PCompactionStats stats = 5; + */ + public Builder mergeStats(org.apache.accumulo.core.compaction.protobuf.PCompactionStats value) { + if (statsBuilder_ == null) { + if (((bitField0_ & 0x00000010) != 0) && + stats_ != null && + stats_ != org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance()) { + getStatsBuilder().mergeFrom(value); + } else { + stats_ = value; + } + } else { + statsBuilder_.mergeFrom(value); + } + if (stats_ != null) { + bitField0_ |= 0x00000010; + onChanged(); + } + return this; + } + /** + * .tabletserver.PCompactionStats stats = 5; + */ + public Builder clearStats() { + bitField0_ = (bitField0_ & ~0x00000010); + stats_ = null; + if (statsBuilder_ != null) { + statsBuilder_.dispose(); + statsBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .tabletserver.PCompactionStats stats = 5; + */ + public org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder getStatsBuilder() { + bitField0_ |= 0x00000010; + onChanged(); + return getStatsFieldBuilder().getBuilder(); + } + /** + * .tabletserver.PCompactionStats stats = 5; + */ + public org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder getStatsOrBuilder() { + if (statsBuilder_ != null) { + return statsBuilder_.getMessageOrBuilder(); + } else { + return stats_ == null ? + org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_; + } + } + /** + * .tabletserver.PCompactionStats stats = 5; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCompactionStats, org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder> + getStatsFieldBuilder() { + if (statsBuilder_ == null) { + statsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCompactionStats, org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder>( + getStats(), + getParentForChildren(), + isClean()); + stats_ = null; + } + return statsBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.CompactionCompletedRequest) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.CompactionCompletedRequest) + private static final org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest(); + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public CompactionCompletedRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequestOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequestOrBuilder.java new file mode 100644 index 00000000000..420e3c2d04f --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequestOrBuilder.java @@ -0,0 +1,100 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface CompactionCompletedRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.CompactionCompletedRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + boolean hasPtinfo(); + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo(); + /** + * .client.ProtoTInfo ptinfo = 1; + */ + org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); + + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + boolean hasCredentials(); + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(); + /** + * .security.PCredentials credentials = 2; + */ + org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); + + /** + * string externalCompactionId = 3; + * @return The externalCompactionId. + */ + java.lang.String getExternalCompactionId(); + /** + * string externalCompactionId = 3; + * @return The bytes for externalCompactionId. + */ + com.google.protobuf.ByteString + getExternalCompactionIdBytes(); + + /** + * .data.PKeyExtent extent = 4; + * @return Whether the extent field is set. + */ + boolean hasExtent(); + /** + * .data.PKeyExtent extent = 4; + * @return The extent. + */ + org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent(); + /** + * .data.PKeyExtent extent = 4; + */ + org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder(); + + /** + * .tabletserver.PCompactionStats stats = 5; + * @return Whether the stats field is set. + */ + boolean hasStats(); + /** + * .tabletserver.PCompactionStats stats = 5; + * @return The stats. + */ + org.apache.accumulo.core.compaction.protobuf.PCompactionStats getStats(); + /** + * .tabletserver.PCompactionStats stats = 5; + */ + org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder getStatsOrBuilder(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java index 32d4ec857c9..0b0affb8a56 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java @@ -67,6 +67,37 @@ org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob> getGetCompactio return getGetCompactionJobMethod; } + private static volatile io.grpc.MethodDescriptor getCompactionCompletedMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "CompactionCompleted", + requestType = org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.class, + responseType = com.google.protobuf.Empty.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getCompactionCompletedMethod() { + io.grpc.MethodDescriptor getCompactionCompletedMethod; + if ((getCompactionCompletedMethod = CompactionCoordinatorServiceGrpc.getCompactionCompletedMethod) == null) { + synchronized (CompactionCoordinatorServiceGrpc.class) { + if ((getCompactionCompletedMethod = CompactionCoordinatorServiceGrpc.getCompactionCompletedMethod) == null) { + CompactionCoordinatorServiceGrpc.getCompactionCompletedMethod = getCompactionCompletedMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CompactionCompleted")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + com.google.protobuf.Empty.getDefaultInstance())) + .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("CompactionCompleted")) + .build(); + } + } + } + return getCompactionCompletedMethod; + } + /** * Creates a new async stub that supports all call types for the service */ @@ -119,11 +150,24 @@ public CompactionCoordinatorServiceFutureStub newStub(io.grpc.Channel channel, i public interface AsyncService { /** + * 
+     * Called by Compactor on successful completion of compaction job
+     *
*/ default void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetCompactionJobMethod(), responseObserver); } + + /** + * 
+     * Called by Compactor on successful completion of compaction job
+     *
+ */ + default void compactionCompleted(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCompactionCompletedMethod(), responseObserver); + } } /** @@ -160,12 +204,26 @@ protected CompactionCoordinatorServiceStub build( } /** + * 
+     * Called by Compactor on successful completion of compaction job
+     *
*/ public void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getGetCompactionJobMethod(), getCallOptions()), request, responseObserver); } + + /** + * 
+     * Called by Compactor on successful completion of compaction job
+     *
+ */ + public void compactionCompleted(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getCompactionCompletedMethod(), getCallOptions()), request, responseObserver); + } } /** @@ -188,11 +246,24 @@ protected CompactionCoordinatorServiceBlockingStub build( } /** + * 
+     * Called by Compactor on successful completion of compaction job
+     *
*/ public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetCompactionJobMethod(), getCallOptions(), request); } + + /** + * 
+     * Called by Compactor on successful completion of compaction job
+     *
+ */ + public com.google.protobuf.Empty compactionCompleted(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getCompactionCompletedMethod(), getCallOptions(), request); + } } /** @@ -215,15 +286,30 @@ protected CompactionCoordinatorServiceFutureStub build( } /** + * 
+     * Called by Compactor on successful completion of compaction job
+     *
*/ public com.google.common.util.concurrent.ListenableFuture getCompactionJob( org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getGetCompactionJobMethod(), getCallOptions()), request); } + + /** + * 
+     * Called by Compactor on successful completion of compaction job
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture compactionCompleted( + org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getCompactionCompletedMethod(), getCallOptions()), request); + } } private static final int METHODID_GET_COMPACTION_JOB = 0; + private static final int METHODID_COMPACTION_COMPLETED = 1; private static final class MethodHandlers implements io.grpc.stub.ServerCalls.UnaryMethod, @@ -246,6 +332,10 @@ public void invoke(Req request, io.grpc.stub.StreamObserver responseObserv serviceImpl.getCompactionJob((org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest) request, (io.grpc.stub.StreamObserver) responseObserver); break; + case METHODID_COMPACTION_COMPLETED: + serviceImpl.compactionCompleted((org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; default: throw new AssertionError(); } @@ -271,6 +361,13 @@ public static final io.grpc.ServerServiceDefinition bindService(AsyncService ser org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest, org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob>( service, METHODID_GET_COMPACTION_JOB))) + .addMethod( + getCompactionCompletedMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest, + com.google.protobuf.Empty>( + service, METHODID_COMPACTION_COMPLETED))) .build(); } @@ -320,6 +417,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() { serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME) .setSchemaDescriptor(new CompactionCoordinatorServiceFileDescriptorSupplier()) .addMethod(getGetCompactionJobMethod()) + .addMethod(getCompactionCompletedMethod()) .build(); } } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java index d7a0a87634e..d1b004cce63 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java @@ -33,6 +33,16 @@ public static void registerAllExtensions( registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_CompactionJobRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_CompactionCompletedRequest_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_compaction_coordinator_PExternalCompactionJob_descriptor; static final @@ -49,10 +59,10 @@ public static void registerAllExtensions( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_CompactionJobRequest_descriptor; + internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable; + internal_static_compaction_coordinator_TCompactionStatusUpdate_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -63,49 +73,78 @@ public static void registerAllExtensions( static { java.lang.String[] descriptorData = { "\n\034compaction-coordinator.proto\022\026compacti" + - "on_coordinator\032\016security.proto\032\014client.p" + - "roto\032\ndata.proto\032\022tabletserver.proto\032\rma" + - "nager.proto\"\322\004\n\026PExternalCompactionJob\022!" + - "\n\024externalCompactionId\030\001 \001(\tH\000\210\001\001\022%\n\006ext" + - "ent\030\002 \001(\0132\020.data.PKeyExtentH\001\210\001\001\022(\n\005file" + - "s\030\003 \003(\0132\031.tablet_server.PInputFile\022=\n\020it" + - "eratorSettings\030\004 \001(\0132\036.tablet_server.PIt" + - "eratorConfigH\002\210\001\001\022\027\n\noutputFile\030\005 \001(\tH\003\210" + - "\001\001\022\035\n\020propagateDeletes\030\006 \001(\010H\004\210\001\001\0221\n\004kin" + - "d\030\007 \001(\0162\036.tablet_server.PCompactionKindH" + - "\005\210\001\001\022%\n\006fateId\030\010 \001(\0132\020.manager.PFateIdH\006" + - "\210\001\001\022P\n\toverrides\030\t \003(\0132=.compaction_coor" + - "dinator.PExternalCompactionJob.Overrides" + - "Entry\0320\n\016OverridesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" + - "value\030\002 \001(\t:\0028\001B\027\n\025_externalCompactionId" + - "B\t\n\007_extentB\023\n\021_iteratorSettingsB\r\n\013_out" + - "putFileB\023\n\021_propagateDeletesB\007\n\005_kindB\t\n" + - "\007_fateId\"i\n\022PNextCompactionJob\022;\n\003job\030\001 " + - "\001(\0132..compaction_coordinator.PExternalCo" + - "mpactionJob\022\026\n\016compactorCount\030\002 \001(\005\"\253\001\n\024" + - "CompactionJobRequest\022\"\n\006ptinfo\030\001 \001(\0132\022.c" + - "lient.ProtoTInfo\022+\n\013credentials\030\002 \001(\0132\026." + - "security.PCredentials\022\021\n\tgroupName\030\003 \001(\t" + - "\022\021\n\tcompactor\030\004 \001(\t\022\034\n\024externalCompactio" + - "nId\030\005 \001(\t2\216\001\n\034CompactionCoordinatorServi" + + "on_coordinator\032\033google/protobuf/empty.pr" + + "oto\032\016security.proto\032\014client.proto\032\ndata." + + "proto\032\022tabletserver.proto\032\rmanager.proto" + + "\"\253\001\n\024CompactionJobRequest\022\"\n\006ptinfo\030\001 \001(" + + "\0132\022.client.ProtoTInfo\022+\n\013credentials\030\002 \001" + + "(\0132\026.security.PCredentials\022\021\n\tgroupName\030" + + "\003 \001(\t\022\021\n\tcompactor\030\004 \001(\t\022\034\n\024externalComp" + + "actionId\030\005 \001(\t\"\334\001\n\032CompactionCompletedRe" + + "quest\022\"\n\006ptinfo\030\001 \001(\0132\022.client.ProtoTInf" + + "o\022+\n\013credentials\030\002 \001(\0132\026.security.PCrede" + + "ntials\022\034\n\024externalCompactionId\030\003 \001(\t\022 \n\006" + + "extent\030\004 \001(\0132\020.data.PKeyExtent\022-\n\005stats\030" + + "\005 \001(\0132\036.tabletserver.PCompactionStats\"\317\004" + + "\n\026PExternalCompactionJob\022!\n\024externalComp" + + "actionId\030\001 \001(\tH\000\210\001\001\022%\n\006extent\030\002 \001(\0132\020.da" + + "ta.PKeyExtentH\001\210\001\001\022\'\n\005files\030\003 \003(\0132\030.tabl" + + "etserver.PInputFile\022<\n\020iteratorSettings\030" + + "\004 \001(\0132\035.tabletserver.PIteratorConfigH\002\210\001" + + "\001\022\027\n\noutputFile\030\005 \001(\tH\003\210\001\001\022\035\n\020propagateD" + + "eletes\030\006 \001(\010H\004\210\001\001\0220\n\004kind\030\007 \001(\0162\035.tablet" + + "server.PCompactionKindH\005\210\001\001\022%\n\006fateId\030\010 " + + "\001(\0132\020.manager.PFateIdH\006\210\001\001\022P\n\toverrides\030" + + "\t \003(\0132=.compaction_coordinator.PExternal" + + "CompactionJob.OverridesEntry\0320\n\016Override" + + "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\027" + + "\n\025_externalCompactionIdB\t\n\007_extentB\023\n\021_i" + + "teratorSettingsB\r\n\013_outputFileB\023\n\021_propa" + + "gateDeletesB\007\n\005_kindB\t\n\007_fateId\"i\n\022PNext" + + "CompactionJob\022;\n\003job\030\001 \001(\0132..compaction_" + + "coordinator.PExternalCompactionJob\022\026\n\016co" + + "mpactorCount\030\002 \001(\005\"\312\001\n\027TCompactionStatus" + + "Update\0227\n\005state\030\001 \001(\0162(.compaction_coord" + + "inator.TCompactionState\022\017\n\007message\030\002 \001(\t" + + "\022\034\n\024entriesToBeCompacted\030\003 \001(\003\022\023\n\013entrie" + + "sRead\030\004 \001(\003\022\026\n\016entriesWritten\030\005 \001(\003\022\032\n\022c" + + "ompactionAgeNanos\030\006 \001(\003*h\n\020TCompactionSt" + + "ate\022\014\n\010ASSIGNED\020\000\022\013\n\007STARTED\020\001\022\017\n\013IN_PRO" + + "GRESS\020\002\022\r\n\tSUCCEEDED\020\003\022\n\n\006FAILED\020\004\022\r\n\tCA" + + "NCELLED\020\0052\361\001\n\034CompactionCoordinatorServi" + "ce\022n\n\020GetCompactionJob\022,.compaction_coor" + "dinator.CompactionJobRequest\032*.compactio" + - "n_coordinator.PNextCompactionJob\"\000BS\n,or" + - "g.apache.accumulo.core.compaction.protob" + - "ufB!CompactionCoordinatorServiceProtoP\001b" + - "\006proto3" + "n_coordinator.PNextCompactionJob\"\000\022a\n\023Co" + + "mpactionCompleted\0222.compaction_coordinat" + + "or.CompactionCompletedRequest\032\026.google.p" + + "rotobuf.EmptyBS\n,org.apache.accumulo.cor" + + "e.compaction.protobufB!CompactionCoordin" + + "atorServiceProtoP\001b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { + com.google.protobuf.EmptyProto.getDescriptor(), org.apache.accumulo.core.compaction.protobuf.SecurityProto.getDescriptor(), org.apache.accumulo.core.compaction.protobuf.ClientProto.getDescriptor(), org.apache.accumulo.core.compaction.protobuf.DataProto.getDescriptor(), org.apache.accumulo.core.compaction.protobuf.TabletServerProto.getDescriptor(), org.apache.accumulo.core.compaction.protobuf.ManagerProto.getDescriptor(), }); - internal_static_compaction_coordinator_PExternalCompactionJob_descriptor = + internal_static_compaction_coordinator_CompactionJobRequest_descriptor = getDescriptor().getMessageTypes().get(0); + internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_CompactionJobRequest_descriptor, + new java.lang.String[] { "Ptinfo", "Credentials", "GroupName", "Compactor", "ExternalCompactionId", }); + internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_compaction_coordinator_CompactionCompletedRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor, + new java.lang.String[] { "Ptinfo", "Credentials", "ExternalCompactionId", "Extent", "Stats", }); + internal_static_compaction_coordinator_PExternalCompactionJob_descriptor = + getDescriptor().getMessageTypes().get(2); internal_static_compaction_coordinator_PExternalCompactionJob_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_compaction_coordinator_PExternalCompactionJob_descriptor, @@ -117,17 +156,18 @@ public static void registerAllExtensions( internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_descriptor, new java.lang.String[] { "Key", "Value", }); internal_static_compaction_coordinator_PNextCompactionJob_descriptor = - getDescriptor().getMessageTypes().get(1); + getDescriptor().getMessageTypes().get(3); internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_compaction_coordinator_PNextCompactionJob_descriptor, new java.lang.String[] { "Job", "CompactorCount", }); - internal_static_compaction_coordinator_CompactionJobRequest_descriptor = - getDescriptor().getMessageTypes().get(2); - internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable = new + internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor = + getDescriptor().getMessageTypes().get(4); + internal_static_compaction_coordinator_TCompactionStatusUpdate_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_CompactionJobRequest_descriptor, - new java.lang.String[] { "Ptinfo", "Credentials", "GroupName", "Compactor", "ExternalCompactionId", }); + internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor, + new java.lang.String[] { "State", "Message", "EntriesToBeCompacted", "EntriesRead", "EntriesWritten", "CompactionAgeNanos", }); + com.google.protobuf.EmptyProto.getDescriptor(); org.apache.accumulo.core.compaction.protobuf.SecurityProto.getDescriptor(); org.apache.accumulo.core.compaction.protobuf.ClientProto.getDescriptor(); org.apache.accumulo.core.compaction.protobuf.DataProto.getDescriptor(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java index b5c747bad79..eb1c7268eec 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java @@ -23,7 +23,7 @@ package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf enum {@code tablet_server.PCompactionKind} + * Protobuf enum {@code tabletserver.PCompactionKind} */ public enum PCompactionKind implements com.google.protobuf.ProtocolMessageEnum { @@ -146,6 +146,6 @@ private PCompactionKind(int value) { this.value = value; } - // @@protoc_insertion_point(enum_scope:tablet_server.PCompactionKind) + // @@protoc_insertion_point(enum_scope:tabletserver.PCompactionKind) } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStats.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStats.java new file mode 100644 index 00000000000..d248580c2c5 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStats.java @@ -0,0 +1,625 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: tabletserver.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code tabletserver.PCompactionStats} + */ +public final class PCompactionStats extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:tabletserver.PCompactionStats) + PCompactionStatsOrBuilder { +private static final long serialVersionUID = 0L; + // Use PCompactionStats.newBuilder() to construct. + private PCompactionStats(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private PCompactionStats() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new PCompactionStats(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PCompactionStats.class, org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder.class); + } + + public static final int ENTRIESREAD_FIELD_NUMBER = 1; + private long entriesRead_ = 0L; + /** + * int64 entriesRead = 1; + * @return The entriesRead. + */ + @java.lang.Override + public long getEntriesRead() { + return entriesRead_; + } + + public static final int ENTRIESWRITTEN_FIELD_NUMBER = 2; + private long entriesWritten_ = 0L; + /** + * int64 entriesWritten = 2; + * @return The entriesWritten. + */ + @java.lang.Override + public long getEntriesWritten() { + return entriesWritten_; + } + + public static final int FILESIZE_FIELD_NUMBER = 3; + private long fileSize_ = 0L; + /** + * int64 fileSize = 3; + * @return The fileSize. + */ + @java.lang.Override + public long getFileSize() { + return fileSize_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (entriesRead_ != 0L) { + output.writeInt64(1, entriesRead_); + } + if (entriesWritten_ != 0L) { + output.writeInt64(2, entriesWritten_); + } + if (fileSize_ != 0L) { + output.writeInt64(3, fileSize_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (entriesRead_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(1, entriesRead_); + } + if (entriesWritten_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(2, entriesWritten_); + } + if (fileSize_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(3, fileSize_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStats)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.PCompactionStats other = (org.apache.accumulo.core.compaction.protobuf.PCompactionStats) obj; + + if (getEntriesRead() + != other.getEntriesRead()) return false; + if (getEntriesWritten() + != other.getEntriesWritten()) return false; + if (getFileSize() + != other.getFileSize()) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ENTRIESREAD_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getEntriesRead()); + hash = (37 * hash) + ENTRIESWRITTEN_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getEntriesWritten()); + hash = (37 * hash) + FILESIZE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getFileSize()); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PCompactionStats prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code tabletserver.PCompactionStats} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:tabletserver.PCompactionStats) + org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.PCompactionStats.class, org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.PCompactionStats.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + entriesRead_ = 0L; + entriesWritten_ = 0L; + fileSize_ = 0L; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCompactionStats getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCompactionStats build() { + org.apache.accumulo.core.compaction.protobuf.PCompactionStats result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCompactionStats buildPartial() { + org.apache.accumulo.core.compaction.protobuf.PCompactionStats result = new org.apache.accumulo.core.compaction.protobuf.PCompactionStats(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PCompactionStats result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.entriesRead_ = entriesRead_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.entriesWritten_ = entriesWritten_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.fileSize_ = fileSize_; + } + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStats) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PCompactionStats)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PCompactionStats other) { + if (other == org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance()) return this; + if (other.getEntriesRead() != 0L) { + setEntriesRead(other.getEntriesRead()); + } + if (other.getEntriesWritten() != 0L) { + setEntriesWritten(other.getEntriesWritten()); + } + if (other.getFileSize() != 0L) { + setFileSize(other.getFileSize()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + entriesRead_ = input.readInt64(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 16: { + entriesWritten_ = input.readInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: { + fileSize_ = input.readInt64(); + bitField0_ |= 0x00000004; + break; + } // case 24 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private long entriesRead_ ; + /** + * int64 entriesRead = 1; + * @return The entriesRead. + */ + @java.lang.Override + public long getEntriesRead() { + return entriesRead_; + } + /** + * int64 entriesRead = 1; + * @param value The entriesRead to set. + * @return This builder for chaining. + */ + public Builder setEntriesRead(long value) { + + entriesRead_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * int64 entriesRead = 1; + * @return This builder for chaining. + */ + public Builder clearEntriesRead() { + bitField0_ = (bitField0_ & ~0x00000001); + entriesRead_ = 0L; + onChanged(); + return this; + } + + private long entriesWritten_ ; + /** + * int64 entriesWritten = 2; + * @return The entriesWritten. + */ + @java.lang.Override + public long getEntriesWritten() { + return entriesWritten_; + } + /** + * int64 entriesWritten = 2; + * @param value The entriesWritten to set. + * @return This builder for chaining. + */ + public Builder setEntriesWritten(long value) { + + entriesWritten_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * int64 entriesWritten = 2; + * @return This builder for chaining. + */ + public Builder clearEntriesWritten() { + bitField0_ = (bitField0_ & ~0x00000002); + entriesWritten_ = 0L; + onChanged(); + return this; + } + + private long fileSize_ ; + /** + * int64 fileSize = 3; + * @return The fileSize. + */ + @java.lang.Override + public long getFileSize() { + return fileSize_; + } + /** + * int64 fileSize = 3; + * @param value The fileSize to set. + * @return This builder for chaining. + */ + public Builder setFileSize(long value) { + + fileSize_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * int64 fileSize = 3; + * @return This builder for chaining. + */ + public Builder clearFileSize() { + bitField0_ = (bitField0_ & ~0x00000004); + fileSize_ = 0L; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:tabletserver.PCompactionStats) + } + + // @@protoc_insertion_point(class_scope:tabletserver.PCompactionStats) + private static final org.apache.accumulo.core.compaction.protobuf.PCompactionStats DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PCompactionStats(); + } + + public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public PCompactionStats parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCompactionStats getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatsOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatsOrBuilder.java new file mode 100644 index 00000000000..559460b1cdf --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatsOrBuilder.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: tabletserver.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface PCompactionStatsOrBuilder extends + // @@protoc_insertion_point(interface_extends:tabletserver.PCompactionStats) + com.google.protobuf.MessageOrBuilder { + + /** + * int64 entriesRead = 1; + * @return The entriesRead. + */ + long getEntriesRead(); + + /** + * int64 entriesWritten = 2; + * @return The entriesWritten. + */ + long getEntriesWritten(); + + /** + * int64 fileSize = 3; + * @return The fileSize. + */ + long getFileSize(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java index f3ae5104930..9e133547fa3 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java @@ -151,14 +151,14 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExten @SuppressWarnings("serial") private java.util.List files_; /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ @java.lang.Override public java.util.List getFilesList() { return files_; } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ @java.lang.Override public java.util.List @@ -166,21 +166,21 @@ public java.util.List g return files_; } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ @java.lang.Override public int getFilesCount() { return files_.size(); } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index) { return files_.get(index); } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder( @@ -191,7 +191,7 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFiles public static final int ITERATORSETTINGS_FIELD_NUMBER = 4; private org.apache.accumulo.core.compaction.protobuf.PIteratorConfig iteratorSettings_; /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; * @return Whether the iteratorSettings field is set. */ @java.lang.Override @@ -199,7 +199,7 @@ public boolean hasIteratorSettings() { return ((bitField0_ & 0x00000004) != 0); } /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; * @return The iteratorSettings. */ @java.lang.Override @@ -207,7 +207,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorS return iteratorSettings_ == null ? org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_; } /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder() { @@ -283,21 +283,21 @@ public boolean getPropagateDeletes() { public static final int KIND_FIELD_NUMBER = 7; private int kind_ = 0; /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @return Whether the kind field is set. */ @java.lang.Override public boolean hasKind() { return ((bitField0_ & 0x00000020) != 0); } /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @return The enum numeric value on the wire for kind. */ @java.lang.Override public int getKindValue() { return kind_; } /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @return The kind. */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind() { @@ -1298,7 +1298,7 @@ private void ensureFilesIsMutable() { org.apache.accumulo.core.compaction.protobuf.PInputFile, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder, org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder> filesBuilder_; /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public java.util.List getFilesList() { if (filesBuilder_ == null) { @@ -1308,7 +1308,7 @@ public java.util.List g } } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public int getFilesCount() { if (filesBuilder_ == null) { @@ -1318,7 +1318,7 @@ public int getFilesCount() { } } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index) { if (filesBuilder_ == null) { @@ -1328,7 +1328,7 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int inde } } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public Builder setFiles( int index, org.apache.accumulo.core.compaction.protobuf.PInputFile value) { @@ -1345,7 +1345,7 @@ public Builder setFiles( return this; } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public Builder setFiles( int index, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) { @@ -1359,7 +1359,7 @@ public Builder setFiles( return this; } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public Builder addFiles(org.apache.accumulo.core.compaction.protobuf.PInputFile value) { if (filesBuilder_ == null) { @@ -1375,7 +1375,7 @@ public Builder addFiles(org.apache.accumulo.core.compaction.protobuf.PInputFile return this; } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public Builder addFiles( int index, org.apache.accumulo.core.compaction.protobuf.PInputFile value) { @@ -1392,7 +1392,7 @@ public Builder addFiles( return this; } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public Builder addFiles( org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) { @@ -1406,7 +1406,7 @@ public Builder addFiles( return this; } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public Builder addFiles( int index, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) { @@ -1420,7 +1420,7 @@ public Builder addFiles( return this; } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public Builder addAllFiles( java.lang.Iterable values) { @@ -1435,7 +1435,7 @@ public Builder addAllFiles( return this; } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public Builder clearFiles() { if (filesBuilder_ == null) { @@ -1448,7 +1448,7 @@ public Builder clearFiles() { return this; } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public Builder removeFiles(int index) { if (filesBuilder_ == null) { @@ -1461,14 +1461,14 @@ public Builder removeFiles(int index) { return this; } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder getFilesBuilder( int index) { return getFilesFieldBuilder().getBuilder(index); } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder( int index) { @@ -1478,7 +1478,7 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFiles } } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public java.util.List getFilesOrBuilderList() { @@ -1489,14 +1489,14 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFiles } } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesBuilder() { return getFilesFieldBuilder().addBuilder( org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance()); } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesBuilder( int index) { @@ -1504,7 +1504,7 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesB index, org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance()); } /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ public java.util.List getFilesBuilderList() { @@ -1529,14 +1529,14 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesB private com.google.protobuf.SingleFieldBuilderV3< org.apache.accumulo.core.compaction.protobuf.PIteratorConfig, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder> iteratorSettingsBuilder_; /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; * @return Whether the iteratorSettings field is set. */ public boolean hasIteratorSettings() { return ((bitField0_ & 0x00000008) != 0); } /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; * @return The iteratorSettings. */ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorSettings() { @@ -1547,7 +1547,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorS } } /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; */ public Builder setIteratorSettings(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig value) { if (iteratorSettingsBuilder_ == null) { @@ -1563,7 +1563,7 @@ public Builder setIteratorSettings(org.apache.accumulo.core.compaction.protobuf. return this; } /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; */ public Builder setIteratorSettings( org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder builderForValue) { @@ -1577,7 +1577,7 @@ public Builder setIteratorSettings( return this; } /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; */ public Builder mergeIteratorSettings(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig value) { if (iteratorSettingsBuilder_ == null) { @@ -1598,7 +1598,7 @@ public Builder mergeIteratorSettings(org.apache.accumulo.core.compaction.protobu return this; } /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; */ public Builder clearIteratorSettings() { bitField0_ = (bitField0_ & ~0x00000008); @@ -1611,7 +1611,7 @@ public Builder clearIteratorSettings() { return this; } /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder getIteratorSettingsBuilder() { bitField0_ |= 0x00000008; @@ -1619,7 +1619,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder getI return getIteratorSettingsFieldBuilder().getBuilder(); } /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder() { if (iteratorSettingsBuilder_ != null) { @@ -1630,7 +1630,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder get } } /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; */ private com.google.protobuf.SingleFieldBuilderV3< org.apache.accumulo.core.compaction.protobuf.PIteratorConfig, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder> @@ -1767,21 +1767,21 @@ public Builder clearPropagateDeletes() { private int kind_ = 0; /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @return Whether the kind field is set. */ @java.lang.Override public boolean hasKind() { return ((bitField0_ & 0x00000040) != 0); } /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @return The enum numeric value on the wire for kind. */ @java.lang.Override public int getKindValue() { return kind_; } /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @param value The enum numeric value on the wire for kind to set. * @return This builder for chaining. */ @@ -1792,7 +1792,7 @@ public Builder setKindValue(int value) { return this; } /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @return The kind. */ @java.lang.Override @@ -1801,7 +1801,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind() { return result == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionKind.UNRECOGNIZED : result; } /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @param value The kind to set. * @return This builder for chaining. */ @@ -1815,7 +1815,7 @@ public Builder setKind(org.apache.accumulo.core.compaction.protobuf.PCompactionK return this; } /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @return This builder for chaining. */ public Builder clearKind() { diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java index c32b9724d26..00017d95dcb 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java @@ -59,41 +59,41 @@ public interface PExternalCompactionJobOrBuilder extends org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder(); /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ java.util.List getFilesList(); /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index); /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ int getFilesCount(); /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ java.util.List getFilesOrBuilderList(); /** - * repeated .tablet_server.PInputFile files = 3; + * repeated .tabletserver.PInputFile files = 3; */ org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder( int index); /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; * @return Whether the iteratorSettings field is set. */ boolean hasIteratorSettings(); /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; * @return The iteratorSettings. */ org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorSettings(); /** - * optional .tablet_server.PIteratorConfig iteratorSettings = 4; + * optional .tabletserver.PIteratorConfig iteratorSettings = 4; */ org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder(); @@ -126,17 +126,17 @@ org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuild boolean getPropagateDeletes(); /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @return Whether the kind field is set. */ boolean hasKind(); /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @return The enum numeric value on the wire for kind. */ int getKindValue(); /** - * optional .tablet_server.PCompactionKind kind = 7; + * optional .tabletserver.PCompactionKind kind = 7; * @return The kind. */ org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java index 4b602f86929..f9e404ec540 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java @@ -23,11 +23,11 @@ package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf type {@code tablet_server.PInputFile} + * Protobuf type {@code tabletserver.PInputFile} */ public final class PInputFile extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:tablet_server.PInputFile) + // @@protoc_insertion_point(message_implements:tabletserver.PInputFile) PInputFileOrBuilder { private static final long serialVersionUID = 0L; // Use PInputFile.newBuilder() to construct. @@ -47,13 +47,13 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PInputFile_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PInputFile_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PInputFile.class, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder.class); } @@ -333,21 +333,21 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code tablet_server.PInputFile} + * Protobuf type {@code tabletserver.PInputFile} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:tablet_server.PInputFile) + // @@protoc_insertion_point(builder_implements:tabletserver.PInputFile) org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PInputFile_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PInputFile_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PInputFile.class, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder.class); } @@ -376,7 +376,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PInputFile_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_descriptor; } @java.lang.Override @@ -743,10 +743,10 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:tablet_server.PInputFile) + // @@protoc_insertion_point(builder_scope:tabletserver.PInputFile) } - // @@protoc_insertion_point(class_scope:tablet_server.PInputFile) + // @@protoc_insertion_point(class_scope:tabletserver.PInputFile) private static final org.apache.accumulo.core.compaction.protobuf.PInputFile DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PInputFile(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java index a0e2ea778d2..796a255620e 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java @@ -23,7 +23,7 @@ package org.apache.accumulo.core.compaction.protobuf; public interface PInputFileOrBuilder extends - // @@protoc_insertion_point(interface_extends:tablet_server.PInputFile) + // @@protoc_insertion_point(interface_extends:tabletserver.PInputFile) com.google.protobuf.MessageOrBuilder { /** diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java index 5767102eec5..7c55dfb48dd 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java @@ -23,11 +23,11 @@ package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf type {@code tablet_server.PIteratorConfig} + * Protobuf type {@code tabletserver.PIteratorConfig} */ public final class PIteratorConfig extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:tablet_server.PIteratorConfig) + // @@protoc_insertion_point(message_implements:tabletserver.PIteratorConfig) PIteratorConfigOrBuilder { private static final long serialVersionUID = 0L; // Use PIteratorConfig.newBuilder() to construct. @@ -47,13 +47,13 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorConfig_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorConfig_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.class, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder.class); } @@ -62,14 +62,14 @@ protected java.lang.Object newInstance( @SuppressWarnings("serial") private java.util.List iterators_; /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ @java.lang.Override public java.util.List getIteratorsList() { return iterators_; } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ @java.lang.Override public java.util.List @@ -77,21 +77,21 @@ public java.util.Listrepeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ @java.lang.Override public int getIteratorsCount() { return iterators_.size(); } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index) { return iterators_.get(index); } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder( @@ -259,21 +259,21 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code tablet_server.PIteratorConfig} + * Protobuf type {@code tabletserver.PIteratorConfig} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:tablet_server.PIteratorConfig) + // @@protoc_insertion_point(builder_implements:tabletserver.PIteratorConfig) org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorConfig_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorConfig_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.class, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder.class); } @@ -305,7 +305,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorConfig_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_descriptor; } @java.lang.Override @@ -486,7 +486,7 @@ private void ensureIteratorsIsMutable() { org.apache.accumulo.core.compaction.protobuf.PIteratorSetting, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder> iteratorsBuilder_; /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public java.util.List getIteratorsList() { if (iteratorsBuilder_ == null) { @@ -496,7 +496,7 @@ public java.util.Listrepeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public int getIteratorsCount() { if (iteratorsBuilder_ == null) { @@ -506,7 +506,7 @@ public int getIteratorsCount() { } } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index) { if (iteratorsBuilder_ == null) { @@ -516,7 +516,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterator } } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public Builder setIterators( int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) { @@ -533,7 +533,7 @@ public Builder setIterators( return this; } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public Builder setIterators( int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) { @@ -547,7 +547,7 @@ public Builder setIterators( return this; } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public Builder addIterators(org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) { if (iteratorsBuilder_ == null) { @@ -563,7 +563,7 @@ public Builder addIterators(org.apache.accumulo.core.compaction.protobuf.PIterat return this; } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public Builder addIterators( int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) { @@ -580,7 +580,7 @@ public Builder addIterators( return this; } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public Builder addIterators( org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) { @@ -594,7 +594,7 @@ public Builder addIterators( return this; } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public Builder addIterators( int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) { @@ -608,7 +608,7 @@ public Builder addIterators( return this; } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public Builder addAllIterators( java.lang.Iterable values) { @@ -623,7 +623,7 @@ public Builder addAllIterators( return this; } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public Builder clearIterators() { if (iteratorsBuilder_ == null) { @@ -636,7 +636,7 @@ public Builder clearIterators() { return this; } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public Builder removeIterators(int index) { if (iteratorsBuilder_ == null) { @@ -649,14 +649,14 @@ public Builder removeIterators(int index) { return this; } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder getIteratorsBuilder( int index) { return getIteratorsFieldBuilder().getBuilder(index); } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder( int index) { @@ -666,7 +666,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder ge } } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public java.util.List getIteratorsOrBuilderList() { @@ -677,14 +677,14 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder ge } } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder addIteratorsBuilder() { return getIteratorsFieldBuilder().addBuilder( org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance()); } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder addIteratorsBuilder( int index) { @@ -692,7 +692,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder add index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance()); } /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ public java.util.List getIteratorsBuilderList() { @@ -725,10 +725,10 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:tablet_server.PIteratorConfig) + // @@protoc_insertion_point(builder_scope:tabletserver.PIteratorConfig) } - // @@protoc_insertion_point(class_scope:tablet_server.PIteratorConfig) + // @@protoc_insertion_point(class_scope:tabletserver.PIteratorConfig) private static final org.apache.accumulo.core.compaction.protobuf.PIteratorConfig DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PIteratorConfig(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java index 47680dff60d..ed0490419bd 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java @@ -23,29 +23,29 @@ package org.apache.accumulo.core.compaction.protobuf; public interface PIteratorConfigOrBuilder extends - // @@protoc_insertion_point(interface_extends:tablet_server.PIteratorConfig) + // @@protoc_insertion_point(interface_extends:tabletserver.PIteratorConfig) com.google.protobuf.MessageOrBuilder { /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ java.util.List getIteratorsList(); /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index); /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ int getIteratorsCount(); /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ java.util.List getIteratorsOrBuilderList(); /** - * repeated .tablet_server.PIteratorSetting iterators = 1; + * repeated .tabletserver.PIteratorSetting iterators = 1; */ org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder( int index); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java index 055e1465d7a..2cbddc8bdbc 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java @@ -23,11 +23,11 @@ package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf type {@code tablet_server.PIteratorSetting} + * Protobuf type {@code tabletserver.PIteratorSetting} */ public final class PIteratorSetting extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:tablet_server.PIteratorSetting) + // @@protoc_insertion_point(message_implements:tabletserver.PIteratorSetting) PIteratorSettingOrBuilder { private static final long serialVersionUID = 0L; // Use PIteratorSetting.newBuilder() to construct. @@ -48,7 +48,7 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_descriptor; } @SuppressWarnings({"rawtypes"}) @@ -66,7 +66,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.class, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder.class); } @@ -166,7 +166,7 @@ private static final class PropertiesDefaultEntryHolder { java.lang.String, java.lang.String> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_PropertiesEntry_descriptor, + org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_PropertiesEntry_descriptor, com.google.protobuf.WireFormat.FieldType.STRING, "", com.google.protobuf.WireFormat.FieldType.STRING, @@ -439,15 +439,15 @@ protected Builder newBuilderForType( return builder; } /** - * Protobuf type {@code tablet_server.PIteratorSetting} + * Protobuf type {@code tabletserver.PIteratorSetting} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:tablet_server.PIteratorSetting) + // @@protoc_insertion_point(builder_implements:tabletserver.PIteratorSetting) org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_descriptor; } @SuppressWarnings({"rawtypes"}) @@ -475,7 +475,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_fieldAccessorTable + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.class, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder.class); } @@ -504,7 +504,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tablet_server_PIteratorSetting_descriptor; + return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_descriptor; } @java.lang.Override @@ -988,10 +988,10 @@ public final Builder mergeUnknownFields( } - // @@protoc_insertion_point(builder_scope:tablet_server.PIteratorSetting) + // @@protoc_insertion_point(builder_scope:tabletserver.PIteratorSetting) } - // @@protoc_insertion_point(class_scope:tablet_server.PIteratorSetting) + // @@protoc_insertion_point(class_scope:tabletserver.PIteratorSetting) private static final org.apache.accumulo.core.compaction.protobuf.PIteratorSetting DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PIteratorSetting(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java index ffee250a489..d91814cf2fb 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java @@ -23,7 +23,7 @@ package org.apache.accumulo.core.compaction.protobuf; public interface PIteratorSettingOrBuilder extends - // @@protoc_insertion_point(interface_extends:tablet_server.PIteratorSetting) + // @@protoc_insertion_point(interface_extends:tabletserver.PIteratorSetting) com.google.protobuf.MessageOrBuilder { /** diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionState.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionState.java new file mode 100644 index 00000000000..c1d414a1a6d --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionState.java @@ -0,0 +1,216 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf enum {@code compaction_coordinator.TCompactionState} + */ +public enum TCompactionState + implements com.google.protobuf.ProtocolMessageEnum { + /** + * 
+   * Coordinator should set state to ASSIGNED when getCompactionJob is called by Compactor
+   *
+ * + * ASSIGNED = 0; + */ + ASSIGNED(0), + /** + * 
+   * Compactor should set state to STARTED when compaction has successfully begun
+   *
+ * + * STARTED = 1; + */ + STARTED(1), + /** + * 
+   * Compactor can call repeatedly with an updated message to reflect percentage complete
+   *
+ * + * IN_PROGRESS = 2; + */ + IN_PROGRESS(2), + /** + * 
+   * Compactor should set state to SUCCEEDED when compaction job has successfully finished
+   *
+ * + * SUCCEEDED = 3; + */ + SUCCEEDED(3), + /** + * 
+   * Compactor should set state to FAILED when compaction job fails, message should be mandatory
+   *
+ * + * FAILED = 4; + */ + FAILED(4), + /** + * 
+   * Compactor should set state to CANCELLED to acknowledge that it has stopped compacting
+   *
+ * + * CANCELLED = 5; + */ + CANCELLED(5), + UNRECOGNIZED(-1), + ; + + /** + * 
+   * Coordinator should set state to ASSIGNED when getCompactionJob is called by Compactor
+   *
+ * + * ASSIGNED = 0; + */ + public static final int ASSIGNED_VALUE = 0; + /** + * 
+   * Compactor should set state to STARTED when compaction has successfully begun
+   *
+ * + * STARTED = 1; + */ + public static final int STARTED_VALUE = 1; + /** + * 
+   * Compactor can call repeatedly with an updated message to reflect percentage complete
+   *
+ * + * IN_PROGRESS = 2; + */ + public static final int IN_PROGRESS_VALUE = 2; + /** + * 
+   * Compactor should set state to SUCCEEDED when compaction job has successfully finished
+   *
+ * + * SUCCEEDED = 3; + */ + public static final int SUCCEEDED_VALUE = 3; + /** + * 
+   * Compactor should set state to FAILED when compaction job fails, message should be mandatory
+   *
+ * + * FAILED = 4; + */ + public static final int FAILED_VALUE = 4; + /** + * 
+   * Compactor should set state to CANCELLED to acknowledge that it has stopped compacting
+   *
+ * + * CANCELLED = 5; + */ + public static final int CANCELLED_VALUE = 5; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static TCompactionState valueOf(int value) { + return forNumber(value); + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + */ + public static TCompactionState forNumber(int value) { + switch (value) { + case 0: return ASSIGNED; + case 1: return STARTED; + case 2: return IN_PROGRESS; + case 3: return SUCCEEDED; + case 4: return FAILED; + case 5: return CANCELLED; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + TCompactionState> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public TCompactionState findValueByNumber(int number) { + return TCompactionState.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.getDescriptor().getEnumTypes().get(0); + } + + private static final TCompactionState[] VALUES = values(); + + public static TCompactionState valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private TCompactionState(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:compaction_coordinator.TCompactionState) +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdate.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdate.java new file mode 100644 index 00000000000..9942af499dc --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdate.java @@ -0,0 +1,922 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.TCompactionStatusUpdate} + */ +public final class TCompactionStatusUpdate extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.TCompactionStatusUpdate) + TCompactionStatusUpdateOrBuilder { +private static final long serialVersionUID = 0L; + // Use TCompactionStatusUpdate.newBuilder() to construct. + private TCompactionStatusUpdate(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private TCompactionStatusUpdate() { + state_ = 0; + message_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new TCompactionStatusUpdate(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_TCompactionStatusUpdate_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.class, org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.Builder.class); + } + + public static final int STATE_FIELD_NUMBER = 1; + private int state_ = 0; + /** + * .compaction_coordinator.TCompactionState state = 1; + * @return The enum numeric value on the wire for state. + */ + @java.lang.Override public int getStateValue() { + return state_; + } + /** + * .compaction_coordinator.TCompactionState state = 1; + * @return The state. + */ + @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.TCompactionState getState() { + org.apache.accumulo.core.compaction.protobuf.TCompactionState result = org.apache.accumulo.core.compaction.protobuf.TCompactionState.forNumber(state_); + return result == null ? org.apache.accumulo.core.compaction.protobuf.TCompactionState.UNRECOGNIZED : result; + } + + public static final int MESSAGE_FIELD_NUMBER = 2; + @SuppressWarnings("serial") + private volatile java.lang.Object message_ = ""; + /** + * string message = 2; + * @return The message. + */ + @java.lang.Override + public java.lang.String getMessage() { + java.lang.Object ref = message_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + message_ = s; + return s; + } + } + /** + * string message = 2; + * @return The bytes for message. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getMessageBytes() { + java.lang.Object ref = message_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + message_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int ENTRIESTOBECOMPACTED_FIELD_NUMBER = 3; + private long entriesToBeCompacted_ = 0L; + /** + * int64 entriesToBeCompacted = 3; + * @return The entriesToBeCompacted. + */ + @java.lang.Override + public long getEntriesToBeCompacted() { + return entriesToBeCompacted_; + } + + public static final int ENTRIESREAD_FIELD_NUMBER = 4; + private long entriesRead_ = 0L; + /** + * int64 entriesRead = 4; + * @return The entriesRead. + */ + @java.lang.Override + public long getEntriesRead() { + return entriesRead_; + } + + public static final int ENTRIESWRITTEN_FIELD_NUMBER = 5; + private long entriesWritten_ = 0L; + /** + * int64 entriesWritten = 5; + * @return The entriesWritten. + */ + @java.lang.Override + public long getEntriesWritten() { + return entriesWritten_; + } + + public static final int COMPACTIONAGENANOS_FIELD_NUMBER = 6; + private long compactionAgeNanos_ = 0L; + /** + * int64 compactionAgeNanos = 6; + * @return The compactionAgeNanos. + */ + @java.lang.Override + public long getCompactionAgeNanos() { + return compactionAgeNanos_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (state_ != org.apache.accumulo.core.compaction.protobuf.TCompactionState.ASSIGNED.getNumber()) { + output.writeEnum(1, state_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, message_); + } + if (entriesToBeCompacted_ != 0L) { + output.writeInt64(3, entriesToBeCompacted_); + } + if (entriesRead_ != 0L) { + output.writeInt64(4, entriesRead_); + } + if (entriesWritten_ != 0L) { + output.writeInt64(5, entriesWritten_); + } + if (compactionAgeNanos_ != 0L) { + output.writeInt64(6, compactionAgeNanos_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (state_ != org.apache.accumulo.core.compaction.protobuf.TCompactionState.ASSIGNED.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(1, state_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, message_); + } + if (entriesToBeCompacted_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(3, entriesToBeCompacted_); + } + if (entriesRead_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(4, entriesRead_); + } + if (entriesWritten_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(5, entriesWritten_); + } + if (compactionAgeNanos_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(6, compactionAgeNanos_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate other = (org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate) obj; + + if (state_ != other.state_) return false; + if (!getMessage() + .equals(other.getMessage())) return false; + if (getEntriesToBeCompacted() + != other.getEntriesToBeCompacted()) return false; + if (getEntriesRead() + != other.getEntriesRead()) return false; + if (getEntriesWritten() + != other.getEntriesWritten()) return false; + if (getCompactionAgeNanos() + != other.getCompactionAgeNanos()) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + STATE_FIELD_NUMBER; + hash = (53 * hash) + state_; + hash = (37 * hash) + MESSAGE_FIELD_NUMBER; + hash = (53 * hash) + getMessage().hashCode(); + hash = (37 * hash) + ENTRIESTOBECOMPACTED_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getEntriesToBeCompacted()); + hash = (37 * hash) + ENTRIESREAD_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getEntriesRead()); + hash = (37 * hash) + ENTRIESWRITTEN_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getEntriesWritten()); + hash = (37 * hash) + COMPACTIONAGENANOS_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getCompactionAgeNanos()); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.TCompactionStatusUpdate} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.TCompactionStatusUpdate) + org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdateOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_TCompactionStatusUpdate_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.class, org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + state_ = 0; + message_ = ""; + entriesToBeCompacted_ = 0L; + entriesRead_ = 0L; + entriesWritten_ = 0L; + compactionAgeNanos_ = 0L; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate build() { + org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate buildPartial() { + org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate result = new org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.state_ = state_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.message_ = message_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.entriesToBeCompacted_ = entriesToBeCompacted_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.entriesRead_ = entriesRead_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.entriesWritten_ = entriesWritten_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.compactionAgeNanos_ = compactionAgeNanos_; + } + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate other) { + if (other == org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.getDefaultInstance()) return this; + if (other.state_ != 0) { + setStateValue(other.getStateValue()); + } + if (!other.getMessage().isEmpty()) { + message_ = other.message_; + bitField0_ |= 0x00000002; + onChanged(); + } + if (other.getEntriesToBeCompacted() != 0L) { + setEntriesToBeCompacted(other.getEntriesToBeCompacted()); + } + if (other.getEntriesRead() != 0L) { + setEntriesRead(other.getEntriesRead()); + } + if (other.getEntriesWritten() != 0L) { + setEntriesWritten(other.getEntriesWritten()); + } + if (other.getCompactionAgeNanos() != 0L) { + setCompactionAgeNanos(other.getCompactionAgeNanos()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + state_ = input.readEnum(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 18: { + message_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 24: { + entriesToBeCompacted_ = input.readInt64(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 32: { + entriesRead_ = input.readInt64(); + bitField0_ |= 0x00000008; + break; + } // case 32 + case 40: { + entriesWritten_ = input.readInt64(); + bitField0_ |= 0x00000010; + break; + } // case 40 + case 48: { + compactionAgeNanos_ = input.readInt64(); + bitField0_ |= 0x00000020; + break; + } // case 48 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private int state_ = 0; + /** + * .compaction_coordinator.TCompactionState state = 1; + * @return The enum numeric value on the wire for state. + */ + @java.lang.Override public int getStateValue() { + return state_; + } + /** + * .compaction_coordinator.TCompactionState state = 1; + * @param value The enum numeric value on the wire for state to set. + * @return This builder for chaining. + */ + public Builder setStateValue(int value) { + state_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .compaction_coordinator.TCompactionState state = 1; + * @return The state. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.TCompactionState getState() { + org.apache.accumulo.core.compaction.protobuf.TCompactionState result = org.apache.accumulo.core.compaction.protobuf.TCompactionState.forNumber(state_); + return result == null ? org.apache.accumulo.core.compaction.protobuf.TCompactionState.UNRECOGNIZED : result; + } + /** + * .compaction_coordinator.TCompactionState state = 1; + * @param value The state to set. + * @return This builder for chaining. + */ + public Builder setState(org.apache.accumulo.core.compaction.protobuf.TCompactionState value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + state_ = value.getNumber(); + onChanged(); + return this; + } + /** + * .compaction_coordinator.TCompactionState state = 1; + * @return This builder for chaining. + */ + public Builder clearState() { + bitField0_ = (bitField0_ & ~0x00000001); + state_ = 0; + onChanged(); + return this; + } + + private java.lang.Object message_ = ""; + /** + * string message = 2; + * @return The message. + */ + public java.lang.String getMessage() { + java.lang.Object ref = message_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + message_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string message = 2; + * @return The bytes for message. + */ + public com.google.protobuf.ByteString + getMessageBytes() { + java.lang.Object ref = message_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + message_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string message = 2; + * @param value The message to set. + * @return This builder for chaining. + */ + public Builder setMessage( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + message_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * string message = 2; + * @return This builder for chaining. + */ + public Builder clearMessage() { + message_ = getDefaultInstance().getMessage(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + * string message = 2; + * @param value The bytes for message to set. + * @return This builder for chaining. + */ + public Builder setMessageBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + message_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + + private long entriesToBeCompacted_ ; + /** + * int64 entriesToBeCompacted = 3; + * @return The entriesToBeCompacted. + */ + @java.lang.Override + public long getEntriesToBeCompacted() { + return entriesToBeCompacted_; + } + /** + * int64 entriesToBeCompacted = 3; + * @param value The entriesToBeCompacted to set. + * @return This builder for chaining. + */ + public Builder setEntriesToBeCompacted(long value) { + + entriesToBeCompacted_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * int64 entriesToBeCompacted = 3; + * @return This builder for chaining. + */ + public Builder clearEntriesToBeCompacted() { + bitField0_ = (bitField0_ & ~0x00000004); + entriesToBeCompacted_ = 0L; + onChanged(); + return this; + } + + private long entriesRead_ ; + /** + * int64 entriesRead = 4; + * @return The entriesRead. + */ + @java.lang.Override + public long getEntriesRead() { + return entriesRead_; + } + /** + * int64 entriesRead = 4; + * @param value The entriesRead to set. + * @return This builder for chaining. + */ + public Builder setEntriesRead(long value) { + + entriesRead_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * int64 entriesRead = 4; + * @return This builder for chaining. + */ + public Builder clearEntriesRead() { + bitField0_ = (bitField0_ & ~0x00000008); + entriesRead_ = 0L; + onChanged(); + return this; + } + + private long entriesWritten_ ; + /** + * int64 entriesWritten = 5; + * @return The entriesWritten. + */ + @java.lang.Override + public long getEntriesWritten() { + return entriesWritten_; + } + /** + * int64 entriesWritten = 5; + * @param value The entriesWritten to set. + * @return This builder for chaining. + */ + public Builder setEntriesWritten(long value) { + + entriesWritten_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * int64 entriesWritten = 5; + * @return This builder for chaining. + */ + public Builder clearEntriesWritten() { + bitField0_ = (bitField0_ & ~0x00000010); + entriesWritten_ = 0L; + onChanged(); + return this; + } + + private long compactionAgeNanos_ ; + /** + * int64 compactionAgeNanos = 6; + * @return The compactionAgeNanos. + */ + @java.lang.Override + public long getCompactionAgeNanos() { + return compactionAgeNanos_; + } + /** + * int64 compactionAgeNanos = 6; + * @param value The compactionAgeNanos to set. + * @return This builder for chaining. + */ + public Builder setCompactionAgeNanos(long value) { + + compactionAgeNanos_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + /** + * int64 compactionAgeNanos = 6; + * @return This builder for chaining. + */ + public Builder clearCompactionAgeNanos() { + bitField0_ = (bitField0_ & ~0x00000020); + compactionAgeNanos_ = 0L; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.TCompactionStatusUpdate) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.TCompactionStatusUpdate) + private static final org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate(); + } + + public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public TCompactionStatusUpdate parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdateOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdateOrBuilder.java new file mode 100644 index 00000000000..884784bd30b --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdateOrBuilder.java @@ -0,0 +1,75 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface TCompactionStatusUpdateOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.TCompactionStatusUpdate) + com.google.protobuf.MessageOrBuilder { + + /** + * .compaction_coordinator.TCompactionState state = 1; + * @return The enum numeric value on the wire for state. + */ + int getStateValue(); + /** + * .compaction_coordinator.TCompactionState state = 1; + * @return The state. + */ + org.apache.accumulo.core.compaction.protobuf.TCompactionState getState(); + + /** + * string message = 2; + * @return The message. + */ + java.lang.String getMessage(); + /** + * string message = 2; + * @return The bytes for message. + */ + com.google.protobuf.ByteString + getMessageBytes(); + + /** + * int64 entriesToBeCompacted = 3; + * @return The entriesToBeCompacted. + */ + long getEntriesToBeCompacted(); + + /** + * int64 entriesRead = 4; + * @return The entriesRead. + */ + long getEntriesRead(); + + /** + * int64 entriesWritten = 5; + * @return The entriesWritten. + */ + long getEntriesWritten(); + + /** + * int64 compactionAgeNanos = 6; + * @return The compactionAgeNanos. + */ + long getCompactionAgeNanos(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java index 729f4076c8f..4c87b498209 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java @@ -34,25 +34,30 @@ public static void registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } static final com.google.protobuf.Descriptors.Descriptor - internal_static_tablet_server_PInputFile_descriptor; + internal_static_tabletserver_PInputFile_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_tablet_server_PInputFile_fieldAccessorTable; + internal_static_tabletserver_PInputFile_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor - internal_static_tablet_server_PIteratorSetting_descriptor; + internal_static_tabletserver_PIteratorSetting_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_tablet_server_PIteratorSetting_fieldAccessorTable; + internal_static_tabletserver_PIteratorSetting_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor - internal_static_tablet_server_PIteratorSetting_PropertiesEntry_descriptor; + internal_static_tabletserver_PIteratorSetting_PropertiesEntry_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_tablet_server_PIteratorSetting_PropertiesEntry_fieldAccessorTable; + internal_static_tabletserver_PIteratorSetting_PropertiesEntry_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor - internal_static_tablet_server_PIteratorConfig_descriptor; + internal_static_tabletserver_PIteratorConfig_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_tablet_server_PIteratorConfig_fieldAccessorTable; + internal_static_tabletserver_PIteratorConfig_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_tabletserver_PCompactionStats_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_tabletserver_PCompactionStats_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -62,16 +67,18 @@ public static void registerAllExtensions( descriptor; static { java.lang.String[] descriptorData = { - "\n\022tabletserver.proto\022\rtablet_server\"Y\n\nP" + - "InputFile\022\031\n\021metadataFileEntry\030\001 \001(\t\022\014\n\004" + - "size\030\002 \001(\003\022\017\n\007entries\030\003 \001(\003\022\021\n\ttimestamp" + - "\030\004 \001(\003\"\301\001\n\020PIteratorSetting\022\020\n\010priority\030" + - "\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\025\n\riteratorClass\030\003 \001" + - "(\t\022C\n\nproperties\030\004 \003(\0132/.tablet_server.P" + - "IteratorSetting.PropertiesEntry\0321\n\017Prope" + - "rtiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\002" + - "8\001\"E\n\017PIteratorConfig\0222\n\titerators\030\001 \003(\013" + - "2\037.tablet_server.PIteratorSetting*4\n\017PCo" + + "\n\022tabletserver.proto\022\014tabletserver\"Y\n\nPI" + + "nputFile\022\031\n\021metadataFileEntry\030\001 \001(\t\022\014\n\004s" + + "ize\030\002 \001(\003\022\017\n\007entries\030\003 \001(\003\022\021\n\ttimestamp\030" + + "\004 \001(\003\"\300\001\n\020PIteratorSetting\022\020\n\010priority\030\001" + + " \001(\005\022\014\n\004name\030\002 \001(\t\022\025\n\riteratorClass\030\003 \001(" + + "\t\022B\n\nproperties\030\004 \003(\0132..tabletserver.PIt" + + "eratorSetting.PropertiesEntry\0321\n\017Propert" + + "iesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001" + + "\"D\n\017PIteratorConfig\0221\n\titerators\030\001 \003(\0132\036" + + ".tabletserver.PIteratorSetting\"Q\n\020PCompa" + + "ctionStats\022\023\n\013entriesRead\030\001 \001(\003\022\026\n\016entri" + + "esWritten\030\002 \001(\003\022\020\n\010fileSize\030\003 \001(\003*4\n\017PCo" + "mpactionKind\022\013\n\007UNKNOWN\020\000\022\n\n\006SYSTEM\020\001\022\010\n" + "\004USER\020\002BC\n,org.apache.accumulo.core.comp" + "action.protobufB\021TabletServerProtoP\001b\006pr" + @@ -81,30 +88,36 @@ public static void registerAllExtensions( .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { }); - internal_static_tablet_server_PInputFile_descriptor = + internal_static_tabletserver_PInputFile_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_tablet_server_PInputFile_fieldAccessorTable = new + internal_static_tabletserver_PInputFile_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_tablet_server_PInputFile_descriptor, + internal_static_tabletserver_PInputFile_descriptor, new java.lang.String[] { "MetadataFileEntry", "Size", "Entries", "Timestamp", }); - internal_static_tablet_server_PIteratorSetting_descriptor = + internal_static_tabletserver_PIteratorSetting_descriptor = getDescriptor().getMessageTypes().get(1); - internal_static_tablet_server_PIteratorSetting_fieldAccessorTable = new + internal_static_tabletserver_PIteratorSetting_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_tablet_server_PIteratorSetting_descriptor, + internal_static_tabletserver_PIteratorSetting_descriptor, new java.lang.String[] { "Priority", "Name", "IteratorClass", "Properties", }); - internal_static_tablet_server_PIteratorSetting_PropertiesEntry_descriptor = - internal_static_tablet_server_PIteratorSetting_descriptor.getNestedTypes().get(0); - internal_static_tablet_server_PIteratorSetting_PropertiesEntry_fieldAccessorTable = new + internal_static_tabletserver_PIteratorSetting_PropertiesEntry_descriptor = + internal_static_tabletserver_PIteratorSetting_descriptor.getNestedTypes().get(0); + internal_static_tabletserver_PIteratorSetting_PropertiesEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_tablet_server_PIteratorSetting_PropertiesEntry_descriptor, + internal_static_tabletserver_PIteratorSetting_PropertiesEntry_descriptor, new java.lang.String[] { "Key", "Value", }); - internal_static_tablet_server_PIteratorConfig_descriptor = + internal_static_tabletserver_PIteratorConfig_descriptor = getDescriptor().getMessageTypes().get(2); - internal_static_tablet_server_PIteratorConfig_fieldAccessorTable = new + internal_static_tabletserver_PIteratorConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_tablet_server_PIteratorConfig_descriptor, + internal_static_tabletserver_PIteratorConfig_descriptor, new java.lang.String[] { "Iterators", }); + internal_static_tabletserver_PCompactionStats_descriptor = + getDescriptor().getMessageTypes().get(3); + internal_static_tabletserver_PCompactionStats_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_tabletserver_PCompactionStats_descriptor, + new java.lang.String[] { "EntriesRead", "EntriesWritten", "FileSize", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java index 796cec1abec..25a151803d1 100644 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java @@ -21,10 +21,10 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; +import org.apache.accumulo.core.compaction.protobuf.PCompactionStats; import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob; import org.apache.accumulo.core.data.TableId; import org.apache.accumulo.core.dataImpl.KeyExtent; -import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; import org.apache.accumulo.server.compaction.FileCompactor; public class CompactionJobHolder { @@ -33,7 +33,7 @@ public class CompactionJobHolder { private Thread compactionThread; private AtomicReference compactor; private volatile boolean cancelled = false; - private volatile TCompactionStats stats = null; + private volatile PCompactionStats stats = null; CompactionJobHolder() {} @@ -54,11 +54,11 @@ public TableId getTableId() { return KeyExtent.fromProtobuf(pKeyExtent).tableId(); } - public TCompactionStats getStats() { + public PCompactionStats getStats() { return stats; } - public void setStats(TCompactionStats stats) { + public void setStats(PCompactionStats stats) { this.stats = stats; } diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java index 68fea886796..a1212925879 100644 --- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java +++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java @@ -51,10 +51,12 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType; import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException; import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException; +import org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest; import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc; import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceBlockingStub; import org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest; import org.apache.accumulo.core.compaction.protobuf.PCompactionKind; +import org.apache.accumulo.core.compaction.protobuf.PCompactionStats; import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob; import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob; import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService; @@ -97,7 +99,6 @@ import org.apache.accumulo.core.securityImpl.thrift.TCredentials; import org.apache.accumulo.core.spi.crypto.CryptoService; import org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction; -import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob; import org.apache.accumulo.core.trace.TraceUtil; import org.apache.accumulo.core.util.Halt; @@ -130,6 +131,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.github.benmanes.caffeine.cache.Caffeine; +import com.github.benmanes.caffeine.cache.LoadingCache; +import com.github.benmanes.caffeine.cache.RemovalListener; import com.google.common.base.Preconditions; import com.google.common.net.HostAndPort; @@ -172,8 +176,27 @@ public interface FileCompactorRunnable extends Runnable { private final AtomicBoolean compactionRunning = new AtomicBoolean(false); + private final LoadingCache grpcChannel; + protected Compactor(ConfigOpts opts, String[] args) { super("compactor", opts, ServerContext::new, args); + + // TODO: We are just sharing a single ManagedChannel for all RPC requests to the same + // coordinator + // We need to look into pooling to see if that is necessary with gRPC or if ManagedChannel can + // handle + // multiple connections using ManagedChannelBuilder or NettyChannelBuilder + this.grpcChannel = Caffeine.newBuilder() + .expireAfterAccess(getContext().getClientTimeoutInMillis(), TimeUnit.MILLISECONDS) + .removalListener((RemovalListener) (key, value, cause) -> { + if (value != null) { + value.shutdownNow(); + } + }) + // TODO: replace hardcoded port + .build(host -> ManagedChannelBuilder.forAddress(host, 8980) + .idleTimeout(getContext().getClientTimeoutInMillis(), TimeUnit.MILLISECONDS) + .usePlaintext().build()); } @Override @@ -215,6 +238,7 @@ protected void checkIfCanceled() { if (job != null) { try { var extent = KeyExtent.fromProtobuf(job.getExtent()); + var ecid = ExternalCompactionId.of(job.getExternalCompactionId()); TabletMetadata tabletMeta = @@ -441,20 +465,24 @@ protected void updateCompactionFailed(PExternalCompactionJob job) * @param stats compaction stats * @throws RetriesExceededException thrown when retries have been exceeded */ - protected void updateCompactionCompleted(PExternalCompactionJob job, TCompactionStats stats) + protected void updateCompactionCompleted(PExternalCompactionJob job, PCompactionStats stats) throws RetriesExceededException { - RetryableRpcCall thriftCall = + RetryableRpcCall rpcCall = new RetryableRpcCall<>(1000, RetryableRpcCall.MAX_WAIT_TIME, 25, () -> { - Client coordinatorClient = getCoordinatorClient(); + var coordinatorClient = getGrpcCoordinatorClient(); try { - coordinatorClient.compactionCompleted(TraceUtil.traceInfo(), getContext().rpcCreds(), - job.getExternalCompactionId(), convert(job.getExtent()), stats); + LOG.info("Job: {}", job.getExtent()); + var ignored = + coordinatorClient.compactionCompleted(CompactionCompletedRequest.newBuilder() + .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(getContext().gRpcCreds()) + .setExternalCompactionId(job.getExternalCompactionId()) + .setExtent(job.getExtent()).setStats(stats).build()); return ""; } finally { - ThriftUtil.returnClient(coordinatorClient, getContext()); + // TODO: Channel is currently cached and shared, look into using pooling } }); - thriftCall.run(); + rpcCall.run(); } /** @@ -493,9 +521,7 @@ protected PNextCompactionJob getNextJob(Supplier uuid) throws RetriesExcee currentCompactionId.set(null); throw e; } finally { - // TODO: We'd likely want to re-use channels in pool like we do with thrift - ManagedChannel managedChannel = (ManagedChannel) grpcClient.getChannel(); - managedChannel.shutdown(); + // TODO: Channel is currently cached and shared, look into using pooling } }); return nextJobRpcCall.run(); @@ -523,10 +549,8 @@ protected CompactionCoordinatorServiceBlockingStub getGrpcCoordinatorClient() if (coordinatorHost.isEmpty()) { throw new TTransportException("Unable to get CompactionCoordinator address from ZooKeeper"); } - // TODO: The port is just hardcoded for now and will need to be configurable - ManagedChannel channel = ManagedChannelBuilder - .forAddress(coordinatorHost.orElseThrow().getHost(), 8980).usePlaintext().build(); - return CompactionCoordinatorServiceGrpc.newBlockingStub(channel); + return CompactionCoordinatorServiceGrpc + .newBlockingStub(grpcChannel.get(coordinatorHost.orElseThrow().getHost())); } /** @@ -616,10 +640,8 @@ public void run() { started.countDown(); org.apache.accumulo.server.compaction.CompactionStats stat = compactor.get().call(); - TCompactionStats cs = new TCompactionStats(); - cs.setEntriesRead(stat.getEntriesRead()); - cs.setEntriesWritten(stat.getEntriesWritten()); - cs.setFileSize(stat.getFileSize()); + PCompactionStats cs = PCompactionStats.newBuilder().setEntriesRead(stat.getEntriesRead()) + .setEntriesWritten(stat.getEntriesWritten()).setFileSize(stat.getFileSize()).build(); JOB_HOLDER.setStats(cs); LOG.info("Compaction completed successfully {} ", job.getExternalCompactionId()); diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java index 13cba7f27b7..744879abd40 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java @@ -66,6 +66,7 @@ import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType; import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException; import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException; +import org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest; import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc; import org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest; import org.apache.accumulo.core.compaction.protobuf.PCompactionKind; @@ -146,6 +147,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.google.common.net.HostAndPort; +import com.google.protobuf.Empty; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -750,58 +752,7 @@ private Optional getCompactionConfig(CompactionJobQueues.MetaJ public void compactionCompleted(TInfo tinfo, TCredentials credentials, String externalCompactionId, TKeyExtent textent, TCompactionStats stats) throws ThriftSecurityException { - // do not expect users to call this directly, expect other tservers to call this method - if (!security.canPerformSystemActions(credentials)) { - throw new AccumuloSecurityException(credentials.getPrincipal(), - SecurityErrorCode.PERMISSION_DENIED).asThriftException(); - } - - // maybe fate has not started yet - var localFates = fateInstances.get(); - while (localFates == null) { - UtilWaitThread.sleep(100); - if (shutdown.getCount() == 0) { - return; - } - localFates = fateInstances.get(); - } - - var extent = KeyExtent.fromThrift(textent); - var localFate = localFates.get(FateInstanceType.fromTableId(extent.tableId())); - - LOG.info("Compaction completed, id: {}, stats: {}, extent: {}", externalCompactionId, stats, - extent); - final var ecid = ExternalCompactionId.of(externalCompactionId); - - var tabletMeta = - ctx.getAmple().readTablet(extent, ECOMP, SELECTED, LOCATION, FILES, COMPACTED, OPID); - - var tableState = manager.getContext().getTableState(extent.tableId()); - if (tableState != TableState.ONLINE) { - // Its important this check is done after the compaction id is set in the metadata table to - // avoid race conditions with the client code that waits for tables to go offline. That code - // looks for compaction ids in the metadata table after setting the table state. When that - // client code sees nothing for a tablet its important that nothing will changes the tablets - // files after that point in time which this check ensure. - LOG.debug("Not committing compaction {} for {} because of table state {}", ecid, extent, - tableState); - // cleanup metadata table and files related to the compaction - compactionsFailed(Map.of(ecid, extent)); - return; - } - - if (!CommitCompaction.canCommitCompaction(ecid, tabletMeta)) { - return; - } - - // Start a fate transaction to commit the compaction. - CompactionMetadata ecm = tabletMeta.getExternalCompactions().get(ecid); - var renameOp = new RenameCompactionFile(new CompactionCommitData(ecid, extent, ecm, stats)); - var txid = localFate.seedTransaction("COMMIT_COMPACTION", FateKey.forCompactionCommit(ecid), - renameOp, true, "Commit compaction " + ecid); - - txid.ifPresentOrElse(fateId -> LOG.debug("initiated compaction commit {} {}", ecid, fateId), - () -> LOG.debug("compaction commit already initiated for {}", ecid)); + throw new UnsupportedOperationException(); } @Override @@ -1184,5 +1135,107 @@ public void getCompactionJob(CompactionJobRequest request, throw e; } } + + /** + * Compactors calls this method when they have finished a compaction. This method does the + * following. + * + *
    + *
  1. Reads the tablets metadata and determines if the compaction can commit. Its possible that + * things changed while the compaction was running and it can no longer commit.
    2. + *
  2. Commit the compaction using a conditional mutation. If the tablets files or location + * changed since reading the tablets metadata, then conditional mutation will fail. When this + * happens it will reread the metadata and go back to step 1 conceptually. When committing a + * compaction the compacted files are removed and scan entries are added to the tablet in case + * the files are in use, this prevents GC from deleting the files between updating tablet + * metadata and refreshing the tablet. The scan entries are only added when a tablet has a + * location.
    3. + *
  3. After successful commit a refresh request is sent to the tablet if it has a location. + * This will cause the tablet to start using the newly compacted files for future scans. Also + * the tablet can delete the scan entries if there are no active scans using them.
    4. + *
+ * + *

+ * User compactions will be refreshed as part of the fate operation. The user compaction fate + * operation will see the compaction was committed after this code updates the tablet metadata, + * however if it were to rely on this code to do the refresh it would not be able to know when + * the refresh was actually done. Therefore, user compactions will refresh as part of the fate + * operation so that it's known to be done before the fate operation returns. Since the fate + * operation will do it, there is no need to do it here for user compactions. + * + * @param request CompactionCompletedRequest + */ + @Override + public void compactionCompleted(CompactionCompletedRequest request, + StreamObserver responseObserver) { + + // TODO: Do we want to offload this processing to a new thread like we plan to do with + // getCompactionJob() ? + + var credentials = request.getCredentials(); + + try { + // do not expect users to call this directly, expect other tservers to call this method + if (!security.canPerformSystemActions(convert(credentials))) { + throw new AccumuloSecurityException(credentials.getPrincipal(), + SecurityErrorCode.PERMISSION_DENIED).asThriftException(); + } + + // maybe fate has not started yet + var localFates = fateInstances.get(); + while (localFates == null) { + UtilWaitThread.sleep(100); + if (shutdown.getCount() == 0) { + return; + } + localFates = fateInstances.get(); + } + + var extent = KeyExtent.fromProtobuf(request.getExtent()); + var localFate = localFates.get(FateInstanceType.fromTableId(extent.tableId())); + + LOG.info("Compaction completed, id: {}, stats: {}, extent: {}", + request.getExternalCompactionId(), request.getStats(), extent); + final var ecid = ExternalCompactionId.of(request.getExternalCompactionId()); + + var tabletMeta = + ctx.getAmple().readTablet(extent, ECOMP, SELECTED, LOCATION, FILES, COMPACTED, OPID); + + var tableState = manager.getContext().getTableState(extent.tableId()); + if (tableState != TableState.ONLINE) { + // Its important this check is done after the compaction id is set in the metadata table + // to avoid race conditions with the client code that waits for tables to go offline. + // That codelooks for compaction ids in the metadata table after setting the table + // state. When that client code sees nothing for a tablet its important that nothing + // will change the tablets files after that point in time which this check ensure. + LOG.debug("Not committing compaction {} for {} because of table state {}", ecid, extent, + tableState); + // cleanup metadata table and files related to the compaction + compactionsFailed(Map.of(ecid, extent)); + return; + } + + if (!CommitCompaction.canCommitCompaction(ecid, tabletMeta)) { + return; + } + + // Start a fate transaction to commit the compaction. + CompactionMetadata ecm = tabletMeta.getExternalCompactions().get(ecid); + var renameOp = new RenameCompactionFile( + new CompactionCommitData(ecid, extent, ecm, request.getStats())); + var txid = localFate.seedTransaction("COMMIT_COMPACTION", FateKey.forCompactionCommit(ecid), + renameOp, true, "Commit compaction " + ecid); + + txid.ifPresentOrElse(fateId -> LOG.debug("initiated compaction commit {} {}", ecid, fateId), + () -> LOG.debug("compaction commit already initiated for {}", ecid)); + + responseObserver.onCompleted(); + } catch (ThriftSecurityException e) { + throw new RuntimeException(e); + } catch (Exception e) { + LOG.error(e.getMessage(), e); + throw e; + } + } } } diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java index 0daa221f1f6..83ae0b9245b 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java @@ -31,6 +31,7 @@ import java.util.Set; import java.util.stream.Collectors; +import org.apache.accumulo.core.compaction.protobuf.PCompactionStats; import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.fate.Repo; @@ -45,7 +46,6 @@ import org.apache.accumulo.core.metadata.schema.SelectedFiles; import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.spi.compaction.CompactionKind; -import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; import org.apache.accumulo.core.util.Retry; import org.apache.accumulo.manager.Manager; import org.apache.accumulo.manager.tableOps.ManagerRepo; @@ -157,7 +157,7 @@ private TabletMetadata commitCompaction(ServerContext ctx, ExternalCompactionId return tablet; } - private void updateTabletForCompaction(TCompactionStats stats, ExternalCompactionId ecid, + private void updateTabletForCompaction(PCompactionStats stats, ExternalCompactionId ecid, TabletMetadata tablet, Optional newDatafile, CompactionMetadata ecm, Ample.ConditionalTabletMutator tabletMutator) { diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java index 23b293c25e9..25887a910e2 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java @@ -23,6 +23,7 @@ import java.util.Set; import java.util.stream.Collectors; +import org.apache.accumulo.core.compaction.protobuf.PCompactionStats; import org.apache.accumulo.core.data.TableId; import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent; @@ -30,7 +31,6 @@ import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.spi.compaction.CompactionKind; -import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; public class CompactionCommitData implements Serializable { private static final long serialVersionUID = 1L; @@ -39,10 +39,10 @@ public class CompactionCommitData implements Serializable { final String outputTmpPath; final String ecid; final TKeyExtent textent; - final TCompactionStats stats; + final PCompactionStats stats; public CompactionCommitData(ExternalCompactionId ecid, KeyExtent extent, CompactionMetadata ecm, - TCompactionStats stats) { + PCompactionStats stats) { this.ecid = ecid.canonical(); this.textent = extent.toThrift(); this.kind = ecm.getKind(); From 854ee44cf63e15a2cf796ddf344ca18bd079acbb Mon Sep 17 00:00:00 2001 From: "Christopher L. Shannon" Date: Sat, 13 Jul 2024 15:37:21 -0400 Subject: [PATCH 13/25] Move more CompactionService rpc calls to gRpc --- .../accumulo/core/rpc/ThriftProtobufUtil.java | 15 + .../main/proto/compaction-coordinator.proto | 87 +- core/src/main/proto/tabletserver.proto | 15 + .../compaction/protobuf/CancelRequest.java | 938 +++++++++++++ .../protobuf/CancelRequestOrBuilder.java | 70 + .../CompactionCoordinatorServiceGrpc.java | 438 +++++- .../CompactionCoordinatorServiceProto.java | 215 ++- .../protobuf/CompactionFailedRequest.java | 1123 ++++++++++++++++ .../CompactionFailedRequestOrBuilder.java | 85 ++ .../GetCompletedCompactionsRequest.java | 802 +++++++++++ ...tCompletedCompactionsRequestOrBuilder.java | 58 + .../GetRunningCompactionsRequest.java | 802 +++++++++++ ...GetRunningCompactionsRequestOrBuilder.java | 58 + ...actionState.java => PCompactionState.java} | 26 +- ...date.java => PCompactionStatusUpdate.java} | 144 +- ... => PCompactionStatusUpdateOrBuilder.java} | 10 +- .../protobuf/PExternalCompaction.java | 1195 +++++++++++++++++ .../protobuf/PExternalCompactionJob.java | 26 +- .../PExternalCompactionJobOrBuilder.java | 4 +- .../protobuf/PExternalCompactionList.java | 730 ++++++++++ .../PExternalCompactionListOrBuilder.java | 62 + .../PExternalCompactionOrBuilder.java | 101 ++ .../protobuf/PNextCompactionJob.java | 24 +- .../protobuf/PNextCompactionJobOrBuilder.java | 6 +- .../protobuf/TabletServerProto.java | 81 +- .../UpdateCompactionStatusRequest.java | 1190 ++++++++++++++++ ...pdateCompactionStatusRequestOrBuilder.java | 91 ++ server/compactor/pom.xml | 4 + .../apache/accumulo/compactor/Compactor.java | 71 +- .../coordinator/CompactionCoordinator.java | 220 ++- .../ExternalDoNothingCompactor.java | 9 +- 31 files changed, 8430 insertions(+), 270 deletions(-) create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequest.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequestOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequest.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequestOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequest.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequestOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequest.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequestOrBuilder.java rename core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/{TCompactionState.java => PCompactionState.java} (89%) rename core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/{TCompactionStatusUpdate.java => PCompactionStatusUpdate.java} (86%) rename core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/{TCompactionStatusUpdateOrBuilder.java => PCompactionStatusUpdateOrBuilder.java} (87%) create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompaction.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionList.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionListOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionOrBuilder.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequest.java create mode 100644 core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequestOrBuilder.java diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java index fce62a90c52..3209860f2f0 100644 --- a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java @@ -24,6 +24,7 @@ import org.apache.accumulo.core.clientImpl.thrift.TInfo; import org.apache.accumulo.core.compaction.protobuf.PCompactionKind; +import org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate; import org.apache.accumulo.core.compaction.protobuf.PCredentials; import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob; import org.apache.accumulo.core.compaction.protobuf.PFateId; @@ -34,6 +35,8 @@ import org.apache.accumulo.core.compaction.protobuf.PKeyExtent; import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob; import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo; +import org.apache.accumulo.core.compaction.thrift.TCompactionState; +import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate; import org.apache.accumulo.core.compaction.thrift.TNextCompactionJob; import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent; import org.apache.accumulo.core.manager.thrift.TFateId; @@ -312,4 +315,16 @@ public static PNextCompactionJob convert(TNextCompactionJob nextJob) { return PNextCompactionJob.newBuilder().setCompactorCount(nextJob.getCompactorCount()) .setJob(convert(nextJob.getJob())).build(); } + + public static TCompactionStatusUpdate convert(PCompactionStatusUpdate pstatus) { + var update = new TCompactionStatusUpdate(); + update.setState(TCompactionState.valueOf(pstatus.getState().name())); + update.setMessage(pstatus.getMessage()); + update.setEntriesToBeCompacted(pstatus.getEntriesToBeCompacted()); + update.setEntriesRead(pstatus.getEntriesRead()); + update.setEntriesWritten(pstatus.getEntriesWritten()); + update.setCompactionAgeNanos(pstatus.getCompactionAgeNanos()); + return update; + } + } diff --git a/core/src/main/proto/compaction-coordinator.proto b/core/src/main/proto/compaction-coordinator.proto index 225bf38a48f..eca19ed9a2b 100644 --- a/core/src/main/proto/compaction-coordinator.proto +++ b/core/src/main/proto/compaction-coordinator.proto @@ -35,16 +35,41 @@ package compaction_coordinator; // Interface exported by the server. service CompactionCoordinatorService { /* - * Called by Compactor on successful completion of compaction job + * Called by Compactor to get the next compaction job */ - rpc GetCompactionJob(CompactionJobRequest) returns (PNextCompactionJob) {} + rpc GetCompactionJob(CompactionJobRequest) returns (PNextCompactionJob); /* * Called by Compactor on successful completion of compaction job */ rpc CompactionCompleted(CompactionCompletedRequest) returns (google.protobuf.Empty); + /* + * Called by Compactor to update the Coordinator with the state of the compaction + */ + rpc UpdateCompactionStatus(UpdateCompactionStatusRequest) returns (google.protobuf.Empty); + + /* + * Called by Compactor on unsuccessful completion of compaction job + */ + rpc CompactionFailed(CompactionFailedRequest) returns (google.protobuf.Empty); + + /* + * Called by the Monitor to get progress information + */ + rpc GetRunningCompactions(GetRunningCompactionsRequest) returns (PExternalCompactionList); + + /* + * Called by the Monitor to get progress information + */ + rpc GetCompletedCompactions(GetCompletedCompactionsRequest) returns (PExternalCompactionList); + + /* + * Called by Compactor on unsuccessful completion of compaction job + */ + rpc Cancel(CancelRequest) returns (google.protobuf.Empty); } + message CompactionJobRequest { client.ProtoTInfo ptinfo = 1; security.PCredentials credentials = 2; @@ -61,25 +86,55 @@ message CompactionCompletedRequest { tabletserver.PCompactionStats stats = 5; } +message UpdateCompactionStatusRequest { + client.ProtoTInfo ptinfo = 1; + security.PCredentials credentials = 2; + string externalCompactionId = 3; + PCompactionStatusUpdate status = 4; + int64 timestamp = 5; +} + +message CompactionFailedRequest { + client.ProtoTInfo ptinfo = 1; + security.PCredentials credentials = 2; + string externalCompactionId = 3; + data.PKeyExtent extent = 4; +} + +message GetRunningCompactionsRequest { + client.ProtoTInfo ptinfo = 1; + security.PCredentials credentials = 2; +} + +message GetCompletedCompactionsRequest { + client.ProtoTInfo ptinfo = 1; + security.PCredentials credentials = 2; +} + +message CancelRequest { + client.ProtoTInfo ptinfo = 1; + security.PCredentials credentials = 2; + string externalCompactionId = 3; +} + +message PExternalCompaction { + string groupName = 1; + string compactor = 2; + map updates = 3; + tabletserver.PExternalCompactionJob job = 4; + +} -message PExternalCompactionJob { - optional string externalCompactionId = 1; - optional data.PKeyExtent extent = 2; - repeated tabletserver.PInputFile files = 3; - optional tabletserver.PIteratorConfig iteratorSettings = 4; - optional string outputFile = 5; - optional bool propagateDeletes = 6; - optional tabletserver.PCompactionKind kind = 7; - optional manager.PFateId fateId = 8; - map overrides = 9; +message PExternalCompactionList { + map compactions = 1; } message PNextCompactionJob { - PExternalCompactionJob job = 1; + tabletserver.PExternalCompactionJob job = 1; int32 compactorCount = 2; } -enum TCompactionState { +enum PCompactionState { // Coordinator should set state to ASSIGNED when getCompactionJob is called by Compactor ASSIGNED = 0; // Compactor should set state to STARTED when compaction has successfully begun @@ -94,8 +149,8 @@ enum TCompactionState { CANCELLED = 5; } -message TCompactionStatusUpdate { - TCompactionState state = 1; +message PCompactionStatusUpdate { + PCompactionState state = 1; string message = 2; int64 entriesToBeCompacted = 3; int64 entriesRead = 4; diff --git a/core/src/main/proto/tabletserver.proto b/core/src/main/proto/tabletserver.proto index e0879ac5527..ccd1ce9dfdd 100644 --- a/core/src/main/proto/tabletserver.proto +++ b/core/src/main/proto/tabletserver.proto @@ -23,9 +23,24 @@ option java_multiple_files = true; option java_package = "org.apache.accumulo.core.compaction.protobuf"; option java_outer_classname = "TabletServerProto"; +import "data.proto"; +import "manager.proto"; + package tabletserver; +message PExternalCompactionJob { + optional string externalCompactionId = 1; + optional data.PKeyExtent extent = 2; + repeated tabletserver.PInputFile files = 3; + optional tabletserver.PIteratorConfig iteratorSettings = 4; + optional string outputFile = 5; + optional bool propagateDeletes = 6; + optional tabletserver.PCompactionKind kind = 7; + optional manager.PFateId fateId = 8; + map overrides = 9; +} + message PInputFile { // This is nullable in Thrift but I am not marking as optional as // I think it should always be set diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequest.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequest.java new file mode 100644 index 00000000000..8e3f57a3499 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequest.java @@ -0,0 +1,938 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.CancelRequest} + */ +public final class CancelRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.CancelRequest) + CancelRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use CancelRequest.newBuilder() to construct. + private CancelRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private CancelRequest() { + externalCompactionId_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new CancelRequest(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.CancelRequest.class, org.apache.accumulo.core.compaction.protobuf.CancelRequest.Builder.class); + } + + private int bitField0_; + public static final int PTINFO_FIELD_NUMBER = 1; + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + @java.lang.Override + public boolean hasPtinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + + public static final int CREDENTIALS_FIELD_NUMBER = 2; + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + @java.lang.Override + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + /** + * .security.PCredentials credentials = 2; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + + public static final int EXTERNALCOMPACTIONID_FIELD_NUMBER = 3; + @SuppressWarnings("serial") + private volatile java.lang.Object externalCompactionId_ = ""; + /** + * string externalCompactionId = 3; + * @return The externalCompactionId. + */ + @java.lang.Override + public java.lang.String getExternalCompactionId() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + externalCompactionId_ = s; + return s; + } + } + /** + * string externalCompactionId = 3; + * @return The bytes for externalCompactionId. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getExternalCompactionIdBytes() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + externalCompactionId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(1, getPtinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + output.writeMessage(2, getCredentials()); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(externalCompactionId_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, externalCompactionId_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getPtinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getCredentials()); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(externalCompactionId_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, externalCompactionId_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.CancelRequest)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.CancelRequest other = (org.apache.accumulo.core.compaction.protobuf.CancelRequest) obj; + + if (hasPtinfo() != other.hasPtinfo()) return false; + if (hasPtinfo()) { + if (!getPtinfo() + .equals(other.getPtinfo())) return false; + } + if (hasCredentials() != other.hasCredentials()) return false; + if (hasCredentials()) { + if (!getCredentials() + .equals(other.getCredentials())) return false; + } + if (!getExternalCompactionId() + .equals(other.getExternalCompactionId())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPtinfo()) { + hash = (37 * hash) + PTINFO_FIELD_NUMBER; + hash = (53 * hash) + getPtinfo().hashCode(); + } + if (hasCredentials()) { + hash = (37 * hash) + CREDENTIALS_FIELD_NUMBER; + hash = (53 * hash) + getCredentials().hashCode(); + } + hash = (37 * hash) + EXTERNALCOMPACTIONID_FIELD_NUMBER; + hash = (53 * hash) + getExternalCompactionId().hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.CancelRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.CancelRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.CancelRequest) + org.apache.accumulo.core.compaction.protobuf.CancelRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.CancelRequest.class, org.apache.accumulo.core.compaction.protobuf.CancelRequest.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.CancelRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getPtinfoFieldBuilder(); + getCredentialsFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; + } + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + externalCompactionId_ = ""; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CancelRequest getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.CancelRequest.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CancelRequest build() { + org.apache.accumulo.core.compaction.protobuf.CancelRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CancelRequest buildPartial() { + org.apache.accumulo.core.compaction.protobuf.CancelRequest result = new org.apache.accumulo.core.compaction.protobuf.CancelRequest(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.CancelRequest result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.ptinfo_ = ptinfoBuilder_ == null + ? ptinfo_ + : ptinfoBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.credentials_ = credentialsBuilder_ == null + ? credentials_ + : credentialsBuilder_.build(); + to_bitField0_ |= 0x00000002; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.externalCompactionId_ = externalCompactionId_; + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.CancelRequest) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.CancelRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.CancelRequest other) { + if (other == org.apache.accumulo.core.compaction.protobuf.CancelRequest.getDefaultInstance()) return this; + if (other.hasPtinfo()) { + mergePtinfo(other.getPtinfo()); + } + if (other.hasCredentials()) { + mergeCredentials(other.getCredentials()); + } + if (!other.getExternalCompactionId().isEmpty()) { + externalCompactionId_ = other.externalCompactionId_; + bitField0_ |= 0x00000004; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getPtinfoFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + input.readMessage( + getCredentialsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + externalCompactionId_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000004; + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + public boolean hasPtinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + if (ptinfoBuilder_ == null) { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } else { + return ptinfoBuilder_.getMessage(); + } + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ptinfo_ = value; + } else { + ptinfoBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder setPtinfo( + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) { + if (ptinfoBuilder_ == null) { + ptinfo_ = builderForValue.build(); + } else { + ptinfoBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + ptinfo_ != null && + ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { + getPtinfoBuilder().mergeFrom(value); + } else { + ptinfo_ = value; + } + } else { + ptinfoBuilder_.mergeFrom(value); + } + if (ptinfo_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder clearPtinfo() { + bitField0_ = (bitField0_ & ~0x00000001); + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getPtinfoFieldBuilder().getBuilder(); + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + if (ptinfoBuilder_ != null) { + return ptinfoBuilder_.getMessageOrBuilder(); + } else { + return ptinfo_ == null ? + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> + getPtinfoFieldBuilder() { + if (ptinfoBuilder_ == null) { + ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>( + getPtinfo(), + getParentForChildren(), + isClean()); + ptinfo_ = null; + } + return ptinfoBuilder_; + } + + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + if (credentialsBuilder_ == null) { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } else { + return credentialsBuilder_.getMessage(); + } + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + credentials_ = value; + } else { + credentialsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder setCredentials( + org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) { + if (credentialsBuilder_ == null) { + credentials_ = builderForValue.build(); + } else { + credentialsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0) && + credentials_ != null && + credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) { + getCredentialsBuilder().mergeFrom(value); + } else { + credentials_ = value; + } + } else { + credentialsBuilder_.mergeFrom(value); + } + if (credentials_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder clearCredentials() { + bitField0_ = (bitField0_ & ~0x00000002); + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getCredentialsFieldBuilder().getBuilder(); + } + /** + * .security.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + if (credentialsBuilder_ != null) { + return credentialsBuilder_.getMessageOrBuilder(); + } else { + return credentials_ == null ? + org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + } + /** + * .security.PCredentials credentials = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> + getCredentialsFieldBuilder() { + if (credentialsBuilder_ == null) { + credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>( + getCredentials(), + getParentForChildren(), + isClean()); + credentials_ = null; + } + return credentialsBuilder_; + } + + private java.lang.Object externalCompactionId_ = ""; + /** + * string externalCompactionId = 3; + * @return The externalCompactionId. + */ + public java.lang.String getExternalCompactionId() { + java.lang.Object ref = externalCompactionId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + externalCompactionId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string externalCompactionId = 3; + * @return The bytes for externalCompactionId. + */ + public com.google.protobuf.ByteString + getExternalCompactionIdBytes() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + externalCompactionId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string externalCompactionId = 3; + * @param value The externalCompactionId to set. + * @return This builder for chaining. + */ + public Builder setExternalCompactionId( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + externalCompactionId_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * string externalCompactionId = 3; + * @return This builder for chaining. + */ + public Builder clearExternalCompactionId() { + externalCompactionId_ = getDefaultInstance().getExternalCompactionId(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + return this; + } + /** + * string externalCompactionId = 3; + * @param value The bytes for externalCompactionId to set. + * @return This builder for chaining. + */ + public Builder setExternalCompactionIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + externalCompactionId_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.CancelRequest) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.CancelRequest) + private static final org.apache.accumulo.core.compaction.protobuf.CancelRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.CancelRequest(); + } + + public static org.apache.accumulo.core.compaction.protobuf.CancelRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public CancelRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CancelRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequestOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequestOrBuilder.java new file mode 100644 index 00000000000..1dca2517834 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequestOrBuilder.java @@ -0,0 +1,70 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface CancelRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.CancelRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + boolean hasPtinfo(); + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo(); + /** + * .client.ProtoTInfo ptinfo = 1; + */ + org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); + + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + boolean hasCredentials(); + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(); + /** + * .security.PCredentials credentials = 2; + */ + org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); + + /** + * string externalCompactionId = 3; + * @return The externalCompactionId. + */ + java.lang.String getExternalCompactionId(); + /** + * string externalCompactionId = 3; + * @return The bytes for externalCompactionId. + */ + com.google.protobuf.ByteString + getExternalCompactionIdBytes(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java index 0b0affb8a56..806d950b53b 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java @@ -98,6 +98,161 @@ com.google.protobuf.Empty> getCompactionCompletedMethod() { return getCompactionCompletedMethod; } + private static volatile io.grpc.MethodDescriptor getUpdateCompactionStatusMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "UpdateCompactionStatus", + requestType = org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.class, + responseType = com.google.protobuf.Empty.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getUpdateCompactionStatusMethod() { + io.grpc.MethodDescriptor getUpdateCompactionStatusMethod; + if ((getUpdateCompactionStatusMethod = CompactionCoordinatorServiceGrpc.getUpdateCompactionStatusMethod) == null) { + synchronized (CompactionCoordinatorServiceGrpc.class) { + if ((getUpdateCompactionStatusMethod = CompactionCoordinatorServiceGrpc.getUpdateCompactionStatusMethod) == null) { + CompactionCoordinatorServiceGrpc.getUpdateCompactionStatusMethod = getUpdateCompactionStatusMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UpdateCompactionStatus")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + com.google.protobuf.Empty.getDefaultInstance())) + .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("UpdateCompactionStatus")) + .build(); + } + } + } + return getUpdateCompactionStatusMethod; + } + + private static volatile io.grpc.MethodDescriptor getCompactionFailedMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "CompactionFailed", + requestType = org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.class, + responseType = com.google.protobuf.Empty.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getCompactionFailedMethod() { + io.grpc.MethodDescriptor getCompactionFailedMethod; + if ((getCompactionFailedMethod = CompactionCoordinatorServiceGrpc.getCompactionFailedMethod) == null) { + synchronized (CompactionCoordinatorServiceGrpc.class) { + if ((getCompactionFailedMethod = CompactionCoordinatorServiceGrpc.getCompactionFailedMethod) == null) { + CompactionCoordinatorServiceGrpc.getCompactionFailedMethod = getCompactionFailedMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CompactionFailed")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + com.google.protobuf.Empty.getDefaultInstance())) + .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("CompactionFailed")) + .build(); + } + } + } + return getCompactionFailedMethod; + } + + private static volatile io.grpc.MethodDescriptor getGetRunningCompactionsMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetRunningCompactions", + requestType = org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.class, + responseType = org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getGetRunningCompactionsMethod() { + io.grpc.MethodDescriptor getGetRunningCompactionsMethod; + if ((getGetRunningCompactionsMethod = CompactionCoordinatorServiceGrpc.getGetRunningCompactionsMethod) == null) { + synchronized (CompactionCoordinatorServiceGrpc.class) { + if ((getGetRunningCompactionsMethod = CompactionCoordinatorServiceGrpc.getGetRunningCompactionsMethod) == null) { + CompactionCoordinatorServiceGrpc.getGetRunningCompactionsMethod = getGetRunningCompactionsMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetRunningCompactions")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.getDefaultInstance())) + .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("GetRunningCompactions")) + .build(); + } + } + } + return getGetRunningCompactionsMethod; + } + + private static volatile io.grpc.MethodDescriptor getGetCompletedCompactionsMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetCompletedCompactions", + requestType = org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.class, + responseType = org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getGetCompletedCompactionsMethod() { + io.grpc.MethodDescriptor getGetCompletedCompactionsMethod; + if ((getGetCompletedCompactionsMethod = CompactionCoordinatorServiceGrpc.getGetCompletedCompactionsMethod) == null) { + synchronized (CompactionCoordinatorServiceGrpc.class) { + if ((getGetCompletedCompactionsMethod = CompactionCoordinatorServiceGrpc.getGetCompletedCompactionsMethod) == null) { + CompactionCoordinatorServiceGrpc.getGetCompletedCompactionsMethod = getGetCompletedCompactionsMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetCompletedCompactions")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.getDefaultInstance())) + .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("GetCompletedCompactions")) + .build(); + } + } + } + return getGetCompletedCompactionsMethod; + } + + private static volatile io.grpc.MethodDescriptor getCancelMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "Cancel", + requestType = org.apache.accumulo.core.compaction.protobuf.CancelRequest.class, + responseType = com.google.protobuf.Empty.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getCancelMethod() { + io.grpc.MethodDescriptor getCancelMethod; + if ((getCancelMethod = CompactionCoordinatorServiceGrpc.getCancelMethod) == null) { + synchronized (CompactionCoordinatorServiceGrpc.class) { + if ((getCancelMethod = CompactionCoordinatorServiceGrpc.getCancelMethod) == null) { + CompactionCoordinatorServiceGrpc.getCancelMethod = getCancelMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Cancel")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.apache.accumulo.core.compaction.protobuf.CancelRequest.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + com.google.protobuf.Empty.getDefaultInstance())) + .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("Cancel")) + .build(); + } + } + } + return getCancelMethod; + } + /** * Creates a new async stub that supports all call types for the service */ @@ -151,7 +306,7 @@ public interface AsyncService { /** * 

-     * Called by Compactor on successful completion of compaction job
+     * Called by Compactor to get the next compaction job
      *
*/ default void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request, @@ -168,6 +323,56 @@ default void compactionCompleted(org.apache.accumulo.core.compaction.protobuf.Co io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCompactionCompletedMethod(), responseObserver); } + + /** + * 
+     * Called by Compactor to update the Coordinator with the state of the compaction
+     *
+ */ + default void updateCompactionStatus(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUpdateCompactionStatusMethod(), responseObserver); + } + + /** + * 
+     * Called by Compactor on unsuccessful completion of compaction job
+     *
+ */ + default void compactionFailed(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCompactionFailedMethod(), responseObserver); + } + + /** + * 
+     * Called by the Monitor to get progress information
+     *
+ */ + default void getRunningCompactions(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetRunningCompactionsMethod(), responseObserver); + } + + /** + * 
+     * Called by the Monitor to get progress information
+     *
+ */ + default void getCompletedCompactions(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetCompletedCompactionsMethod(), responseObserver); + } + + /** + * 
+     * Called by Compactor on unsuccessful completion of compaction job
+     *
+ */ + default void cancel(org.apache.accumulo.core.compaction.protobuf.CancelRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCancelMethod(), responseObserver); + } } /** @@ -205,7 +410,7 @@ protected CompactionCoordinatorServiceStub build( /** * 
-     * Called by Compactor on successful completion of compaction job
+     * Called by Compactor to get the next compaction job
      *
*/ public void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request, @@ -224,6 +429,61 @@ public void compactionCompleted(org.apache.accumulo.core.compaction.protobuf.Com io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getCompactionCompletedMethod(), getCallOptions()), request, responseObserver); } + + /** + * 
+     * Called by Compactor to update the Coordinator with the state of the compaction
+     *
+ */ + public void updateCompactionStatus(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getUpdateCompactionStatusMethod(), getCallOptions()), request, responseObserver); + } + + /** + * 
+     * Called by Compactor on unsuccessful completion of compaction job
+     *
+ */ + public void compactionFailed(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getCompactionFailedMethod(), getCallOptions()), request, responseObserver); + } + + /** + * 
+     * Called by the Monitor to get progress information
+     *
+ */ + public void getRunningCompactions(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getGetRunningCompactionsMethod(), getCallOptions()), request, responseObserver); + } + + /** + * 
+     * Called by the Monitor to get progress information
+     *
+ */ + public void getCompletedCompactions(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getGetCompletedCompactionsMethod(), getCallOptions()), request, responseObserver); + } + + /** + * 
+     * Called by Compactor on unsuccessful completion of compaction job
+     *
+ */ + public void cancel(org.apache.accumulo.core.compaction.protobuf.CancelRequest request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getCancelMethod(), getCallOptions()), request, responseObserver); + } } /** @@ -247,7 +507,7 @@ protected CompactionCoordinatorServiceBlockingStub build( /** * 
-     * Called by Compactor on successful completion of compaction job
+     * Called by Compactor to get the next compaction job
      *
*/ public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request) { @@ -264,6 +524,56 @@ public com.google.protobuf.Empty compactionCompleted(org.apache.accumulo.core.co return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCompactionCompletedMethod(), getCallOptions(), request); } + + /** + * 
+     * Called by Compactor to update the Coordinator with the state of the compaction
+     *
+ */ + public com.google.protobuf.Empty updateCompactionStatus(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getUpdateCompactionStatusMethod(), getCallOptions(), request); + } + + /** + * 
+     * Called by Compactor on unsuccessful completion of compaction job
+     *
+ */ + public com.google.protobuf.Empty compactionFailed(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getCompactionFailedMethod(), getCallOptions(), request); + } + + /** + * 
+     * Called by the Monitor to get progress information
+     *
+ */ + public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getRunningCompactions(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getGetRunningCompactionsMethod(), getCallOptions(), request); + } + + /** + * 
+     * Called by the Monitor to get progress information
+     *
+ */ + public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getCompletedCompactions(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getGetCompletedCompactionsMethod(), getCallOptions(), request); + } + + /** + * 
+     * Called by Compactor on unsuccessful completion of compaction job
+     *
+ */ + public com.google.protobuf.Empty cancel(org.apache.accumulo.core.compaction.protobuf.CancelRequest request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getCancelMethod(), getCallOptions(), request); + } } /** @@ -287,7 +597,7 @@ protected CompactionCoordinatorServiceFutureStub build( /** * 
-     * Called by Compactor on successful completion of compaction job
+     * Called by Compactor to get the next compaction job
      *
*/ public com.google.common.util.concurrent.ListenableFuture getCompactionJob( @@ -306,10 +616,70 @@ public com.google.common.util.concurrent.ListenableFuture + * Called by Compactor to update the Coordinator with the state of the compaction + * + */ + public com.google.common.util.concurrent.ListenableFuture updateCompactionStatus( + org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getUpdateCompactionStatusMethod(), getCallOptions()), request); + } + + /** + * 
+     * Called by Compactor on unsuccessful completion of compaction job
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture compactionFailed( + org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getCompactionFailedMethod(), getCallOptions()), request); + } + + /** + * 
+     * Called by the Monitor to get progress information
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture getRunningCompactions( + org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getGetRunningCompactionsMethod(), getCallOptions()), request); + } + + /** + * 
+     * Called by the Monitor to get progress information
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture getCompletedCompactions( + org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getGetCompletedCompactionsMethod(), getCallOptions()), request); + } + + /** + * 
+     * Called by Compactor on unsuccessful completion of compaction job
+     *
+ */ + public com.google.common.util.concurrent.ListenableFuture cancel( + org.apache.accumulo.core.compaction.protobuf.CancelRequest request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getCancelMethod(), getCallOptions()), request); + } } private static final int METHODID_GET_COMPACTION_JOB = 0; private static final int METHODID_COMPACTION_COMPLETED = 1; + private static final int METHODID_UPDATE_COMPACTION_STATUS = 2; + private static final int METHODID_COMPACTION_FAILED = 3; + private static final int METHODID_GET_RUNNING_COMPACTIONS = 4; + private static final int METHODID_GET_COMPLETED_COMPACTIONS = 5; + private static final int METHODID_CANCEL = 6; private static final class MethodHandlers implements io.grpc.stub.ServerCalls.UnaryMethod, @@ -336,6 +706,26 @@ public void invoke(Req request, io.grpc.stub.StreamObserver responseObserv serviceImpl.compactionCompleted((org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest) request, (io.grpc.stub.StreamObserver) responseObserver); break; + case METHODID_UPDATE_COMPACTION_STATUS: + serviceImpl.updateCompactionStatus((org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; + case METHODID_COMPACTION_FAILED: + serviceImpl.compactionFailed((org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; + case METHODID_GET_RUNNING_COMPACTIONS: + serviceImpl.getRunningCompactions((org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; + case METHODID_GET_COMPLETED_COMPACTIONS: + serviceImpl.getCompletedCompactions((org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; + case METHODID_CANCEL: + serviceImpl.cancel((org.apache.accumulo.core.compaction.protobuf.CancelRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; default: throw new AssertionError(); } @@ -368,6 +758,41 @@ public static final io.grpc.ServerServiceDefinition bindService(AsyncService ser org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest, com.google.protobuf.Empty>( service, METHODID_COMPACTION_COMPLETED))) + .addMethod( + getUpdateCompactionStatusMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest, + com.google.protobuf.Empty>( + service, METHODID_UPDATE_COMPACTION_STATUS))) + .addMethod( + getCompactionFailedMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest, + com.google.protobuf.Empty>( + service, METHODID_COMPACTION_FAILED))) + .addMethod( + getGetRunningCompactionsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest, + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList>( + service, METHODID_GET_RUNNING_COMPACTIONS))) + .addMethod( + getGetCompletedCompactionsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest, + org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList>( + service, METHODID_GET_COMPLETED_COMPACTIONS))) + .addMethod( + getCancelMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + org.apache.accumulo.core.compaction.protobuf.CancelRequest, + com.google.protobuf.Empty>( + service, METHODID_CANCEL))) .build(); } @@ -418,6 +843,11 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() { .setSchemaDescriptor(new CompactionCoordinatorServiceFileDescriptorSupplier()) .addMethod(getGetCompactionJobMethod()) .addMethod(getCompactionCompletedMethod()) + .addMethod(getUpdateCompactionStatusMethod()) + .addMethod(getCompactionFailedMethod()) + .addMethod(getGetRunningCompactionsMethod()) + .addMethod(getGetCompletedCompactionsMethod()) + .addMethod(getCancelMethod()) .build(); } } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java index d1b004cce63..89a481dd185 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java @@ -44,25 +44,60 @@ public static void registerAllExtensions( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_compaction_coordinator_CompactionCompletedRequest_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_PExternalCompactionJob_descriptor; + internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_PExternalCompactionJob_fieldAccessorTable; + internal_static_compaction_coordinator_UpdateCompactionStatusRequest_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_descriptor; + internal_static_compaction_coordinator_CompactionFailedRequest_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_fieldAccessorTable; + internal_static_compaction_coordinator_CompactionFailedRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_GetRunningCompactionsRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_GetCompletedCompactionsRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_CancelRequest_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_CancelRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PExternalCompaction_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PExternalCompaction_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PExternalCompaction_UpdatesEntry_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PExternalCompaction_UpdatesEntry_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PExternalCompactionList_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PExternalCompactionList_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_compaction_coordinator_PExternalCompactionList_CompactionsEntry_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_compaction_coordinator_PExternalCompactionList_CompactionsEntry_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_compaction_coordinator_PNextCompactionJob_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor - internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor; + internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_compaction_coordinator_TCompactionStatusUpdate_fieldAccessorTable; + internal_static_compaction_coordinator_PCompactionStatusUpdate_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -85,41 +120,71 @@ public static void registerAllExtensions( "o\022+\n\013credentials\030\002 \001(\0132\026.security.PCrede" + "ntials\022\034\n\024externalCompactionId\030\003 \001(\t\022 \n\006" + "extent\030\004 \001(\0132\020.data.PKeyExtent\022-\n\005stats\030" + - "\005 \001(\0132\036.tabletserver.PCompactionStats\"\317\004" + - "\n\026PExternalCompactionJob\022!\n\024externalComp" + - "actionId\030\001 \001(\tH\000\210\001\001\022%\n\006extent\030\002 \001(\0132\020.da" + - "ta.PKeyExtentH\001\210\001\001\022\'\n\005files\030\003 \003(\0132\030.tabl" + - "etserver.PInputFile\022<\n\020iteratorSettings\030" + - "\004 \001(\0132\035.tabletserver.PIteratorConfigH\002\210\001" + - "\001\022\027\n\noutputFile\030\005 \001(\tH\003\210\001\001\022\035\n\020propagateD" + - "eletes\030\006 \001(\010H\004\210\001\001\0220\n\004kind\030\007 \001(\0162\035.tablet" + - "server.PCompactionKindH\005\210\001\001\022%\n\006fateId\030\010 " + - "\001(\0132\020.manager.PFateIdH\006\210\001\001\022P\n\toverrides\030" + - "\t \003(\0132=.compaction_coordinator.PExternal" + - "CompactionJob.OverridesEntry\0320\n\016Override" + - "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\027" + - "\n\025_externalCompactionIdB\t\n\007_extentB\023\n\021_i" + - "teratorSettingsB\r\n\013_outputFileB\023\n\021_propa" + - "gateDeletesB\007\n\005_kindB\t\n\007_fateId\"i\n\022PNext" + - "CompactionJob\022;\n\003job\030\001 \001(\0132..compaction_" + - "coordinator.PExternalCompactionJob\022\026\n\016co" + - "mpactorCount\030\002 \001(\005\"\312\001\n\027TCompactionStatus" + - "Update\0227\n\005state\030\001 \001(\0162(.compaction_coord" + - "inator.TCompactionState\022\017\n\007message\030\002 \001(\t" + - "\022\034\n\024entriesToBeCompacted\030\003 \001(\003\022\023\n\013entrie" + - "sRead\030\004 \001(\003\022\026\n\016entriesWritten\030\005 \001(\003\022\032\n\022c" + - "ompactionAgeNanos\030\006 \001(\003*h\n\020TCompactionSt" + - "ate\022\014\n\010ASSIGNED\020\000\022\013\n\007STARTED\020\001\022\017\n\013IN_PRO" + - "GRESS\020\002\022\r\n\tSUCCEEDED\020\003\022\n\n\006FAILED\020\004\022\r\n\tCA" + - "NCELLED\020\0052\361\001\n\034CompactionCoordinatorServi" + - "ce\022n\n\020GetCompactionJob\022,.compaction_coor" + - "dinator.CompactionJobRequest\032*.compactio" + - "n_coordinator.PNextCompactionJob\"\000\022a\n\023Co" + - "mpactionCompleted\0222.compaction_coordinat" + - "or.CompactionCompletedRequest\032\026.google.p" + - "rotobuf.EmptyBS\n,org.apache.accumulo.cor" + - "e.compaction.protobufB!CompactionCoordin" + - "atorServiceProtoP\001b\006proto3" + "\005 \001(\0132\036.tabletserver.PCompactionStats\"\342\001" + + "\n\035UpdateCompactionStatusRequest\022\"\n\006ptinf" + + "o\030\001 \001(\0132\022.client.ProtoTInfo\022+\n\013credentia" + + "ls\030\002 \001(\0132\026.security.PCredentials\022\034\n\024exte" + + "rnalCompactionId\030\003 \001(\t\022?\n\006status\030\004 \001(\0132/" + + ".compaction_coordinator.PCompactionStatu" + + "sUpdate\022\021\n\ttimestamp\030\005 \001(\003\"\252\001\n\027Compactio" + + "nFailedRequest\022\"\n\006ptinfo\030\001 \001(\0132\022.client." + + "ProtoTInfo\022+\n\013credentials\030\002 \001(\0132\026.securi" + + "ty.PCredentials\022\034\n\024externalCompactionId\030" + + "\003 \001(\t\022 \n\006extent\030\004 \001(\0132\020.data.PKeyExtent\"" + + "o\n\034GetRunningCompactionsRequest\022\"\n\006ptinf" + + "o\030\001 \001(\0132\022.client.ProtoTInfo\022+\n\013credentia" + + "ls\030\002 \001(\0132\026.security.PCredentials\"q\n\036GetC" + + "ompletedCompactionsRequest\022\"\n\006ptinfo\030\001 \001" + + "(\0132\022.client.ProtoTInfo\022+\n\013credentials\030\002 " + + "\001(\0132\026.security.PCredentials\"~\n\rCancelReq" + + "uest\022\"\n\006ptinfo\030\001 \001(\0132\022.client.ProtoTInfo" + + "\022+\n\013credentials\030\002 \001(\0132\026.security.PCreden" + + "tials\022\034\n\024externalCompactionId\030\003 \001(\t\"\232\002\n\023" + + "PExternalCompaction\022\021\n\tgroupName\030\001 \001(\t\022\021" + + "\n\tcompactor\030\002 \001(\t\022I\n\007updates\030\003 \003(\01328.com" + + "paction_coordinator.PExternalCompaction." + + "UpdatesEntry\0221\n\003job\030\004 \001(\0132$.tabletserver" + + ".PExternalCompactionJob\032_\n\014UpdatesEntry\022" + + "\013\n\003key\030\001 \001(\003\022>\n\005value\030\002 \001(\0132/.compaction" + + "_coordinator.PCompactionStatusUpdate:\0028\001" + + "\"\321\001\n\027PExternalCompactionList\022U\n\013compacti" + + "ons\030\001 \003(\0132@.compaction_coordinator.PExte" + + "rnalCompactionList.CompactionsEntry\032_\n\020C" + + "ompactionsEntry\022\013\n\003key\030\001 \001(\t\022:\n\005value\030\002 " + + "\001(\0132+.compaction_coordinator.PExternalCo" + + "mpaction:\0028\001\"_\n\022PNextCompactionJob\0221\n\003jo" + + "b\030\001 \001(\0132$.tabletserver.PExternalCompacti" + + "onJob\022\026\n\016compactorCount\030\002 \001(\005\"\312\001\n\027PCompa" + + "ctionStatusUpdate\0227\n\005state\030\001 \001(\0162(.compa" + + "ction_coordinator.PCompactionState\022\017\n\007me" + + "ssage\030\002 \001(\t\022\034\n\024entriesToBeCompacted\030\003 \001(" + + "\003\022\023\n\013entriesRead\030\004 \001(\003\022\026\n\016entriesWritten" + + "\030\005 \001(\003\022\032\n\022compactionAgeNanos\030\006 \001(\003*h\n\020PC" + + "ompactionState\022\014\n\010ASSIGNED\020\000\022\013\n\007STARTED\020" + + "\001\022\017\n\013IN_PROGRESS\020\002\022\r\n\tSUCCEEDED\020\003\022\n\n\006FAI" + + "LED\020\004\022\r\n\tCANCELLED\020\0052\203\006\n\034CompactionCoord" + + "inatorService\022l\n\020GetCompactionJob\022,.comp" + + "action_coordinator.CompactionJobRequest\032" + + "*.compaction_coordinator.PNextCompaction" + + "Job\022a\n\023CompactionCompleted\0222.compaction_" + + "coordinator.CompactionCompletedRequest\032\026" + + ".google.protobuf.Empty\022g\n\026UpdateCompacti" + + "onStatus\0225.compaction_coordinator.Update" + + "CompactionStatusRequest\032\026.google.protobu" + + "f.Empty\022[\n\020CompactionFailed\022/.compaction" + + "_coordinator.CompactionFailedRequest\032\026.g" + + "oogle.protobuf.Empty\022~\n\025GetRunningCompac" + + "tions\0224.compaction_coordinator.GetRunnin" + + "gCompactionsRequest\032/.compaction_coordin" + + "ator.PExternalCompactionList\022\202\001\n\027GetComp" + + "letedCompactions\0226.compaction_coordinato" + + "r.GetCompletedCompactionsRequest\032/.compa" + + "ction_coordinator.PExternalCompactionLis" + + "t\022G\n\006Cancel\022%.compaction_coordinator.Can" + + "celRequest\032\026.google.protobuf.EmptyBS\n,or" + + "g.apache.accumulo.core.compaction.protob" + + "ufB!CompactionCoordinatorServiceProtoP\001b" + + "\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -143,29 +208,71 @@ public static void registerAllExtensions( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor, new java.lang.String[] { "Ptinfo", "Credentials", "ExternalCompactionId", "Extent", "Stats", }); - internal_static_compaction_coordinator_PExternalCompactionJob_descriptor = + internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor = getDescriptor().getMessageTypes().get(2); - internal_static_compaction_coordinator_PExternalCompactionJob_fieldAccessorTable = new + internal_static_compaction_coordinator_UpdateCompactionStatusRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor, + new java.lang.String[] { "Ptinfo", "Credentials", "ExternalCompactionId", "Status", "Timestamp", }); + internal_static_compaction_coordinator_CompactionFailedRequest_descriptor = + getDescriptor().getMessageTypes().get(3); + internal_static_compaction_coordinator_CompactionFailedRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_CompactionFailedRequest_descriptor, + new java.lang.String[] { "Ptinfo", "Credentials", "ExternalCompactionId", "Extent", }); + internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor = + getDescriptor().getMessageTypes().get(4); + internal_static_compaction_coordinator_GetRunningCompactionsRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_PExternalCompactionJob_descriptor, - new java.lang.String[] { "ExternalCompactionId", "Extent", "Files", "IteratorSettings", "OutputFile", "PropagateDeletes", "Kind", "FateId", "Overrides", }); - internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_descriptor = - internal_static_compaction_coordinator_PExternalCompactionJob_descriptor.getNestedTypes().get(0); - internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_fieldAccessorTable = new + internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor, + new java.lang.String[] { "Ptinfo", "Credentials", }); + internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor = + getDescriptor().getMessageTypes().get(5); + internal_static_compaction_coordinator_GetCompletedCompactionsRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_descriptor, + internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor, + new java.lang.String[] { "Ptinfo", "Credentials", }); + internal_static_compaction_coordinator_CancelRequest_descriptor = + getDescriptor().getMessageTypes().get(6); + internal_static_compaction_coordinator_CancelRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_CancelRequest_descriptor, + new java.lang.String[] { "Ptinfo", "Credentials", "ExternalCompactionId", }); + internal_static_compaction_coordinator_PExternalCompaction_descriptor = + getDescriptor().getMessageTypes().get(7); + internal_static_compaction_coordinator_PExternalCompaction_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PExternalCompaction_descriptor, + new java.lang.String[] { "GroupName", "Compactor", "Updates", "Job", }); + internal_static_compaction_coordinator_PExternalCompaction_UpdatesEntry_descriptor = + internal_static_compaction_coordinator_PExternalCompaction_descriptor.getNestedTypes().get(0); + internal_static_compaction_coordinator_PExternalCompaction_UpdatesEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PExternalCompaction_UpdatesEntry_descriptor, + new java.lang.String[] { "Key", "Value", }); + internal_static_compaction_coordinator_PExternalCompactionList_descriptor = + getDescriptor().getMessageTypes().get(8); + internal_static_compaction_coordinator_PExternalCompactionList_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PExternalCompactionList_descriptor, + new java.lang.String[] { "Compactions", }); + internal_static_compaction_coordinator_PExternalCompactionList_CompactionsEntry_descriptor = + internal_static_compaction_coordinator_PExternalCompactionList_descriptor.getNestedTypes().get(0); + internal_static_compaction_coordinator_PExternalCompactionList_CompactionsEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_compaction_coordinator_PExternalCompactionList_CompactionsEntry_descriptor, new java.lang.String[] { "Key", "Value", }); internal_static_compaction_coordinator_PNextCompactionJob_descriptor = - getDescriptor().getMessageTypes().get(3); + getDescriptor().getMessageTypes().get(9); internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_compaction_coordinator_PNextCompactionJob_descriptor, new java.lang.String[] { "Job", "CompactorCount", }); - internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor = - getDescriptor().getMessageTypes().get(4); - internal_static_compaction_coordinator_TCompactionStatusUpdate_fieldAccessorTable = new + internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor = + getDescriptor().getMessageTypes().get(10); + internal_static_compaction_coordinator_PCompactionStatusUpdate_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor, + internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor, new java.lang.String[] { "State", "Message", "EntriesToBeCompacted", "EntriesRead", "EntriesWritten", "CompactionAgeNanos", }); com.google.protobuf.EmptyProto.getDescriptor(); org.apache.accumulo.core.compaction.protobuf.SecurityProto.getDescriptor(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequest.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequest.java new file mode 100644 index 00000000000..c9ff80bbb81 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequest.java @@ -0,0 +1,1123 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.CompactionFailedRequest} + */ +public final class CompactionFailedRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.CompactionFailedRequest) + CompactionFailedRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use CompactionFailedRequest.newBuilder() to construct. + private CompactionFailedRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private CompactionFailedRequest() { + externalCompactionId_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new CompactionFailedRequest(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.Builder.class); + } + + private int bitField0_; + public static final int PTINFO_FIELD_NUMBER = 1; + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + @java.lang.Override + public boolean hasPtinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + + public static final int CREDENTIALS_FIELD_NUMBER = 2; + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + @java.lang.Override + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + /** + * .security.PCredentials credentials = 2; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + + public static final int EXTERNALCOMPACTIONID_FIELD_NUMBER = 3; + @SuppressWarnings("serial") + private volatile java.lang.Object externalCompactionId_ = ""; + /** + * string externalCompactionId = 3; + * @return The externalCompactionId. + */ + @java.lang.Override + public java.lang.String getExternalCompactionId() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + externalCompactionId_ = s; + return s; + } + } + /** + * string externalCompactionId = 3; + * @return The bytes for externalCompactionId. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getExternalCompactionIdBytes() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + externalCompactionId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int EXTENT_FIELD_NUMBER = 4; + private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_; + /** + * .data.PKeyExtent extent = 4; + * @return Whether the extent field is set. + */ + @java.lang.Override + public boolean hasExtent() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * .data.PKeyExtent extent = 4; + * @return The extent. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { + return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } + /** + * .data.PKeyExtent extent = 4; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { + return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(1, getPtinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + output.writeMessage(2, getCredentials()); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(externalCompactionId_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, externalCompactionId_); + } + if (((bitField0_ & 0x00000004) != 0)) { + output.writeMessage(4, getExtent()); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getPtinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getCredentials()); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(externalCompactionId_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, externalCompactionId_); + } + if (((bitField0_ & 0x00000004) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, getExtent()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest other = (org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest) obj; + + if (hasPtinfo() != other.hasPtinfo()) return false; + if (hasPtinfo()) { + if (!getPtinfo() + .equals(other.getPtinfo())) return false; + } + if (hasCredentials() != other.hasCredentials()) return false; + if (hasCredentials()) { + if (!getCredentials() + .equals(other.getCredentials())) return false; + } + if (!getExternalCompactionId() + .equals(other.getExternalCompactionId())) return false; + if (hasExtent() != other.hasExtent()) return false; + if (hasExtent()) { + if (!getExtent() + .equals(other.getExtent())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPtinfo()) { + hash = (37 * hash) + PTINFO_FIELD_NUMBER; + hash = (53 * hash) + getPtinfo().hashCode(); + } + if (hasCredentials()) { + hash = (37 * hash) + CREDENTIALS_FIELD_NUMBER; + hash = (53 * hash) + getCredentials().hashCode(); + } + hash = (37 * hash) + EXTERNALCOMPACTIONID_FIELD_NUMBER; + hash = (53 * hash) + getExternalCompactionId().hashCode(); + if (hasExtent()) { + hash = (37 * hash) + EXTENT_FIELD_NUMBER; + hash = (53 * hash) + getExtent().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.CompactionFailedRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.CompactionFailedRequest) + org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getPtinfoFieldBuilder(); + getCredentialsFieldBuilder(); + getExtentFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; + } + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + externalCompactionId_ = ""; + extent_ = null; + if (extentBuilder_ != null) { + extentBuilder_.dispose(); + extentBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest build() { + org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest buildPartial() { + org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest result = new org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.ptinfo_ = ptinfoBuilder_ == null + ? ptinfo_ + : ptinfoBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.credentials_ = credentialsBuilder_ == null + ? credentials_ + : credentialsBuilder_.build(); + to_bitField0_ |= 0x00000002; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.externalCompactionId_ = externalCompactionId_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.extent_ = extentBuilder_ == null + ? extent_ + : extentBuilder_.build(); + to_bitField0_ |= 0x00000004; + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest other) { + if (other == org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.getDefaultInstance()) return this; + if (other.hasPtinfo()) { + mergePtinfo(other.getPtinfo()); + } + if (other.hasCredentials()) { + mergeCredentials(other.getCredentials()); + } + if (!other.getExternalCompactionId().isEmpty()) { + externalCompactionId_ = other.externalCompactionId_; + bitField0_ |= 0x00000004; + onChanged(); + } + if (other.hasExtent()) { + mergeExtent(other.getExtent()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getPtinfoFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + input.readMessage( + getCredentialsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + externalCompactionId_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 34: { + input.readMessage( + getExtentFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000008; + break; + } // case 34 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + public boolean hasPtinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + if (ptinfoBuilder_ == null) { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } else { + return ptinfoBuilder_.getMessage(); + } + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ptinfo_ = value; + } else { + ptinfoBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder setPtinfo( + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) { + if (ptinfoBuilder_ == null) { + ptinfo_ = builderForValue.build(); + } else { + ptinfoBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + ptinfo_ != null && + ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { + getPtinfoBuilder().mergeFrom(value); + } else { + ptinfo_ = value; + } + } else { + ptinfoBuilder_.mergeFrom(value); + } + if (ptinfo_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder clearPtinfo() { + bitField0_ = (bitField0_ & ~0x00000001); + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getPtinfoFieldBuilder().getBuilder(); + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + if (ptinfoBuilder_ != null) { + return ptinfoBuilder_.getMessageOrBuilder(); + } else { + return ptinfo_ == null ? + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> + getPtinfoFieldBuilder() { + if (ptinfoBuilder_ == null) { + ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>( + getPtinfo(), + getParentForChildren(), + isClean()); + ptinfo_ = null; + } + return ptinfoBuilder_; + } + + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + if (credentialsBuilder_ == null) { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } else { + return credentialsBuilder_.getMessage(); + } + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + credentials_ = value; + } else { + credentialsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder setCredentials( + org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) { + if (credentialsBuilder_ == null) { + credentials_ = builderForValue.build(); + } else { + credentialsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0) && + credentials_ != null && + credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) { + getCredentialsBuilder().mergeFrom(value); + } else { + credentials_ = value; + } + } else { + credentialsBuilder_.mergeFrom(value); + } + if (credentials_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder clearCredentials() { + bitField0_ = (bitField0_ & ~0x00000002); + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getCredentialsFieldBuilder().getBuilder(); + } + /** + * .security.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + if (credentialsBuilder_ != null) { + return credentialsBuilder_.getMessageOrBuilder(); + } else { + return credentials_ == null ? + org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + } + /** + * .security.PCredentials credentials = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> + getCredentialsFieldBuilder() { + if (credentialsBuilder_ == null) { + credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>( + getCredentials(), + getParentForChildren(), + isClean()); + credentials_ = null; + } + return credentialsBuilder_; + } + + private java.lang.Object externalCompactionId_ = ""; + /** + * string externalCompactionId = 3; + * @return The externalCompactionId. + */ + public java.lang.String getExternalCompactionId() { + java.lang.Object ref = externalCompactionId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + externalCompactionId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string externalCompactionId = 3; + * @return The bytes for externalCompactionId. + */ + public com.google.protobuf.ByteString + getExternalCompactionIdBytes() { + java.lang.Object ref = externalCompactionId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + externalCompactionId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string externalCompactionId = 3; + * @param value The externalCompactionId to set. + * @return This builder for chaining. + */ + public Builder setExternalCompactionId( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + externalCompactionId_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * string externalCompactionId = 3; + * @return This builder for chaining. + */ + public Builder clearExternalCompactionId() { + externalCompactionId_ = getDefaultInstance().getExternalCompactionId(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + return this; + } + /** + * string externalCompactionId = 3; + * @param value The bytes for externalCompactionId to set. + * @return This builder for chaining. + */ + public Builder setExternalCompactionIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + externalCompactionId_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + + private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> extentBuilder_; + /** + * .data.PKeyExtent extent = 4; + * @return Whether the extent field is set. + */ + public boolean hasExtent() { + return ((bitField0_ & 0x00000008) != 0); + } + /** + * .data.PKeyExtent extent = 4; + * @return The extent. + */ + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { + if (extentBuilder_ == null) { + return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } else { + return extentBuilder_.getMessage(); + } + } + /** + * .data.PKeyExtent extent = 4; + */ + public Builder setExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) { + if (extentBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + extent_ = value; + } else { + extentBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * .data.PKeyExtent extent = 4; + */ + public Builder setExtent( + org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder builderForValue) { + if (extentBuilder_ == null) { + extent_ = builderForValue.build(); + } else { + extentBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * .data.PKeyExtent extent = 4; + */ + public Builder mergeExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) { + if (extentBuilder_ == null) { + if (((bitField0_ & 0x00000008) != 0) && + extent_ != null && + extent_ != org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance()) { + getExtentBuilder().mergeFrom(value); + } else { + extent_ = value; + } + } else { + extentBuilder_.mergeFrom(value); + } + if (extent_ != null) { + bitField0_ |= 0x00000008; + onChanged(); + } + return this; + } + /** + * .data.PKeyExtent extent = 4; + */ + public Builder clearExtent() { + bitField0_ = (bitField0_ & ~0x00000008); + extent_ = null; + if (extentBuilder_ != null) { + extentBuilder_.dispose(); + extentBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .data.PKeyExtent extent = 4; + */ + public org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder getExtentBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getExtentFieldBuilder().getBuilder(); + } + /** + * .data.PKeyExtent extent = 4; + */ + public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { + if (extentBuilder_ != null) { + return extentBuilder_.getMessageOrBuilder(); + } else { + return extent_ == null ? + org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + } + } + /** + * .data.PKeyExtent extent = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> + getExtentFieldBuilder() { + if (extentBuilder_ == null) { + extentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder>( + getExtent(), + getParentForChildren(), + isClean()); + extent_ = null; + } + return extentBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.CompactionFailedRequest) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.CompactionFailedRequest) + private static final org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest(); + } + + public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public CompactionFailedRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequestOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequestOrBuilder.java new file mode 100644 index 00000000000..8882da96c0c --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequestOrBuilder.java @@ -0,0 +1,85 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface CompactionFailedRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.CompactionFailedRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + boolean hasPtinfo(); + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo(); + /** + * .client.ProtoTInfo ptinfo = 1; + */ + org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); + + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + boolean hasCredentials(); + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(); + /** + * .security.PCredentials credentials = 2; + */ + org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); + + /** + * string externalCompactionId = 3; + * @return The externalCompactionId. + */ + java.lang.String getExternalCompactionId(); + /** + * string externalCompactionId = 3; + * @return The bytes for externalCompactionId. + */ + com.google.protobuf.ByteString + getExternalCompactionIdBytes(); + + /** + * .data.PKeyExtent extent = 4; + * @return Whether the extent field is set. + */ + boolean hasExtent(); + /** + * .data.PKeyExtent extent = 4; + * @return The extent. + */ + org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent(); + /** + * .data.PKeyExtent extent = 4; + */ + org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequest.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequest.java new file mode 100644 index 00000000000..8ea94bc8dee --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequest.java @@ -0,0 +1,802 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.GetCompletedCompactionsRequest} + */ +public final class GetCompletedCompactionsRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.GetCompletedCompactionsRequest) + GetCompletedCompactionsRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use GetCompletedCompactionsRequest.newBuilder() to construct. + private GetCompletedCompactionsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private GetCompletedCompactionsRequest() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new GetCompletedCompactionsRequest(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.class, org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.Builder.class); + } + + private int bitField0_; + public static final int PTINFO_FIELD_NUMBER = 1; + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + @java.lang.Override + public boolean hasPtinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + + public static final int CREDENTIALS_FIELD_NUMBER = 2; + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + @java.lang.Override + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + /** + * .security.PCredentials credentials = 2; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(1, getPtinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + output.writeMessage(2, getCredentials()); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getPtinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getCredentials()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest other = (org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest) obj; + + if (hasPtinfo() != other.hasPtinfo()) return false; + if (hasPtinfo()) { + if (!getPtinfo() + .equals(other.getPtinfo())) return false; + } + if (hasCredentials() != other.hasCredentials()) return false; + if (hasCredentials()) { + if (!getCredentials() + .equals(other.getCredentials())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPtinfo()) { + hash = (37 * hash) + PTINFO_FIELD_NUMBER; + hash = (53 * hash) + getPtinfo().hashCode(); + } + if (hasCredentials()) { + hash = (37 * hash) + CREDENTIALS_FIELD_NUMBER; + hash = (53 * hash) + getCredentials().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.GetCompletedCompactionsRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.GetCompletedCompactionsRequest) + org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.class, org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getPtinfoFieldBuilder(); + getCredentialsFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; + } + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest build() { + org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest buildPartial() { + org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest result = new org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.ptinfo_ = ptinfoBuilder_ == null + ? ptinfo_ + : ptinfoBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.credentials_ = credentialsBuilder_ == null + ? credentials_ + : credentialsBuilder_.build(); + to_bitField0_ |= 0x00000002; + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest other) { + if (other == org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.getDefaultInstance()) return this; + if (other.hasPtinfo()) { + mergePtinfo(other.getPtinfo()); + } + if (other.hasCredentials()) { + mergeCredentials(other.getCredentials()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getPtinfoFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + input.readMessage( + getCredentialsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + public boolean hasPtinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + if (ptinfoBuilder_ == null) { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } else { + return ptinfoBuilder_.getMessage(); + } + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ptinfo_ = value; + } else { + ptinfoBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder setPtinfo( + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) { + if (ptinfoBuilder_ == null) { + ptinfo_ = builderForValue.build(); + } else { + ptinfoBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + ptinfo_ != null && + ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { + getPtinfoBuilder().mergeFrom(value); + } else { + ptinfo_ = value; + } + } else { + ptinfoBuilder_.mergeFrom(value); + } + if (ptinfo_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder clearPtinfo() { + bitField0_ = (bitField0_ & ~0x00000001); + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getPtinfoFieldBuilder().getBuilder(); + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + if (ptinfoBuilder_ != null) { + return ptinfoBuilder_.getMessageOrBuilder(); + } else { + return ptinfo_ == null ? + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> + getPtinfoFieldBuilder() { + if (ptinfoBuilder_ == null) { + ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>( + getPtinfo(), + getParentForChildren(), + isClean()); + ptinfo_ = null; + } + return ptinfoBuilder_; + } + + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + if (credentialsBuilder_ == null) { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } else { + return credentialsBuilder_.getMessage(); + } + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + credentials_ = value; + } else { + credentialsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder setCredentials( + org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) { + if (credentialsBuilder_ == null) { + credentials_ = builderForValue.build(); + } else { + credentialsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0) && + credentials_ != null && + credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) { + getCredentialsBuilder().mergeFrom(value); + } else { + credentials_ = value; + } + } else { + credentialsBuilder_.mergeFrom(value); + } + if (credentials_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder clearCredentials() { + bitField0_ = (bitField0_ & ~0x00000002); + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getCredentialsFieldBuilder().getBuilder(); + } + /** + * .security.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + if (credentialsBuilder_ != null) { + return credentialsBuilder_.getMessageOrBuilder(); + } else { + return credentials_ == null ? + org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + } + /** + * .security.PCredentials credentials = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> + getCredentialsFieldBuilder() { + if (credentialsBuilder_ == null) { + credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>( + getCredentials(), + getParentForChildren(), + isClean()); + credentials_ = null; + } + return credentialsBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.GetCompletedCompactionsRequest) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.GetCompletedCompactionsRequest) + private static final org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest(); + } + + public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public GetCompletedCompactionsRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequestOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequestOrBuilder.java new file mode 100644 index 00000000000..1ff2b59f2b6 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequestOrBuilder.java @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface GetCompletedCompactionsRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.GetCompletedCompactionsRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + boolean hasPtinfo(); + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo(); + /** + * .client.ProtoTInfo ptinfo = 1; + */ + org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); + + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + boolean hasCredentials(); + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(); + /** + * .security.PCredentials credentials = 2; + */ + org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequest.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequest.java new file mode 100644 index 00000000000..f8c5e8068f1 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequest.java @@ -0,0 +1,802 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +/** + * Protobuf type {@code compaction_coordinator.GetRunningCompactionsRequest} + */ +public final class GetRunningCompactionsRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:compaction_coordinator.GetRunningCompactionsRequest) + GetRunningCompactionsRequestOrBuilder { +private static final long serialVersionUID = 0L; + // Use GetRunningCompactionsRequest.newBuilder() to construct. + private GetRunningCompactionsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private GetRunningCompactionsRequest() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new GetRunningCompactionsRequest(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.class, org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.Builder.class); + } + + private int bitField0_; + public static final int PTINFO_FIELD_NUMBER = 1; + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + @java.lang.Override + public boolean hasPtinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + + public static final int CREDENTIALS_FIELD_NUMBER = 2; + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + @java.lang.Override + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + /** + * .security.PCredentials credentials = 2; + */ + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(1, getPtinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + output.writeMessage(2, getCredentials()); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getPtinfo()); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getCredentials()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest)) { + return super.equals(obj); + } + org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest other = (org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest) obj; + + if (hasPtinfo() != other.hasPtinfo()) return false; + if (hasPtinfo()) { + if (!getPtinfo() + .equals(other.getPtinfo())) return false; + } + if (hasCredentials() != other.hasCredentials()) return false; + if (hasCredentials()) { + if (!getCredentials() + .equals(other.getCredentials())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPtinfo()) { + hash = (37 * hash) + PTINFO_FIELD_NUMBER; + hash = (53 * hash) + getPtinfo().hashCode(); + } + if (hasCredentials()) { + hash = (37 * hash) + CREDENTIALS_FIELD_NUMBER; + hash = (53 * hash) + getCredentials().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code compaction_coordinator.GetRunningCompactionsRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:compaction_coordinator.GetRunningCompactionsRequest) + org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.class, org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.Builder.class); + } + + // Construct using org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getPtinfoFieldBuilder(); + getCredentialsFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; + } + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest getDefaultInstanceForType() { + return org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.getDefaultInstance(); + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest build() { + org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest buildPartial() { + org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest result = new org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.ptinfo_ = ptinfoBuilder_ == null + ? ptinfo_ + : ptinfoBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.credentials_ = credentialsBuilder_ == null + ? credentials_ + : credentialsBuilder_.build(); + to_bitField0_ |= 0x00000002; + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest) { + return mergeFrom((org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest other) { + if (other == org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.getDefaultInstance()) return this; + if (other.hasPtinfo()) { + mergePtinfo(other.getPtinfo()); + } + if (other.hasCredentials()) { + mergeCredentials(other.getCredentials()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getPtinfoFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + input.readMessage( + getCredentialsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + public boolean hasPtinfo() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + if (ptinfoBuilder_ == null) { + return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } else { + return ptinfoBuilder_.getMessage(); + } + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ptinfo_ = value; + } else { + ptinfoBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder setPtinfo( + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) { + if (ptinfoBuilder_ == null) { + ptinfo_ = builderForValue.build(); + } else { + ptinfoBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + if (ptinfoBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + ptinfo_ != null && + ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { + getPtinfoBuilder().mergeFrom(value); + } else { + ptinfo_ = value; + } + } else { + ptinfoBuilder_.mergeFrom(value); + } + if (ptinfo_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public Builder clearPtinfo() { + bitField0_ = (bitField0_ & ~0x00000001); + ptinfo_ = null; + if (ptinfoBuilder_ != null) { + ptinfoBuilder_.dispose(); + ptinfoBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getPtinfoFieldBuilder().getBuilder(); + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + if (ptinfoBuilder_ != null) { + return ptinfoBuilder_.getMessageOrBuilder(); + } else { + return ptinfo_ == null ? + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + } + } + /** + * .client.ProtoTInfo ptinfo = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> + getPtinfoFieldBuilder() { + if (ptinfoBuilder_ == null) { + ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>( + getPtinfo(), + getParentForChildren(), + isClean()); + ptinfo_ = null; + } + return ptinfoBuilder_; + } + + private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + public boolean hasCredentials() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + if (credentialsBuilder_ == null) { + return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } else { + return credentialsBuilder_.getMessage(); + } + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + credentials_ = value; + } else { + credentialsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder setCredentials( + org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) { + if (credentialsBuilder_ == null) { + credentials_ = builderForValue.build(); + } else { + credentialsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + if (credentialsBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0) && + credentials_ != null && + credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) { + getCredentialsBuilder().mergeFrom(value); + } else { + credentials_ = value; + } + } else { + credentialsBuilder_.mergeFrom(value); + } + if (credentials_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public Builder clearCredentials() { + bitField0_ = (bitField0_ & ~0x00000002); + credentials_ = null; + if (credentialsBuilder_ != null) { + credentialsBuilder_.dispose(); + credentialsBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .security.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getCredentialsFieldBuilder().getBuilder(); + } + /** + * .security.PCredentials credentials = 2; + */ + public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + if (credentialsBuilder_ != null) { + return credentialsBuilder_.getMessageOrBuilder(); + } else { + return credentials_ == null ? + org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + } + } + /** + * .security.PCredentials credentials = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> + getCredentialsFieldBuilder() { + if (credentialsBuilder_ == null) { + credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>( + getCredentials(), + getParentForChildren(), + isClean()); + credentials_ = null; + } + return credentialsBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:compaction_coordinator.GetRunningCompactionsRequest) + } + + // @@protoc_insertion_point(class_scope:compaction_coordinator.GetRunningCompactionsRequest) + private static final org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest(); + } + + public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public GetRunningCompactionsRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequestOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequestOrBuilder.java new file mode 100644 index 00000000000..eb553f41e99 --- /dev/null +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequestOrBuilder.java @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compaction-coordinator.proto + +// Protobuf Java Version: 3.25.3 +package org.apache.accumulo.core.compaction.protobuf; + +public interface GetRunningCompactionsRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:compaction_coordinator.GetRunningCompactionsRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * .client.ProtoTInfo ptinfo = 1; + * @return Whether the ptinfo field is set. + */ + boolean hasPtinfo(); + /** + * .client.ProtoTInfo ptinfo = 1; + * @return The ptinfo. + */ + org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo(); + /** + * .client.ProtoTInfo ptinfo = 1; + */ + org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); + + /** + * .security.PCredentials credentials = 2; + * @return Whether the credentials field is set. + */ + boolean hasCredentials(); + /** + * .security.PCredentials credentials = 2; + * @return The credentials. + */ + org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(); + /** + * .security.PCredentials credentials = 2; + */ + org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); +} diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionState.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionState.java similarity index 89% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionState.java rename to core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionState.java index c1d414a1a6d..afeed373b97 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionState.java +++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionState.java @@ -23,9 +23,9 @@ package org.apache.accumulo.core.compaction.protobuf; /** - * Protobuf enum {@code compaction_coordinator.TCompactionState} + * Protobuf enum {@code compaction_coordinator.PCompactionState} */ -public enum TCompactionState +public enum PCompactionState implements com.google.protobuf.ProtocolMessageEnum { /** * 
@@ -142,7 +142,7 @@ public final int getNumber() {
    * @deprecated Use {@link #forNumber(int)} instead.
    */
   @java.lang.Deprecated
-  public static TCompactionState valueOf(int value) {
+  public static PCompactionState valueOf(int value) {
     return forNumber(value);
   }
 
@@ -150,7 +150,7 @@ public static TCompactionState valueOf(int value) {
    * @param value The numeric wire value of the corresponding enum entry.
    * @return The enum associated with the given numeric wire value.
    */
-  public static TCompactionState forNumber(int value) {
+  public static PCompactionState forNumber(int value) {
     switch (value) {
       case 0: return ASSIGNED;
       case 1: return STARTED;
@@ -162,15 +162,15 @@ public static TCompactionState forNumber(int value) {
     }
   }
 
-  public static com.google.protobuf.Internal.EnumLiteMap
+  public static com.google.protobuf.Internal.EnumLiteMap
       internalGetValueMap() {
     return internalValueMap;
   }
   private static final com.google.protobuf.Internal.EnumLiteMap<
-      TCompactionState> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap() {
-          public TCompactionState findValueByNumber(int number) {
-            return TCompactionState.forNumber(number);
+      PCompactionState> internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public PCompactionState findValueByNumber(int number) {
+            return PCompactionState.forNumber(number);
           }
         };
 
@@ -191,9 +191,9 @@ public TCompactionState findValueByNumber(int number) {
     return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.getDescriptor().getEnumTypes().get(0);
   }
 
-  private static final TCompactionState[] VALUES = values();
+  private static final PCompactionState[] VALUES = values();
 
-  public static TCompactionState valueOf(
+  public static PCompactionState valueOf(
       com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
     if (desc.getType() != getDescriptor()) {
       throw new java.lang.IllegalArgumentException(
@@ -207,10 +207,10 @@ public static TCompactionState valueOf(
 
   private final int value;
 
-  private TCompactionState(int value) {
+  private PCompactionState(int value) {
     this.value = value;
   }
 
-  // @@protoc_insertion_point(enum_scope:compaction_coordinator.TCompactionState)
+  // @@protoc_insertion_point(enum_scope:compaction_coordinator.PCompactionState)
 }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdate.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdate.java
similarity index 86%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdate.java
rename to core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdate.java
index 9942af499dc..f6a8d374534 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdate.java
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdate.java
@@ -23,18 +23,18 @@
 package org.apache.accumulo.core.compaction.protobuf;
 
 /**
- * Protobuf type {@code compaction_coordinator.TCompactionStatusUpdate}
+ * Protobuf type {@code compaction_coordinator.PCompactionStatusUpdate}
  */
-public final class TCompactionStatusUpdate extends
+public final class PCompactionStatusUpdate extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:compaction_coordinator.TCompactionStatusUpdate)
-    TCompactionStatusUpdateOrBuilder {
+    // @@protoc_insertion_point(message_implements:compaction_coordinator.PCompactionStatusUpdate)
+    PCompactionStatusUpdateOrBuilder {
 private static final long serialVersionUID = 0L;
-  // Use TCompactionStatusUpdate.newBuilder() to construct.
-  private TCompactionStatusUpdate(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+  // Use PCompactionStatusUpdate.newBuilder() to construct.
+  private PCompactionStatusUpdate(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private TCompactionStatusUpdate() {
+  private PCompactionStatusUpdate() {
     state_ = 0;
     message_ = "";
   }
@@ -43,38 +43,38 @@ private TCompactionStatusUpdate() {
   @SuppressWarnings({"unused"})
   protected java.lang.Object newInstance(
       UnusedPrivateParameter unused) {
-    return new TCompactionStatusUpdate();
+    return new PCompactionStatusUpdate();
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor;
+    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_TCompactionStatusUpdate_fieldAccessorTable
+    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.class, org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.Builder.class);
+            org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.class, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder.class);
   }
 
   public static final int STATE_FIELD_NUMBER = 1;
   private int state_ = 0;
   /**
-   * .compaction_coordinator.TCompactionState state = 1;
+   * .compaction_coordinator.PCompactionState state = 1;
    * @return The enum numeric value on the wire for state.
    */
   @java.lang.Override public int getStateValue() {
     return state_;
   }
   /**
-   * .compaction_coordinator.TCompactionState state = 1;
+   * .compaction_coordinator.PCompactionState state = 1;
    * @return The state.
    */
-  @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.TCompactionState getState() {
-    org.apache.accumulo.core.compaction.protobuf.TCompactionState result = org.apache.accumulo.core.compaction.protobuf.TCompactionState.forNumber(state_);
-    return result == null ? org.apache.accumulo.core.compaction.protobuf.TCompactionState.UNRECOGNIZED : result;
+  @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PCompactionState getState() {
+    org.apache.accumulo.core.compaction.protobuf.PCompactionState result = org.apache.accumulo.core.compaction.protobuf.PCompactionState.forNumber(state_);
+    return result == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionState.UNRECOGNIZED : result;
   }
 
   public static final int MESSAGE_FIELD_NUMBER = 2;
@@ -174,7 +174,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (state_ != org.apache.accumulo.core.compaction.protobuf.TCompactionState.ASSIGNED.getNumber()) {
+    if (state_ != org.apache.accumulo.core.compaction.protobuf.PCompactionState.ASSIGNED.getNumber()) {
       output.writeEnum(1, state_);
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) {
@@ -201,7 +201,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (state_ != org.apache.accumulo.core.compaction.protobuf.TCompactionState.ASSIGNED.getNumber()) {
+    if (state_ != org.apache.accumulo.core.compaction.protobuf.PCompactionState.ASSIGNED.getNumber()) {
       size += com.google.protobuf.CodedOutputStream
         .computeEnumSize(1, state_);
     }
@@ -234,10 +234,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate)) {
+    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate other = (org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate) obj;
+    org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate other = (org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) obj;
 
     if (state_ != other.state_) return false;
     if (!getMessage()
@@ -282,44 +282,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(byte[] data)
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -327,26 +327,26 @@ public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpda
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseDelimitedFrom(
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate parseFrom(
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -359,7 +359,7 @@ public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpda
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate prototype) {
+  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -375,26 +375,26 @@ protected Builder newBuilderForType(
     return builder;
   }
   /**
-   * Protobuf type {@code compaction_coordinator.TCompactionStatusUpdate}
+   * Protobuf type {@code compaction_coordinator.PCompactionStatusUpdate}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:compaction_coordinator.TCompactionStatusUpdate)
-      org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdateOrBuilder {
+      // @@protoc_insertion_point(builder_implements:compaction_coordinator.PCompactionStatusUpdate)
+      org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor;
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_TCompactionStatusUpdate_fieldAccessorTable
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.class, org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.Builder.class);
+              org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.class, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.newBuilder()
+    // Construct using org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.newBuilder()
     private Builder() {
 
     }
@@ -420,17 +420,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_TCompactionStatusUpdate_descriptor;
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.getDefaultInstance();
+    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getDefaultInstanceForType() {
+      return org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate build() {
-      org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate result = buildPartial();
+    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate build() {
+      org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -438,14 +438,14 @@ public org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate buil
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate result = new org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate(this);
+    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate buildPartial() {
+      org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate result = new org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate result) {
+    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.state_ = state_;
@@ -501,16 +501,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate)other);
+      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) {
+        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate other) {
+      if (other == org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance()) return this;
       if (other.state_ != 0) {
         setStateValue(other.getStateValue());
       }
@@ -606,14 +606,14 @@ public Builder mergeFrom(
 
     private int state_ = 0;
     /**
-     * .compaction_coordinator.TCompactionState state = 1;
+     * .compaction_coordinator.PCompactionState state = 1;
      * @return The enum numeric value on the wire for state.
      */
     @java.lang.Override public int getStateValue() {
       return state_;
     }
     /**
-     * .compaction_coordinator.TCompactionState state = 1;
+     * .compaction_coordinator.PCompactionState state = 1;
      * @param value The enum numeric value on the wire for state to set.
      * @return This builder for chaining.
      */
@@ -624,20 +624,20 @@ public Builder setStateValue(int value) {
       return this;
     }
     /**
-     * .compaction_coordinator.TCompactionState state = 1;
+     * .compaction_coordinator.PCompactionState state = 1;
      * @return The state.
      */
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.TCompactionState getState() {
-      org.apache.accumulo.core.compaction.protobuf.TCompactionState result = org.apache.accumulo.core.compaction.protobuf.TCompactionState.forNumber(state_);
-      return result == null ? org.apache.accumulo.core.compaction.protobuf.TCompactionState.UNRECOGNIZED : result;
+    public org.apache.accumulo.core.compaction.protobuf.PCompactionState getState() {
+      org.apache.accumulo.core.compaction.protobuf.PCompactionState result = org.apache.accumulo.core.compaction.protobuf.PCompactionState.forNumber(state_);
+      return result == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionState.UNRECOGNIZED : result;
     }
     /**
-     * .compaction_coordinator.TCompactionState state = 1;
+     * .compaction_coordinator.PCompactionState state = 1;
      * @param value The state to set.
      * @return This builder for chaining.
      */
-    public Builder setState(org.apache.accumulo.core.compaction.protobuf.TCompactionState value) {
+    public Builder setState(org.apache.accumulo.core.compaction.protobuf.PCompactionState value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -647,7 +647,7 @@ public Builder setState(org.apache.accumulo.core.compaction.protobuf.TCompaction
       return this;
     }
     /**
-     * .compaction_coordinator.TCompactionState state = 1;
+     * .compaction_coordinator.PCompactionState state = 1;
      * @return This builder for chaining.
      */
     public Builder clearState() {
@@ -869,23 +869,23 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:compaction_coordinator.TCompactionStatusUpdate)
+    // @@protoc_insertion_point(builder_scope:compaction_coordinator.PCompactionStatusUpdate)
   }
 
-  // @@protoc_insertion_point(class_scope:compaction_coordinator.TCompactionStatusUpdate)
-  private static final org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate DEFAULT_INSTANCE;
+  // @@protoc_insertion_point(class_scope:compaction_coordinator.PCompactionStatusUpdate)
+  private static final org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate();
+    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate getDefaultInstance() {
+  public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
     @java.lang.Override
-    public TCompactionStatusUpdate parsePartialFrom(
+    public PCompactionStatusUpdate parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -904,17 +904,17 @@ public TCompactionStatusUpdate parsePartialFrom(
     }
   };
 
-  public static com.google.protobuf.Parser parser() {
+  public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
   @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
+  public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.TCompactionStatusUpdate getDefaultInstanceForType() {
+  public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdateOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdateOrBuilder.java
similarity index 87%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdateOrBuilder.java
rename to core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdateOrBuilder.java
index 884784bd30b..a5344feddda 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TCompactionStatusUpdateOrBuilder.java
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdateOrBuilder.java
@@ -22,20 +22,20 @@
 // Protobuf Java Version: 3.25.3
 package org.apache.accumulo.core.compaction.protobuf;
 
-public interface TCompactionStatusUpdateOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:compaction_coordinator.TCompactionStatusUpdate)
+public interface PCompactionStatusUpdateOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:compaction_coordinator.PCompactionStatusUpdate)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * .compaction_coordinator.TCompactionState state = 1;
+   * .compaction_coordinator.PCompactionState state = 1;
    * @return The enum numeric value on the wire for state.
    */
   int getStateValue();
   /**
-   * .compaction_coordinator.TCompactionState state = 1;
+   * .compaction_coordinator.PCompactionState state = 1;
    * @return The state.
    */
-  org.apache.accumulo.core.compaction.protobuf.TCompactionState getState();
+  org.apache.accumulo.core.compaction.protobuf.PCompactionState getState();
 
   /**
    * string message = 2;
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompaction.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompaction.java
new file mode 100644
index 00000000000..eeaff5a7063
--- /dev/null
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompaction.java
@@ -0,0 +1,1195 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: compaction-coordinator.proto
+
+// Protobuf Java Version: 3.25.3
+package org.apache.accumulo.core.compaction.protobuf;
+
+/**
+ * Protobuf type {@code compaction_coordinator.PExternalCompaction}
+ */
+public final class PExternalCompaction extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:compaction_coordinator.PExternalCompaction)
+    PExternalCompactionOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use PExternalCompaction.newBuilder() to construct.
+  private PExternalCompaction(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private PExternalCompaction() {
+    groupName_ = "";
+    compactor_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new PExternalCompaction();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_descriptor;
+  }
+
+  @SuppressWarnings({"rawtypes"})
+  @java.lang.Override
+  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+      int number) {
+    switch (number) {
+      case 3:
+        return internalGetUpdates();
+      default:
+        throw new RuntimeException(
+            "Invalid map field number: " + number);
+    }
+  }
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int GROUPNAME_FIELD_NUMBER = 1;
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object groupName_ = "";
+  /**
+   * string groupName = 1;
+   * @return The groupName.
+   */
+  @java.lang.Override
+  public java.lang.String getGroupName() {
+    java.lang.Object ref = groupName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      groupName_ = s;
+      return s;
+    }
+  }
+  /**
+   * string groupName = 1;
+   * @return The bytes for groupName.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString
+      getGroupNameBytes() {
+    java.lang.Object ref = groupName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      groupName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int COMPACTOR_FIELD_NUMBER = 2;
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object compactor_ = "";
+  /**
+   * string compactor = 2;
+   * @return The compactor.
+   */
+  @java.lang.Override
+  public java.lang.String getCompactor() {
+    java.lang.Object ref = compactor_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      compactor_ = s;
+      return s;
+    }
+  }
+  /**
+   * string compactor = 2;
+   * @return The bytes for compactor.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString
+      getCompactorBytes() {
+    java.lang.Object ref = compactor_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      compactor_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int UPDATES_FIELD_NUMBER = 3;
+  private static final class UpdatesDefaultEntryHolder {
+    static final com.google.protobuf.MapEntry<
+        java.lang.Long, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate> defaultEntry =
+            com.google.protobuf.MapEntry
+            .newDefaultInstance(
+                org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_UpdatesEntry_descriptor, 
+                com.google.protobuf.WireFormat.FieldType.INT64,
+                0L,
+                com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance());
+  }
+  @SuppressWarnings("serial")
+  private com.google.protobuf.MapField<
+      java.lang.Long, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate> updates_;
+  private com.google.protobuf.MapField
+  internalGetUpdates() {
+    if (updates_ == null) {
+      return com.google.protobuf.MapField.emptyMapField(
+          UpdatesDefaultEntryHolder.defaultEntry);
+    }
+    return updates_;
+  }
+  public int getUpdatesCount() {
+    return internalGetUpdates().getMap().size();
+  }
+  /**
+   * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+   */
+  @java.lang.Override
+  public boolean containsUpdates(
+      long key) {
+
+    return internalGetUpdates().getMap().containsKey(key);
+  }
+  /**
+   * Use {@link #getUpdatesMap()} instead.
+   */
+  @java.lang.Override
+  @java.lang.Deprecated
+  public java.util.Map getUpdates() {
+    return getUpdatesMap();
+  }
+  /**
+   * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+   */
+  @java.lang.Override
+  public java.util.Map getUpdatesMap() {
+    return internalGetUpdates().getMap();
+  }
+  /**
+   * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+   */
+  @java.lang.Override
+  public /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrDefault(
+      long key,
+      /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate defaultValue) {
+
+    java.util.Map map =
+        internalGetUpdates().getMap();
+    return map.containsKey(key) ? map.get(key) : defaultValue;
+  }
+  /**
+   * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+   */
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrThrow(
+      long key) {
+
+    java.util.Map map =
+        internalGetUpdates().getMap();
+    if (!map.containsKey(key)) {
+      throw new java.lang.IllegalArgumentException();
+    }
+    return map.get(key);
+  }
+
+  public static final int JOB_FIELD_NUMBER = 4;
+  private org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob job_;
+  /**
+   * .tabletserver.PExternalCompactionJob job = 4;
+   * @return Whether the job field is set.
+   */
+  @java.lang.Override
+  public boolean hasJob() {
+    return ((bitField0_ & 0x00000001) != 0);
+  }
+  /**
+   * .tabletserver.PExternalCompactionJob job = 4;
+   * @return The job.
+   */
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob() {
+    return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+  }
+  /**
+   * .tabletserver.PExternalCompactionJob job = 4;
+   */
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
+    return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(groupName_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, groupName_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(compactor_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, compactor_);
+    }
+    com.google.protobuf.GeneratedMessageV3
+      .serializeLongMapTo(
+        output,
+        internalGetUpdates(),
+        UpdatesDefaultEntryHolder.defaultEntry,
+        3);
+    if (((bitField0_ & 0x00000001) != 0)) {
+      output.writeMessage(4, getJob());
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(groupName_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, groupName_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(compactor_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, compactor_);
+    }
+    for (java.util.Map.Entry entry
+         : internalGetUpdates().getMap().entrySet()) {
+      com.google.protobuf.MapEntry
+      updates__ = UpdatesDefaultEntryHolder.defaultEntry.newBuilderForType()
+          .setKey(entry.getKey())
+          .setValue(entry.getValue())
+          .build();
+      size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, updates__);
+    }
+    if (((bitField0_ & 0x00000001) != 0)) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(4, getJob());
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompaction)) {
+      return super.equals(obj);
+    }
+    org.apache.accumulo.core.compaction.protobuf.PExternalCompaction other = (org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) obj;
+
+    if (!getGroupName()
+        .equals(other.getGroupName())) return false;
+    if (!getCompactor()
+        .equals(other.getCompactor())) return false;
+    if (!internalGetUpdates().equals(
+        other.internalGetUpdates())) return false;
+    if (hasJob() != other.hasJob()) return false;
+    if (hasJob()) {
+      if (!getJob()
+          .equals(other.getJob())) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + GROUPNAME_FIELD_NUMBER;
+    hash = (53 * hash) + getGroupName().hashCode();
+    hash = (37 * hash) + COMPACTOR_FIELD_NUMBER;
+    hash = (53 * hash) + getCompactor().hashCode();
+    if (!internalGetUpdates().getMap().isEmpty()) {
+      hash = (37 * hash) + UPDATES_FIELD_NUMBER;
+      hash = (53 * hash) + internalGetUpdates().hashCode();
+    }
+    if (hasJob()) {
+      hash = (37 * hash) + JOB_FIELD_NUMBER;
+      hash = (53 * hash) + getJob().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PExternalCompaction prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * Protobuf type {@code compaction_coordinator.PExternalCompaction}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:compaction_coordinator.PExternalCompaction)
+      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+        int number) {
+      switch (number) {
+        case 3:
+          return internalGetUpdates();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
+        int number) {
+      switch (number) {
+        case 3:
+          return internalGetMutableUpdates();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder.class);
+    }
+
+    // Construct using org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getJobFieldBuilder();
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      groupName_ = "";
+      compactor_ = "";
+      internalGetMutableUpdates().clear();
+      job_ = null;
+      if (jobBuilder_ != null) {
+        jobBuilder_.dispose();
+        jobBuilder_ = null;
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_descriptor;
+    }
+
+    @java.lang.Override
+    public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getDefaultInstanceForType() {
+      return org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction build() {
+      org.apache.accumulo.core.compaction.protobuf.PExternalCompaction result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction buildPartial() {
+      org.apache.accumulo.core.compaction.protobuf.PExternalCompaction result = new org.apache.accumulo.core.compaction.protobuf.PExternalCompaction(this);
+      if (bitField0_ != 0) { buildPartial0(result); }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PExternalCompaction result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.groupName_ = groupName_;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.compactor_ = compactor_;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.updates_ = internalGetUpdates().build(UpdatesDefaultEntryHolder.defaultEntry);
+      }
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.job_ = jobBuilder_ == null
+            ? job_
+            : jobBuilder_.build();
+        to_bitField0_ |= 0x00000001;
+      }
+      result.bitField0_ |= to_bitField0_;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) {
+        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PExternalCompaction)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PExternalCompaction other) {
+      if (other == org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.getDefaultInstance()) return this;
+      if (!other.getGroupName().isEmpty()) {
+        groupName_ = other.groupName_;
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
+      if (!other.getCompactor().isEmpty()) {
+        compactor_ = other.compactor_;
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
+      internalGetMutableUpdates().mergeFrom(
+          other.internalGetUpdates());
+      bitField0_ |= 0x00000004;
+      if (other.hasJob()) {
+        mergeJob(other.getJob());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              groupName_ = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000001;
+              break;
+            } // case 10
+            case 18: {
+              compactor_ = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000002;
+              break;
+            } // case 18
+            case 26: {
+              com.google.protobuf.MapEntry
+              updates__ = input.readMessage(
+                  UpdatesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              internalGetMutableUpdates().ensureBuilderMap().put(
+                  updates__.getKey(), updates__.getValue());
+              bitField0_ |= 0x00000004;
+              break;
+            } // case 26
+            case 34: {
+              input.readMessage(
+                  getJobFieldBuilder().getBuilder(),
+                  extensionRegistry);
+              bitField0_ |= 0x00000008;
+              break;
+            } // case 34
+            default: {
+              if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                done = true; // was an endgroup tag
+              }
+              break;
+            } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+    private int bitField0_;
+
+    private java.lang.Object groupName_ = "";
+    /**
+     * string groupName = 1;
+     * @return The groupName.
+     */
+    public java.lang.String getGroupName() {
+      java.lang.Object ref = groupName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        groupName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * string groupName = 1;
+     * @return The bytes for groupName.
+     */
+    public com.google.protobuf.ByteString
+        getGroupNameBytes() {
+      java.lang.Object ref = groupName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        groupName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * string groupName = 1;
+     * @param value The groupName to set.
+     * @return This builder for chaining.
+     */
+    public Builder setGroupName(
+        java.lang.String value) {
+      if (value == null) { throw new NullPointerException(); }
+      groupName_ = value;
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     * string groupName = 1;
+     * @return This builder for chaining.
+     */
+    public Builder clearGroupName() {
+      groupName_ = getDefaultInstance().getGroupName();
+      bitField0_ = (bitField0_ & ~0x00000001);
+      onChanged();
+      return this;
+    }
+    /**
+     * string groupName = 1;
+     * @param value The bytes for groupName to set.
+     * @return This builder for chaining.
+     */
+    public Builder setGroupNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) { throw new NullPointerException(); }
+      checkByteStringIsUtf8(value);
+      groupName_ = value;
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object compactor_ = "";
+    /**
+     * string compactor = 2;
+     * @return The compactor.
+     */
+    public java.lang.String getCompactor() {
+      java.lang.Object ref = compactor_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        compactor_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * string compactor = 2;
+     * @return The bytes for compactor.
+     */
+    public com.google.protobuf.ByteString
+        getCompactorBytes() {
+      java.lang.Object ref = compactor_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        compactor_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * string compactor = 2;
+     * @param value The compactor to set.
+     * @return This builder for chaining.
+     */
+    public Builder setCompactor(
+        java.lang.String value) {
+      if (value == null) { throw new NullPointerException(); }
+      compactor_ = value;
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     * string compactor = 2;
+     * @return This builder for chaining.
+     */
+    public Builder clearCompactor() {
+      compactor_ = getDefaultInstance().getCompactor();
+      bitField0_ = (bitField0_ & ~0x00000002);
+      onChanged();
+      return this;
+    }
+    /**
+     * string compactor = 2;
+     * @param value The bytes for compactor to set.
+     * @return This builder for chaining.
+     */
+    public Builder setCompactorBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) { throw new NullPointerException(); }
+      checkByteStringIsUtf8(value);
+      compactor_ = value;
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+
+    private static final class UpdatesConverter implements com.google.protobuf.MapFieldBuilder.Converter {
+      @java.lang.Override
+      public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate build(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder val) {
+        if (val instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) { return (org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) val; }
+        return ((org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder) val).build();
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.MapEntry defaultEntry() {
+        return UpdatesDefaultEntryHolder.defaultEntry;
+      }
+    };
+    private static final UpdatesConverter updatesConverter = new UpdatesConverter();
+
+    private com.google.protobuf.MapFieldBuilder<
+        java.lang.Long, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder> updates_;
+    private com.google.protobuf.MapFieldBuilder
+        internalGetUpdates() {
+      if (updates_ == null) {
+        return new com.google.protobuf.MapFieldBuilder<>(updatesConverter);
+      }
+      return updates_;
+    }
+    private com.google.protobuf.MapFieldBuilder
+        internalGetMutableUpdates() {
+      if (updates_ == null) {
+        updates_ = new com.google.protobuf.MapFieldBuilder<>(updatesConverter);
+      }
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return updates_;
+    }
+    public int getUpdatesCount() {
+      return internalGetUpdates().ensureBuilderMap().size();
+    }
+    /**
+     * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+     */
+    @java.lang.Override
+    public boolean containsUpdates(
+        long key) {
+
+      return internalGetUpdates().ensureBuilderMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getUpdatesMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map getUpdates() {
+      return getUpdatesMap();
+    }
+    /**
+     * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+     */
+    @java.lang.Override
+    public java.util.Map getUpdatesMap() {
+      return internalGetUpdates().getImmutableMap();
+    }
+    /**
+     * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+     */
+    @java.lang.Override
+    public /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrDefault(
+        long key,
+        /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate defaultValue) {
+
+      java.util.Map map = internalGetMutableUpdates().ensureBuilderMap();
+      return map.containsKey(key) ? updatesConverter.build(map.get(key)) : defaultValue;
+    }
+    /**
+     * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+     */
+    @java.lang.Override
+    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrThrow(
+        long key) {
+
+      java.util.Map map = internalGetMutableUpdates().ensureBuilderMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return updatesConverter.build(map.get(key));
+    }
+    public Builder clearUpdates() {
+      bitField0_ = (bitField0_ & ~0x00000004);
+      internalGetMutableUpdates().clear();
+      return this;
+    }
+    /**
+     * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+     */
+    public Builder removeUpdates(
+        long key) {
+
+      internalGetMutableUpdates().ensureBuilderMap()
+          .remove(key);
+      return this;
+    }
+    /**
+     * Use alternate mutation accessors instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map
+        getMutableUpdates() {
+      bitField0_ |= 0x00000004;
+      return internalGetMutableUpdates().ensureMessageMap();
+    }
+    /**
+     * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+     */
+    public Builder putUpdates(
+        long key,
+        org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate value) {
+
+      if (value == null) { throw new NullPointerException("map value"); }
+      internalGetMutableUpdates().ensureBuilderMap()
+          .put(key, value);
+      bitField0_ |= 0x00000004;
+      return this;
+    }
+    /**
+     * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+     */
+    public Builder putAllUpdates(
+        java.util.Map values) {
+      for (java.util.Map.Entry e : values.entrySet()) {
+        if (e.getKey() == null || e.getValue() == null) {
+          throw new NullPointerException();
+        }
+      }
+      internalGetMutableUpdates().ensureBuilderMap()
+          .putAll(values);
+      bitField0_ |= 0x00000004;
+      return this;
+    }
+    /**
+     * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+     */
+    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder putUpdatesBuilderIfAbsent(
+        long key) {
+      java.util.Map builderMap = internalGetMutableUpdates().ensureBuilderMap();
+      org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder entry = builderMap.get(key);
+      if (entry == null) {
+        entry = org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.newBuilder();
+        builderMap.put(key, entry);
+      }
+      if (entry instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) {
+        entry = ((org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) entry).toBuilder();
+        builderMap.put(key, entry);
+      }
+      return (org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder) entry;
+    }
+
+    private org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob job_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder> jobBuilder_;
+    /**
+     * .tabletserver.PExternalCompactionJob job = 4;
+     * @return Whether the job field is set.
+     */
+    public boolean hasJob() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     * .tabletserver.PExternalCompactionJob job = 4;
+     * @return The job.
+     */
+    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob() {
+      if (jobBuilder_ == null) {
+        return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+      } else {
+        return jobBuilder_.getMessage();
+      }
+    }
+    /**
+     * .tabletserver.PExternalCompactionJob job = 4;
+     */
+    public Builder setJob(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob value) {
+      if (jobBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        job_ = value;
+      } else {
+        jobBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     * .tabletserver.PExternalCompactionJob job = 4;
+     */
+    public Builder setJob(
+        org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder builderForValue) {
+      if (jobBuilder_ == null) {
+        job_ = builderForValue.build();
+      } else {
+        jobBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     * .tabletserver.PExternalCompactionJob job = 4;
+     */
+    public Builder mergeJob(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob value) {
+      if (jobBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) != 0) &&
+          job_ != null &&
+          job_ != org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance()) {
+          getJobBuilder().mergeFrom(value);
+        } else {
+          job_ = value;
+        }
+      } else {
+        jobBuilder_.mergeFrom(value);
+      }
+      if (job_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     * .tabletserver.PExternalCompactionJob job = 4;
+     */
+    public Builder clearJob() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      job_ = null;
+      if (jobBuilder_ != null) {
+        jobBuilder_.dispose();
+        jobBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     * .tabletserver.PExternalCompactionJob job = 4;
+     */
+    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder getJobBuilder() {
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return getJobFieldBuilder().getBuilder();
+    }
+    /**
+     * .tabletserver.PExternalCompactionJob job = 4;
+     */
+    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
+      if (jobBuilder_ != null) {
+        return jobBuilder_.getMessageOrBuilder();
+      } else {
+        return job_ == null ?
+            org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+      }
+    }
+    /**
+     * .tabletserver.PExternalCompactionJob job = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder> 
+        getJobFieldBuilder() {
+      if (jobBuilder_ == null) {
+        jobBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder>(
+                getJob(),
+                getParentForChildren(),
+                isClean());
+        job_ = null;
+      }
+      return jobBuilder_;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:compaction_coordinator.PExternalCompaction)
+  }
+
+  // @@protoc_insertion_point(class_scope:compaction_coordinator.PExternalCompaction)
+  private static final org.apache.accumulo.core.compaction.protobuf.PExternalCompaction DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PExternalCompaction();
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public PExternalCompaction parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      Builder builder = newBuilder();
+      try {
+        builder.mergeFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(builder.buildPartial());
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(builder.buildPartial());
+      }
+      return builder.buildPartial();
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java
index 9e133547fa3..876111ea814 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java
@@ -17,17 +17,17 @@
  * under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: compaction-coordinator.proto
+// source: tabletserver.proto
 
 // Protobuf Java Version: 3.25.3
 package org.apache.accumulo.core.compaction.protobuf;
 
 /**
- * Protobuf type {@code compaction_coordinator.PExternalCompactionJob}
+ * Protobuf type {@code tabletserver.PExternalCompactionJob}
  */
 public final class PExternalCompactionJob extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:compaction_coordinator.PExternalCompactionJob)
+    // @@protoc_insertion_point(message_implements:tabletserver.PExternalCompactionJob)
     PExternalCompactionJobOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use PExternalCompactionJob.newBuilder() to construct.
@@ -50,7 +50,7 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_descriptor;
+    return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
@@ -68,7 +68,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_fieldAccessorTable
+    return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder.class);
   }
@@ -337,7 +337,7 @@ private static final class OverridesDefaultEntryHolder {
         java.lang.String, java.lang.String> defaultEntry =
             com.google.protobuf.MapEntry
             .newDefaultInstance(
-                org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_OverridesEntry_descriptor, 
+                org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_OverridesEntry_descriptor, 
                 com.google.protobuf.WireFormat.FieldType.STRING,
                 "",
                 com.google.protobuf.WireFormat.FieldType.STRING,
@@ -702,15 +702,15 @@ protected Builder newBuilderForType(
     return builder;
   }
   /**
-   * Protobuf type {@code compaction_coordinator.PExternalCompactionJob}
+   * Protobuf type {@code tabletserver.PExternalCompactionJob}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:compaction_coordinator.PExternalCompactionJob)
+      // @@protoc_insertion_point(builder_implements:tabletserver.PExternalCompactionJob)
       org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_descriptor;
+      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -738,7 +738,7 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_fieldAccessorTable
+      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder.class);
     }
@@ -799,7 +799,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionJob_descriptor;
+      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_descriptor;
     }
 
     @java.lang.Override
@@ -2085,10 +2085,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:compaction_coordinator.PExternalCompactionJob)
+    // @@protoc_insertion_point(builder_scope:tabletserver.PExternalCompactionJob)
   }
 
-  // @@protoc_insertion_point(class_scope:compaction_coordinator.PExternalCompactionJob)
+  // @@protoc_insertion_point(class_scope:tabletserver.PExternalCompactionJob)
   private static final org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob();
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java
index 00017d95dcb..6fe3ea2e227 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java
@@ -17,13 +17,13 @@
  * under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: compaction-coordinator.proto
+// source: tabletserver.proto
 
 // Protobuf Java Version: 3.25.3
 package org.apache.accumulo.core.compaction.protobuf;
 
 public interface PExternalCompactionJobOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:compaction_coordinator.PExternalCompactionJob)
+    // @@protoc_insertion_point(interface_extends:tabletserver.PExternalCompactionJob)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionList.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionList.java
new file mode 100644
index 00000000000..e8416709b77
--- /dev/null
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionList.java
@@ -0,0 +1,730 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: compaction-coordinator.proto
+
+// Protobuf Java Version: 3.25.3
+package org.apache.accumulo.core.compaction.protobuf;
+
+/**
+ * Protobuf type {@code compaction_coordinator.PExternalCompactionList}
+ */
+public final class PExternalCompactionList extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:compaction_coordinator.PExternalCompactionList)
+    PExternalCompactionListOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use PExternalCompactionList.newBuilder() to construct.
+  private PExternalCompactionList(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private PExternalCompactionList() {
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new PExternalCompactionList();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_descriptor;
+  }
+
+  @SuppressWarnings({"rawtypes"})
+  @java.lang.Override
+  protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+      int number) {
+    switch (number) {
+      case 1:
+        return internalGetCompactions();
+      default:
+        throw new RuntimeException(
+            "Invalid map field number: " + number);
+    }
+  }
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.Builder.class);
+  }
+
+  public static final int COMPACTIONS_FIELD_NUMBER = 1;
+  private static final class CompactionsDefaultEntryHolder {
+    static final com.google.protobuf.MapEntry<
+        java.lang.String, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction> defaultEntry =
+            com.google.protobuf.MapEntry
+            .newDefaultInstance(
+                org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_CompactionsEntry_descriptor, 
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "",
+                com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.getDefaultInstance());
+  }
+  @SuppressWarnings("serial")
+  private com.google.protobuf.MapField<
+      java.lang.String, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction> compactions_;
+  private com.google.protobuf.MapField
+  internalGetCompactions() {
+    if (compactions_ == null) {
+      return com.google.protobuf.MapField.emptyMapField(
+          CompactionsDefaultEntryHolder.defaultEntry);
+    }
+    return compactions_;
+  }
+  public int getCompactionsCount() {
+    return internalGetCompactions().getMap().size();
+  }
+  /**
+   * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+   */
+  @java.lang.Override
+  public boolean containsCompactions(
+      java.lang.String key) {
+    if (key == null) { throw new NullPointerException("map key"); }
+    return internalGetCompactions().getMap().containsKey(key);
+  }
+  /**
+   * Use {@link #getCompactionsMap()} instead.
+   */
+  @java.lang.Override
+  @java.lang.Deprecated
+  public java.util.Map getCompactions() {
+    return getCompactionsMap();
+  }
+  /**
+   * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+   */
+  @java.lang.Override
+  public java.util.Map getCompactionsMap() {
+    return internalGetCompactions().getMap();
+  }
+  /**
+   * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+   */
+  @java.lang.Override
+  public /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getCompactionsOrDefault(
+      java.lang.String key,
+      /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PExternalCompaction defaultValue) {
+    if (key == null) { throw new NullPointerException("map key"); }
+    java.util.Map map =
+        internalGetCompactions().getMap();
+    return map.containsKey(key) ? map.get(key) : defaultValue;
+  }
+  /**
+   * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+   */
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getCompactionsOrThrow(
+      java.lang.String key) {
+    if (key == null) { throw new NullPointerException("map key"); }
+    java.util.Map map =
+        internalGetCompactions().getMap();
+    if (!map.containsKey(key)) {
+      throw new java.lang.IllegalArgumentException();
+    }
+    return map.get(key);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    com.google.protobuf.GeneratedMessageV3
+      .serializeStringMapTo(
+        output,
+        internalGetCompactions(),
+        CompactionsDefaultEntryHolder.defaultEntry,
+        1);
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (java.util.Map.Entry entry
+         : internalGetCompactions().getMap().entrySet()) {
+      com.google.protobuf.MapEntry
+      compactions__ = CompactionsDefaultEntryHolder.defaultEntry.newBuilderForType()
+          .setKey(entry.getKey())
+          .setValue(entry.getValue())
+          .build();
+      size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, compactions__);
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList)) {
+      return super.equals(obj);
+    }
+    org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList other = (org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList) obj;
+
+    if (!internalGetCompactions().equals(
+        other.internalGetCompactions())) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (!internalGetCompactions().getMap().isEmpty()) {
+      hash = (37 * hash) + COMPACTIONS_FIELD_NUMBER;
+      hash = (53 * hash) + internalGetCompactions().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * Protobuf type {@code compaction_coordinator.PExternalCompactionList}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:compaction_coordinator.PExternalCompactionList)
+      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionListOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
+        int number) {
+      switch (number) {
+        case 1:
+          return internalGetCompactions();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
+        int number) {
+      switch (number) {
+        case 1:
+          return internalGetMutableCompactions();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.Builder.class);
+    }
+
+    // Construct using org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.newBuilder()
+    private Builder() {
+
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      internalGetMutableCompactions().clear();
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_descriptor;
+    }
+
+    @java.lang.Override
+    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getDefaultInstanceForType() {
+      return org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList build() {
+      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList buildPartial() {
+      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList result = new org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList(this);
+      if (bitField0_ != 0) { buildPartial0(result); }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList result) {
+      int from_bitField0_ = bitField0_;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.compactions_ = internalGetCompactions().build(CompactionsDefaultEntryHolder.defaultEntry);
+      }
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList) {
+        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList other) {
+      if (other == org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.getDefaultInstance()) return this;
+      internalGetMutableCompactions().mergeFrom(
+          other.internalGetCompactions());
+      bitField0_ |= 0x00000001;
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              com.google.protobuf.MapEntry
+              compactions__ = input.readMessage(
+                  CompactionsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              internalGetMutableCompactions().ensureBuilderMap().put(
+                  compactions__.getKey(), compactions__.getValue());
+              bitField0_ |= 0x00000001;
+              break;
+            } // case 10
+            default: {
+              if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                done = true; // was an endgroup tag
+              }
+              break;
+            } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+    private int bitField0_;
+
+    private static final class CompactionsConverter implements com.google.protobuf.MapFieldBuilder.Converter {
+      @java.lang.Override
+      public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction build(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionOrBuilder val) {
+        if (val instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) { return (org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) val; }
+        return ((org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder) val).build();
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.MapEntry defaultEntry() {
+        return CompactionsDefaultEntryHolder.defaultEntry;
+      }
+    };
+    private static final CompactionsConverter compactionsConverter = new CompactionsConverter();
+
+    private com.google.protobuf.MapFieldBuilder<
+        java.lang.String, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionOrBuilder, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder> compactions_;
+    private com.google.protobuf.MapFieldBuilder
+        internalGetCompactions() {
+      if (compactions_ == null) {
+        return new com.google.protobuf.MapFieldBuilder<>(compactionsConverter);
+      }
+      return compactions_;
+    }
+    private com.google.protobuf.MapFieldBuilder
+        internalGetMutableCompactions() {
+      if (compactions_ == null) {
+        compactions_ = new com.google.protobuf.MapFieldBuilder<>(compactionsConverter);
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return compactions_;
+    }
+    public int getCompactionsCount() {
+      return internalGetCompactions().ensureBuilderMap().size();
+    }
+    /**
+     * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+     */
+    @java.lang.Override
+    public boolean containsCompactions(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      return internalGetCompactions().ensureBuilderMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getCompactionsMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map getCompactions() {
+      return getCompactionsMap();
+    }
+    /**
+     * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+     */
+    @java.lang.Override
+    public java.util.Map getCompactionsMap() {
+      return internalGetCompactions().getImmutableMap();
+    }
+    /**
+     * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+     */
+    @java.lang.Override
+    public /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getCompactionsOrDefault(
+        java.lang.String key,
+        /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PExternalCompaction defaultValue) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map map = internalGetMutableCompactions().ensureBuilderMap();
+      return map.containsKey(key) ? compactionsConverter.build(map.get(key)) : defaultValue;
+    }
+    /**
+     * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+     */
+    @java.lang.Override
+    public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getCompactionsOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      java.util.Map map = internalGetMutableCompactions().ensureBuilderMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return compactionsConverter.build(map.get(key));
+    }
+    public Builder clearCompactions() {
+      bitField0_ = (bitField0_ & ~0x00000001);
+      internalGetMutableCompactions().clear();
+      return this;
+    }
+    /**
+     * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+     */
+    public Builder removeCompactions(
+        java.lang.String key) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      internalGetMutableCompactions().ensureBuilderMap()
+          .remove(key);
+      return this;
+    }
+    /**
+     * Use alternate mutation accessors instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map
+        getMutableCompactions() {
+      bitField0_ |= 0x00000001;
+      return internalGetMutableCompactions().ensureMessageMap();
+    }
+    /**
+     * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+     */
+    public Builder putCompactions(
+        java.lang.String key,
+        org.apache.accumulo.core.compaction.protobuf.PExternalCompaction value) {
+      if (key == null) { throw new NullPointerException("map key"); }
+      if (value == null) { throw new NullPointerException("map value"); }
+      internalGetMutableCompactions().ensureBuilderMap()
+          .put(key, value);
+      bitField0_ |= 0x00000001;
+      return this;
+    }
+    /**
+     * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+     */
+    public Builder putAllCompactions(
+        java.util.Map values) {
+      for (java.util.Map.Entry e : values.entrySet()) {
+        if (e.getKey() == null || e.getValue() == null) {
+          throw new NullPointerException();
+        }
+      }
+      internalGetMutableCompactions().ensureBuilderMap()
+          .putAll(values);
+      bitField0_ |= 0x00000001;
+      return this;
+    }
+    /**
+     * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+     */
+    public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder putCompactionsBuilderIfAbsent(
+        java.lang.String key) {
+      java.util.Map builderMap = internalGetMutableCompactions().ensureBuilderMap();
+      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionOrBuilder entry = builderMap.get(key);
+      if (entry == null) {
+        entry = org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.newBuilder();
+        builderMap.put(key, entry);
+      }
+      if (entry instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) {
+        entry = ((org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) entry).toBuilder();
+        builderMap.put(key, entry);
+      }
+      return (org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder) entry;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:compaction_coordinator.PExternalCompactionList)
+  }
+
+  // @@protoc_insertion_point(class_scope:compaction_coordinator.PExternalCompactionList)
+  private static final org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList();
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public PExternalCompactionList parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      Builder builder = newBuilder();
+      try {
+        builder.mergeFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(builder.buildPartial());
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(builder.buildPartial());
+      }
+      return builder.buildPartial();
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionListOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionListOrBuilder.java
new file mode 100644
index 00000000000..bb33906395d
--- /dev/null
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionListOrBuilder.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: compaction-coordinator.proto
+
+// Protobuf Java Version: 3.25.3
+package org.apache.accumulo.core.compaction.protobuf;
+
+public interface PExternalCompactionListOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:compaction_coordinator.PExternalCompactionList)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+   */
+  int getCompactionsCount();
+  /**
+   * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+   */
+  boolean containsCompactions(
+      java.lang.String key);
+  /**
+   * Use {@link #getCompactionsMap()} instead.
+   */
+  @java.lang.Deprecated
+  java.util.Map
+  getCompactions();
+  /**
+   * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+   */
+  java.util.Map
+  getCompactionsMap();
+  /**
+   * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+   */
+  /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getCompactionsOrDefault(
+      java.lang.String key,
+      /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PExternalCompaction defaultValue);
+  /**
+   * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
+   */
+  org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getCompactionsOrThrow(
+      java.lang.String key);
+}
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionOrBuilder.java
new file mode 100644
index 00000000000..6df25a86aeb
--- /dev/null
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionOrBuilder.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: compaction-coordinator.proto
+
+// Protobuf Java Version: 3.25.3
+package org.apache.accumulo.core.compaction.protobuf;
+
+public interface PExternalCompactionOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:compaction_coordinator.PExternalCompaction)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * string groupName = 1;
+   * @return The groupName.
+   */
+  java.lang.String getGroupName();
+  /**
+   * string groupName = 1;
+   * @return The bytes for groupName.
+   */
+  com.google.protobuf.ByteString
+      getGroupNameBytes();
+
+  /**
+   * string compactor = 2;
+   * @return The compactor.
+   */
+  java.lang.String getCompactor();
+  /**
+   * string compactor = 2;
+   * @return The bytes for compactor.
+   */
+  com.google.protobuf.ByteString
+      getCompactorBytes();
+
+  /**
+   * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+   */
+  int getUpdatesCount();
+  /**
+   * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+   */
+  boolean containsUpdates(
+      long key);
+  /**
+   * Use {@link #getUpdatesMap()} instead.
+   */
+  @java.lang.Deprecated
+  java.util.Map
+  getUpdates();
+  /**
+   * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+   */
+  java.util.Map
+  getUpdatesMap();
+  /**
+   * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+   */
+  /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrDefault(
+      long key,
+      /* nullable */
+org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate defaultValue);
+  /**
+   * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
+   */
+  org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrThrow(
+      long key);
+
+  /**
+   * .tabletserver.PExternalCompactionJob job = 4;
+   * @return Whether the job field is set.
+   */
+  boolean hasJob();
+  /**
+   * .tabletserver.PExternalCompactionJob job = 4;
+   * @return The job.
+   */
+  org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob();
+  /**
+   * .tabletserver.PExternalCompactionJob job = 4;
+   */
+  org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder();
+}
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java
index 9a696549514..1c4ab566478 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java
@@ -61,7 +61,7 @@ protected java.lang.Object newInstance(
   public static final int JOB_FIELD_NUMBER = 1;
   private org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob job_;
   /**
-   * .compaction_coordinator.PExternalCompactionJob job = 1;
+   * .tabletserver.PExternalCompactionJob job = 1;
    * @return Whether the job field is set.
    */
   @java.lang.Override
@@ -69,7 +69,7 @@ public boolean hasJob() {
     return ((bitField0_ & 0x00000001) != 0);
   }
   /**
-   * .compaction_coordinator.PExternalCompactionJob job = 1;
+   * .tabletserver.PExternalCompactionJob job = 1;
    * @return The job.
    */
   @java.lang.Override
@@ -77,7 +77,7 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJo
     return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
   }
   /**
-   * .compaction_coordinator.PExternalCompactionJob job = 1;
+   * .tabletserver.PExternalCompactionJob job = 1;
    */
   @java.lang.Override
   public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
@@ -469,14 +469,14 @@ public Builder mergeFrom(
     private com.google.protobuf.SingleFieldBuilderV3<
         org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder> jobBuilder_;
     /**
-     * .compaction_coordinator.PExternalCompactionJob job = 1;
+     * .tabletserver.PExternalCompactionJob job = 1;
      * @return Whether the job field is set.
      */
     public boolean hasJob() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * .compaction_coordinator.PExternalCompactionJob job = 1;
+     * .tabletserver.PExternalCompactionJob job = 1;
      * @return The job.
      */
     public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob() {
@@ -487,7 +487,7 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJo
       }
     }
     /**
-     * .compaction_coordinator.PExternalCompactionJob job = 1;
+     * .tabletserver.PExternalCompactionJob job = 1;
      */
     public Builder setJob(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob value) {
       if (jobBuilder_ == null) {
@@ -503,7 +503,7 @@ public Builder setJob(org.apache.accumulo.core.compaction.protobuf.PExternalComp
       return this;
     }
     /**
-     * .compaction_coordinator.PExternalCompactionJob job = 1;
+     * .tabletserver.PExternalCompactionJob job = 1;
      */
     public Builder setJob(
         org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder builderForValue) {
@@ -517,7 +517,7 @@ public Builder setJob(
       return this;
     }
     /**
-     * .compaction_coordinator.PExternalCompactionJob job = 1;
+     * .tabletserver.PExternalCompactionJob job = 1;
      */
     public Builder mergeJob(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob value) {
       if (jobBuilder_ == null) {
@@ -538,7 +538,7 @@ public Builder mergeJob(org.apache.accumulo.core.compaction.protobuf.PExternalCo
       return this;
     }
     /**
-     * .compaction_coordinator.PExternalCompactionJob job = 1;
+     * .tabletserver.PExternalCompactionJob job = 1;
      */
     public Builder clearJob() {
       bitField0_ = (bitField0_ & ~0x00000001);
@@ -551,7 +551,7 @@ public Builder clearJob() {
       return this;
     }
     /**
-     * .compaction_coordinator.PExternalCompactionJob job = 1;
+     * .tabletserver.PExternalCompactionJob job = 1;
      */
     public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder getJobBuilder() {
       bitField0_ |= 0x00000001;
@@ -559,7 +559,7 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Build
       return getJobFieldBuilder().getBuilder();
     }
     /**
-     * .compaction_coordinator.PExternalCompactionJob job = 1;
+     * .tabletserver.PExternalCompactionJob job = 1;
      */
     public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
       if (jobBuilder_ != null) {
@@ -570,7 +570,7 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuil
       }
     }
     /**
-     * .compaction_coordinator.PExternalCompactionJob job = 1;
+     * .tabletserver.PExternalCompactionJob job = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder> 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java
index 4be982c7bfc..962f3959188 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java
@@ -27,17 +27,17 @@ public interface PNextCompactionJobOrBuilder extends
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * .compaction_coordinator.PExternalCompactionJob job = 1;
+   * .tabletserver.PExternalCompactionJob job = 1;
    * @return Whether the job field is set.
    */
   boolean hasJob();
   /**
-   * .compaction_coordinator.PExternalCompactionJob job = 1;
+   * .tabletserver.PExternalCompactionJob job = 1;
    * @return The job.
    */
   org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob();
   /**
-   * .compaction_coordinator.PExternalCompactionJob job = 1;
+   * .tabletserver.PExternalCompactionJob job = 1;
    */
   org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder();
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java
index 4c87b498209..984f8112900 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java
@@ -33,6 +33,16 @@ public static void registerAllExtensions(
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_tabletserver_PExternalCompactionJob_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_tabletserver_PExternalCompactionJob_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_tabletserver_PExternalCompactionJob_OverridesEntry_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_tabletserver_PExternalCompactionJob_OverridesEntry_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_tabletserver_PInputFile_descriptor;
   static final 
@@ -67,35 +77,64 @@ public static void registerAllExtensions(
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022tabletserver.proto\022\014tabletserver\"Y\n\nPI" +
-      "nputFile\022\031\n\021metadataFileEntry\030\001 \001(\t\022\014\n\004s" +
-      "ize\030\002 \001(\003\022\017\n\007entries\030\003 \001(\003\022\021\n\ttimestamp\030" +
-      "\004 \001(\003\"\300\001\n\020PIteratorSetting\022\020\n\010priority\030\001" +
-      " \001(\005\022\014\n\004name\030\002 \001(\t\022\025\n\riteratorClass\030\003 \001(" +
-      "\t\022B\n\nproperties\030\004 \003(\0132..tabletserver.PIt" +
-      "eratorSetting.PropertiesEntry\0321\n\017Propert" +
-      "iesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001" +
-      "\"D\n\017PIteratorConfig\0221\n\titerators\030\001 \003(\0132\036" +
-      ".tabletserver.PIteratorSetting\"Q\n\020PCompa" +
-      "ctionStats\022\023\n\013entriesRead\030\001 \001(\003\022\026\n\016entri" +
-      "esWritten\030\002 \001(\003\022\020\n\010fileSize\030\003 \001(\003*4\n\017PCo" +
-      "mpactionKind\022\013\n\007UNKNOWN\020\000\022\n\n\006SYSTEM\020\001\022\010\n" +
-      "\004USER\020\002BC\n,org.apache.accumulo.core.comp" +
-      "action.protobufB\021TabletServerProtoP\001b\006pr" +
-      "oto3"
+      "\n\022tabletserver.proto\022\014tabletserver\032\ndata" +
+      ".proto\032\rmanager.proto\"\305\004\n\026PExternalCompa" +
+      "ctionJob\022!\n\024externalCompactionId\030\001 \001(\tH\000" +
+      "\210\001\001\022%\n\006extent\030\002 \001(\0132\020.data.PKeyExtentH\001\210" +
+      "\001\001\022\'\n\005files\030\003 \003(\0132\030.tabletserver.PInputF" +
+      "ile\022<\n\020iteratorSettings\030\004 \001(\0132\035.tabletse" +
+      "rver.PIteratorConfigH\002\210\001\001\022\027\n\noutputFile\030" +
+      "\005 \001(\tH\003\210\001\001\022\035\n\020propagateDeletes\030\006 \001(\010H\004\210\001" +
+      "\001\0220\n\004kind\030\007 \001(\0162\035.tabletserver.PCompacti" +
+      "onKindH\005\210\001\001\022%\n\006fateId\030\010 \001(\0132\020.manager.PF" +
+      "ateIdH\006\210\001\001\022F\n\toverrides\030\t \003(\01323.tabletse" +
+      "rver.PExternalCompactionJob.OverridesEnt" +
+      "ry\0320\n\016OverridesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" +
+      "ue\030\002 \001(\t:\0028\001B\027\n\025_externalCompactionIdB\t\n" +
+      "\007_extentB\023\n\021_iteratorSettingsB\r\n\013_output" +
+      "FileB\023\n\021_propagateDeletesB\007\n\005_kindB\t\n\007_f" +
+      "ateId\"Y\n\nPInputFile\022\031\n\021metadataFileEntry" +
+      "\030\001 \001(\t\022\014\n\004size\030\002 \001(\003\022\017\n\007entries\030\003 \001(\003\022\021\n" +
+      "\ttimestamp\030\004 \001(\003\"\300\001\n\020PIteratorSetting\022\020\n" +
+      "\010priority\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\025\n\riterato" +
+      "rClass\030\003 \001(\t\022B\n\nproperties\030\004 \003(\0132..table" +
+      "tserver.PIteratorSetting.PropertiesEntry" +
+      "\0321\n\017PropertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu" +
+      "e\030\002 \001(\t:\0028\001\"D\n\017PIteratorConfig\0221\n\titerat" +
+      "ors\030\001 \003(\0132\036.tabletserver.PIteratorSettin" +
+      "g\"Q\n\020PCompactionStats\022\023\n\013entriesRead\030\001 \001" +
+      "(\003\022\026\n\016entriesWritten\030\002 \001(\003\022\020\n\010fileSize\030\003" +
+      " \001(\003*4\n\017PCompactionKind\022\013\n\007UNKNOWN\020\000\022\n\n\006" +
+      "SYSTEM\020\001\022\010\n\004USER\020\002BC\n,org.apache.accumul" +
+      "o.core.compaction.protobufB\021TabletServer" +
+      "ProtoP\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          org.apache.accumulo.core.compaction.protobuf.DataProto.getDescriptor(),
+          org.apache.accumulo.core.compaction.protobuf.ManagerProto.getDescriptor(),
         });
-    internal_static_tabletserver_PInputFile_descriptor =
+    internal_static_tabletserver_PExternalCompactionJob_descriptor =
       getDescriptor().getMessageTypes().get(0);
+    internal_static_tabletserver_PExternalCompactionJob_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_tabletserver_PExternalCompactionJob_descriptor,
+        new java.lang.String[] { "ExternalCompactionId", "Extent", "Files", "IteratorSettings", "OutputFile", "PropagateDeletes", "Kind", "FateId", "Overrides", });
+    internal_static_tabletserver_PExternalCompactionJob_OverridesEntry_descriptor =
+      internal_static_tabletserver_PExternalCompactionJob_descriptor.getNestedTypes().get(0);
+    internal_static_tabletserver_PExternalCompactionJob_OverridesEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_tabletserver_PExternalCompactionJob_OverridesEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_tabletserver_PInputFile_descriptor =
+      getDescriptor().getMessageTypes().get(1);
     internal_static_tabletserver_PInputFile_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tabletserver_PInputFile_descriptor,
         new java.lang.String[] { "MetadataFileEntry", "Size", "Entries", "Timestamp", });
     internal_static_tabletserver_PIteratorSetting_descriptor =
-      getDescriptor().getMessageTypes().get(1);
+      getDescriptor().getMessageTypes().get(2);
     internal_static_tabletserver_PIteratorSetting_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tabletserver_PIteratorSetting_descriptor,
@@ -107,17 +146,19 @@ public static void registerAllExtensions(
         internal_static_tabletserver_PIteratorSetting_PropertiesEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
     internal_static_tabletserver_PIteratorConfig_descriptor =
-      getDescriptor().getMessageTypes().get(2);
+      getDescriptor().getMessageTypes().get(3);
     internal_static_tabletserver_PIteratorConfig_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tabletserver_PIteratorConfig_descriptor,
         new java.lang.String[] { "Iterators", });
     internal_static_tabletserver_PCompactionStats_descriptor =
-      getDescriptor().getMessageTypes().get(3);
+      getDescriptor().getMessageTypes().get(4);
     internal_static_tabletserver_PCompactionStats_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tabletserver_PCompactionStats_descriptor,
         new java.lang.String[] { "EntriesRead", "EntriesWritten", "FileSize", });
+    org.apache.accumulo.core.compaction.protobuf.DataProto.getDescriptor();
+    org.apache.accumulo.core.compaction.protobuf.ManagerProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequest.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequest.java
new file mode 100644
index 00000000000..edecb176f8f
--- /dev/null
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequest.java
@@ -0,0 +1,1190 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: compaction-coordinator.proto
+
+// Protobuf Java Version: 3.25.3
+package org.apache.accumulo.core.compaction.protobuf;
+
+/**
+ * Protobuf type {@code compaction_coordinator.UpdateCompactionStatusRequest}
+ */
+public final class UpdateCompactionStatusRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:compaction_coordinator.UpdateCompactionStatusRequest)
+    UpdateCompactionStatusRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use UpdateCompactionStatusRequest.newBuilder() to construct.
+  private UpdateCompactionStatusRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private UpdateCompactionStatusRequest() {
+    externalCompactionId_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new UpdateCompactionStatusRequest();
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.class, org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int PTINFO_FIELD_NUMBER = 1;
+  private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_;
+  /**
+   * .client.ProtoTInfo ptinfo = 1;
+   * @return Whether the ptinfo field is set.
+   */
+  @java.lang.Override
+  public boolean hasPtinfo() {
+    return ((bitField0_ & 0x00000001) != 0);
+  }
+  /**
+   * .client.ProtoTInfo ptinfo = 1;
+   * @return The ptinfo.
+   */
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() {
+    return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+  }
+  /**
+   * .client.ProtoTInfo ptinfo = 1;
+   */
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
+    return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+  }
+
+  public static final int CREDENTIALS_FIELD_NUMBER = 2;
+  private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_;
+  /**
+   * .security.PCredentials credentials = 2;
+   * @return Whether the credentials field is set.
+   */
+  @java.lang.Override
+  public boolean hasCredentials() {
+    return ((bitField0_ & 0x00000002) != 0);
+  }
+  /**
+   * .security.PCredentials credentials = 2;
+   * @return The credentials.
+   */
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() {
+    return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+  }
+  /**
+   * .security.PCredentials credentials = 2;
+   */
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
+    return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+  }
+
+  public static final int EXTERNALCOMPACTIONID_FIELD_NUMBER = 3;
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object externalCompactionId_ = "";
+  /**
+   * string externalCompactionId = 3;
+   * @return The externalCompactionId.
+   */
+  @java.lang.Override
+  public java.lang.String getExternalCompactionId() {
+    java.lang.Object ref = externalCompactionId_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      externalCompactionId_ = s;
+      return s;
+    }
+  }
+  /**
+   * string externalCompactionId = 3;
+   * @return The bytes for externalCompactionId.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString
+      getExternalCompactionIdBytes() {
+    java.lang.Object ref = externalCompactionId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      externalCompactionId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int STATUS_FIELD_NUMBER = 4;
+  private org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate status_;
+  /**
+   * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+   * @return Whether the status field is set.
+   */
+  @java.lang.Override
+  public boolean hasStatus() {
+    return ((bitField0_ & 0x00000004) != 0);
+  }
+  /**
+   * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+   * @return The status.
+   */
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getStatus() {
+    return status_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
+  }
+  /**
+   * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+   */
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder getStatusOrBuilder() {
+    return status_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
+  }
+
+  public static final int TIMESTAMP_FIELD_NUMBER = 5;
+  private long timestamp_ = 0L;
+  /**
+   * int64 timestamp = 5;
+   * @return The timestamp.
+   */
+  @java.lang.Override
+  public long getTimestamp() {
+    return timestamp_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (((bitField0_ & 0x00000001) != 0)) {
+      output.writeMessage(1, getPtinfo());
+    }
+    if (((bitField0_ & 0x00000002) != 0)) {
+      output.writeMessage(2, getCredentials());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(externalCompactionId_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, externalCompactionId_);
+    }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      output.writeMessage(4, getStatus());
+    }
+    if (timestamp_ != 0L) {
+      output.writeInt64(5, timestamp_);
+    }
+    getUnknownFields().writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (((bitField0_ & 0x00000001) != 0)) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getPtinfo());
+    }
+    if (((bitField0_ & 0x00000002) != 0)) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getCredentials());
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(externalCompactionId_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, externalCompactionId_);
+    }
+    if (((bitField0_ & 0x00000004) != 0)) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(4, getStatus());
+    }
+    if (timestamp_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(5, timestamp_);
+    }
+    size += getUnknownFields().getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest)) {
+      return super.equals(obj);
+    }
+    org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest other = (org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest) obj;
+
+    if (hasPtinfo() != other.hasPtinfo()) return false;
+    if (hasPtinfo()) {
+      if (!getPtinfo()
+          .equals(other.getPtinfo())) return false;
+    }
+    if (hasCredentials() != other.hasCredentials()) return false;
+    if (hasCredentials()) {
+      if (!getCredentials()
+          .equals(other.getCredentials())) return false;
+    }
+    if (!getExternalCompactionId()
+        .equals(other.getExternalCompactionId())) return false;
+    if (hasStatus() != other.hasStatus()) return false;
+    if (hasStatus()) {
+      if (!getStatus()
+          .equals(other.getStatus())) return false;
+    }
+    if (getTimestamp()
+        != other.getTimestamp()) return false;
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasPtinfo()) {
+      hash = (37 * hash) + PTINFO_FIELD_NUMBER;
+      hash = (53 * hash) + getPtinfo().hashCode();
+    }
+    if (hasCredentials()) {
+      hash = (37 * hash) + CREDENTIALS_FIELD_NUMBER;
+      hash = (53 * hash) + getCredentials().hashCode();
+    }
+    hash = (37 * hash) + EXTERNALCOMPACTIONID_FIELD_NUMBER;
+    hash = (53 * hash) + getExternalCompactionId().hashCode();
+    if (hasStatus()) {
+      hash = (37 * hash) + STATUS_FIELD_NUMBER;
+      hash = (53 * hash) + getStatus().hashCode();
+    }
+    hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getTimestamp());
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * Protobuf type {@code compaction_coordinator.UpdateCompactionStatusRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:compaction_coordinator.UpdateCompactionStatusRequest)
+      org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.class, org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.Builder.class);
+    }
+
+    // Construct using org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getPtinfoFieldBuilder();
+        getCredentialsFieldBuilder();
+        getStatusFieldBuilder();
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      bitField0_ = 0;
+      ptinfo_ = null;
+      if (ptinfoBuilder_ != null) {
+        ptinfoBuilder_.dispose();
+        ptinfoBuilder_ = null;
+      }
+      credentials_ = null;
+      if (credentialsBuilder_ != null) {
+        credentialsBuilder_.dispose();
+        credentialsBuilder_ = null;
+      }
+      externalCompactionId_ = "";
+      status_ = null;
+      if (statusBuilder_ != null) {
+        statusBuilder_.dispose();
+        statusBuilder_ = null;
+      }
+      timestamp_ = 0L;
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor;
+    }
+
+    @java.lang.Override
+    public org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest getDefaultInstanceForType() {
+      return org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest build() {
+      org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest buildPartial() {
+      org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest result = new org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest(this);
+      if (bitField0_ != 0) { buildPartial0(result); }
+      onBuilt();
+      return result;
+    }
+
+    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest result) {
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.ptinfo_ = ptinfoBuilder_ == null
+            ? ptinfo_
+            : ptinfoBuilder_.build();
+        to_bitField0_ |= 0x00000001;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.credentials_ = credentialsBuilder_ == null
+            ? credentials_
+            : credentialsBuilder_.build();
+        to_bitField0_ |= 0x00000002;
+      }
+      if (((from_bitField0_ & 0x00000004) != 0)) {
+        result.externalCompactionId_ = externalCompactionId_;
+      }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.status_ = statusBuilder_ == null
+            ? status_
+            : statusBuilder_.build();
+        to_bitField0_ |= 0x00000004;
+      }
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        result.timestamp_ = timestamp_;
+      }
+      result.bitField0_ |= to_bitField0_;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest) {
+        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest other) {
+      if (other == org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.getDefaultInstance()) return this;
+      if (other.hasPtinfo()) {
+        mergePtinfo(other.getPtinfo());
+      }
+      if (other.hasCredentials()) {
+        mergeCredentials(other.getCredentials());
+      }
+      if (!other.getExternalCompactionId().isEmpty()) {
+        externalCompactionId_ = other.externalCompactionId_;
+        bitField0_ |= 0x00000004;
+        onChanged();
+      }
+      if (other.hasStatus()) {
+        mergeStatus(other.getStatus());
+      }
+      if (other.getTimestamp() != 0L) {
+        setTimestamp(other.getTimestamp());
+      }
+      this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              input.readMessage(
+                  getPtinfoFieldBuilder().getBuilder(),
+                  extensionRegistry);
+              bitField0_ |= 0x00000001;
+              break;
+            } // case 10
+            case 18: {
+              input.readMessage(
+                  getCredentialsFieldBuilder().getBuilder(),
+                  extensionRegistry);
+              bitField0_ |= 0x00000002;
+              break;
+            } // case 18
+            case 26: {
+              externalCompactionId_ = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000004;
+              break;
+            } // case 26
+            case 34: {
+              input.readMessage(
+                  getStatusFieldBuilder().getBuilder(),
+                  extensionRegistry);
+              bitField0_ |= 0x00000008;
+              break;
+            } // case 34
+            case 40: {
+              timestamp_ = input.readInt64();
+              bitField0_ |= 0x00000010;
+              break;
+            } // case 40
+            default: {
+              if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                done = true; // was an endgroup tag
+              }
+              break;
+            } // default:
+          } // switch (tag)
+        } // while (!done)
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.unwrapIOException();
+      } finally {
+        onChanged();
+      } // finally
+      return this;
+    }
+    private int bitField0_;
+
+    private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_;
+    /**
+     * .client.ProtoTInfo ptinfo = 1;
+     * @return Whether the ptinfo field is set.
+     */
+    public boolean hasPtinfo() {
+      return ((bitField0_ & 0x00000001) != 0);
+    }
+    /**
+     * .client.ProtoTInfo ptinfo = 1;
+     * @return The ptinfo.
+     */
+    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() {
+      if (ptinfoBuilder_ == null) {
+        return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+      } else {
+        return ptinfoBuilder_.getMessage();
+      }
+    }
+    /**
+     * .client.ProtoTInfo ptinfo = 1;
+     */
+    public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) {
+      if (ptinfoBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ptinfo_ = value;
+      } else {
+        ptinfoBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     * .client.ProtoTInfo ptinfo = 1;
+     */
+    public Builder setPtinfo(
+        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) {
+      if (ptinfoBuilder_ == null) {
+        ptinfo_ = builderForValue.build();
+      } else {
+        ptinfoBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return this;
+    }
+    /**
+     * .client.ProtoTInfo ptinfo = 1;
+     */
+    public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) {
+      if (ptinfoBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) != 0) &&
+          ptinfo_ != null &&
+          ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) {
+          getPtinfoBuilder().mergeFrom(value);
+        } else {
+          ptinfo_ = value;
+        }
+      } else {
+        ptinfoBuilder_.mergeFrom(value);
+      }
+      if (ptinfo_ != null) {
+        bitField0_ |= 0x00000001;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     * .client.ProtoTInfo ptinfo = 1;
+     */
+    public Builder clearPtinfo() {
+      bitField0_ = (bitField0_ & ~0x00000001);
+      ptinfo_ = null;
+      if (ptinfoBuilder_ != null) {
+        ptinfoBuilder_.dispose();
+        ptinfoBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     * .client.ProtoTInfo ptinfo = 1;
+     */
+    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() {
+      bitField0_ |= 0x00000001;
+      onChanged();
+      return getPtinfoFieldBuilder().getBuilder();
+    }
+    /**
+     * .client.ProtoTInfo ptinfo = 1;
+     */
+    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
+      if (ptinfoBuilder_ != null) {
+        return ptinfoBuilder_.getMessageOrBuilder();
+      } else {
+        return ptinfo_ == null ?
+            org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+      }
+    }
+    /**
+     * .client.ProtoTInfo ptinfo = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> 
+        getPtinfoFieldBuilder() {
+      if (ptinfoBuilder_ == null) {
+        ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>(
+                getPtinfo(),
+                getParentForChildren(),
+                isClean());
+        ptinfo_ = null;
+      }
+      return ptinfoBuilder_;
+    }
+
+    private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_;
+    /**
+     * .security.PCredentials credentials = 2;
+     * @return Whether the credentials field is set.
+     */
+    public boolean hasCredentials() {
+      return ((bitField0_ & 0x00000002) != 0);
+    }
+    /**
+     * .security.PCredentials credentials = 2;
+     * @return The credentials.
+     */
+    public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() {
+      if (credentialsBuilder_ == null) {
+        return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+      } else {
+        return credentialsBuilder_.getMessage();
+      }
+    }
+    /**
+     * .security.PCredentials credentials = 2;
+     */
+    public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) {
+      if (credentialsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        credentials_ = value;
+      } else {
+        credentialsBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     * .security.PCredentials credentials = 2;
+     */
+    public Builder setCredentials(
+        org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) {
+      if (credentialsBuilder_ == null) {
+        credentials_ = builderForValue.build();
+      } else {
+        credentialsBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return this;
+    }
+    /**
+     * .security.PCredentials credentials = 2;
+     */
+    public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) {
+      if (credentialsBuilder_ == null) {
+        if (((bitField0_ & 0x00000002) != 0) &&
+          credentials_ != null &&
+          credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) {
+          getCredentialsBuilder().mergeFrom(value);
+        } else {
+          credentials_ = value;
+        }
+      } else {
+        credentialsBuilder_.mergeFrom(value);
+      }
+      if (credentials_ != null) {
+        bitField0_ |= 0x00000002;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     * .security.PCredentials credentials = 2;
+     */
+    public Builder clearCredentials() {
+      bitField0_ = (bitField0_ & ~0x00000002);
+      credentials_ = null;
+      if (credentialsBuilder_ != null) {
+        credentialsBuilder_.dispose();
+        credentialsBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     * .security.PCredentials credentials = 2;
+     */
+    public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() {
+      bitField0_ |= 0x00000002;
+      onChanged();
+      return getCredentialsFieldBuilder().getBuilder();
+    }
+    /**
+     * .security.PCredentials credentials = 2;
+     */
+    public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
+      if (credentialsBuilder_ != null) {
+        return credentialsBuilder_.getMessageOrBuilder();
+      } else {
+        return credentials_ == null ?
+            org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+      }
+    }
+    /**
+     * .security.PCredentials credentials = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> 
+        getCredentialsFieldBuilder() {
+      if (credentialsBuilder_ == null) {
+        credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>(
+                getCredentials(),
+                getParentForChildren(),
+                isClean());
+        credentials_ = null;
+      }
+      return credentialsBuilder_;
+    }
+
+    private java.lang.Object externalCompactionId_ = "";
+    /**
+     * string externalCompactionId = 3;
+     * @return The externalCompactionId.
+     */
+    public java.lang.String getExternalCompactionId() {
+      java.lang.Object ref = externalCompactionId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        externalCompactionId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * string externalCompactionId = 3;
+     * @return The bytes for externalCompactionId.
+     */
+    public com.google.protobuf.ByteString
+        getExternalCompactionIdBytes() {
+      java.lang.Object ref = externalCompactionId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        externalCompactionId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * string externalCompactionId = 3;
+     * @param value The externalCompactionId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setExternalCompactionId(
+        java.lang.String value) {
+      if (value == null) { throw new NullPointerException(); }
+      externalCompactionId_ = value;
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+    /**
+     * string externalCompactionId = 3;
+     * @return This builder for chaining.
+     */
+    public Builder clearExternalCompactionId() {
+      externalCompactionId_ = getDefaultInstance().getExternalCompactionId();
+      bitField0_ = (bitField0_ & ~0x00000004);
+      onChanged();
+      return this;
+    }
+    /**
+     * string externalCompactionId = 3;
+     * @param value The bytes for externalCompactionId to set.
+     * @return This builder for chaining.
+     */
+    public Builder setExternalCompactionIdBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) { throw new NullPointerException(); }
+      checkByteStringIsUtf8(value);
+      externalCompactionId_ = value;
+      bitField0_ |= 0x00000004;
+      onChanged();
+      return this;
+    }
+
+    private org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate status_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder> statusBuilder_;
+    /**
+     * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+     * @return Whether the status field is set.
+     */
+    public boolean hasStatus() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+     * @return The status.
+     */
+    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getStatus() {
+      if (statusBuilder_ == null) {
+        return status_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
+      } else {
+        return statusBuilder_.getMessage();
+      }
+    }
+    /**
+     * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+     */
+    public Builder setStatus(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate value) {
+      if (statusBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        status_ = value;
+      } else {
+        statusBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+     */
+    public Builder setStatus(
+        org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder builderForValue) {
+      if (statusBuilder_ == null) {
+        status_ = builderForValue.build();
+      } else {
+        statusBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+     */
+    public Builder mergeStatus(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate value) {
+      if (statusBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) != 0) &&
+          status_ != null &&
+          status_ != org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance()) {
+          getStatusBuilder().mergeFrom(value);
+        } else {
+          status_ = value;
+        }
+      } else {
+        statusBuilder_.mergeFrom(value);
+      }
+      if (status_ != null) {
+        bitField0_ |= 0x00000008;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+     */
+    public Builder clearStatus() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      status_ = null;
+      if (statusBuilder_ != null) {
+        statusBuilder_.dispose();
+        statusBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+     */
+    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder getStatusBuilder() {
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return getStatusFieldBuilder().getBuilder();
+    }
+    /**
+     * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+     */
+    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder getStatusOrBuilder() {
+      if (statusBuilder_ != null) {
+        return statusBuilder_.getMessageOrBuilder();
+      } else {
+        return status_ == null ?
+            org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
+      }
+    }
+    /**
+     * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder> 
+        getStatusFieldBuilder() {
+      if (statusBuilder_ == null) {
+        statusBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder>(
+                getStatus(),
+                getParentForChildren(),
+                isClean());
+        status_ = null;
+      }
+      return statusBuilder_;
+    }
+
+    private long timestamp_ ;
+    /**
+     * int64 timestamp = 5;
+     * @return The timestamp.
+     */
+    @java.lang.Override
+    public long getTimestamp() {
+      return timestamp_;
+    }
+    /**
+     * int64 timestamp = 5;
+     * @param value The timestamp to set.
+     * @return This builder for chaining.
+     */
+    public Builder setTimestamp(long value) {
+
+      timestamp_ = value;
+      bitField0_ |= 0x00000010;
+      onChanged();
+      return this;
+    }
+    /**
+     * int64 timestamp = 5;
+     * @return This builder for chaining.
+     */
+    public Builder clearTimestamp() {
+      bitField0_ = (bitField0_ & ~0x00000010);
+      timestamp_ = 0L;
+      onChanged();
+      return this;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:compaction_coordinator.UpdateCompactionStatusRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:compaction_coordinator.UpdateCompactionStatusRequest)
+  private static final org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest();
+  }
+
+  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public UpdateCompactionStatusRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      Builder builder = newBuilder();
+      try {
+        builder.mergeFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(builder.buildPartial());
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(builder.buildPartial());
+      }
+      return builder.buildPartial();
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequestOrBuilder.java b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequestOrBuilder.java
new file mode 100644
index 00000000000..8cab7b569dd
--- /dev/null
+++ b/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequestOrBuilder.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: compaction-coordinator.proto
+
+// Protobuf Java Version: 3.25.3
+package org.apache.accumulo.core.compaction.protobuf;
+
+public interface UpdateCompactionStatusRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:compaction_coordinator.UpdateCompactionStatusRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * .client.ProtoTInfo ptinfo = 1;
+   * @return Whether the ptinfo field is set.
+   */
+  boolean hasPtinfo();
+  /**
+   * .client.ProtoTInfo ptinfo = 1;
+   * @return The ptinfo.
+   */
+  org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo();
+  /**
+   * .client.ProtoTInfo ptinfo = 1;
+   */
+  org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder();
+
+  /**
+   * .security.PCredentials credentials = 2;
+   * @return Whether the credentials field is set.
+   */
+  boolean hasCredentials();
+  /**
+   * .security.PCredentials credentials = 2;
+   * @return The credentials.
+   */
+  org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials();
+  /**
+   * .security.PCredentials credentials = 2;
+   */
+  org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder();
+
+  /**
+   * string externalCompactionId = 3;
+   * @return The externalCompactionId.
+   */
+  java.lang.String getExternalCompactionId();
+  /**
+   * string externalCompactionId = 3;
+   * @return The bytes for externalCompactionId.
+   */
+  com.google.protobuf.ByteString
+      getExternalCompactionIdBytes();
+
+  /**
+   * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+   * @return Whether the status field is set.
+   */
+  boolean hasStatus();
+  /**
+   * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+   * @return The status.
+   */
+  org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getStatus();
+  /**
+   * .compaction_coordinator.PCompactionStatusUpdate status = 4;
+   */
+  org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder getStatusOrBuilder();
+
+  /**
+   * int64 timestamp = 5;
+   * @return The timestamp.
+   */
+  long getTimestamp();
+}
diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml
index 0f021dd4978..9c3f477b2f1 100644
--- a/server/compactor/pom.xml
+++ b/server/compactor/pom.xml
@@ -30,6 +30,10 @@
   accumulo-compactor
   Apache Accumulo Compactor
   
+    
+      com.github.ben-manes.caffeine
+      caffeine
+    
     
       com.google.auto.service
       auto-service
diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index a1212925879..e5343017c60 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -54,16 +54,18 @@
 import org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest;
 import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc;
 import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceBlockingStub;
+import org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest;
 import org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest;
 import org.apache.accumulo.core.compaction.protobuf.PCompactionKind;
+import org.apache.accumulo.core.compaction.protobuf.PCompactionState;
 import org.apache.accumulo.core.compaction.protobuf.PCompactionStats;
+import org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate;
 import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob;
 import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob;
+import org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest;
 import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService;
 import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService.Client;
 import org.apache.accumulo.core.compaction.thrift.CompactorService;
-import org.apache.accumulo.core.compaction.thrift.TCompactionState;
-import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate;
 import org.apache.accumulo.core.compaction.thrift.UnknownCompactionIdException;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.ConfigurationCopy;
@@ -420,17 +422,23 @@ public void cancel(TInfo tinfo, TCredentials credentials, String externalCompact
    * @param update status update
    * @throws RetriesExceededException thrown when retries have been exceeded
    */
-  protected void updateCompactionState(PExternalCompactionJob job, TCompactionStatusUpdate update)
+  protected void updateCompactionState(PExternalCompactionJob job, PCompactionStatusUpdate update)
       throws RetriesExceededException {
     RetryableRpcCall thriftCall =
         new RetryableRpcCall<>(1000, RetryableRpcCall.MAX_WAIT_TIME, 25, () -> {
-          Client coordinatorClient = getCoordinatorClient();
+          var coordinatorClient = getGrpcCoordinatorClient();
           try {
-            coordinatorClient.updateCompactionStatus(TraceUtil.traceInfo(), getContext().rpcCreds(),
-                job.getExternalCompactionId(), update, System.currentTimeMillis());
+            var ignored =
+                coordinatorClient.updateCompactionStatus(UpdateCompactionStatusRequest.newBuilder()
+                    .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(getContext().gRpcCreds())
+                    .setExternalCompactionId(job.getExternalCompactionId()).setStatus(update)
+                    .setTimestamp(System.currentTimeMillis()).build());
+            return "";
+          } catch (Exception e) {
+            LOG.debug(e.getMessage());
             return "";
           } finally {
-            ThriftUtil.returnClient(coordinatorClient, getContext());
+            // TODO: Channel is currently cached and shared, look into using pooling
           }
         });
     thriftCall.run();
@@ -446,13 +454,15 @@ protected void updateCompactionFailed(PExternalCompactionJob job)
       throws RetriesExceededException {
     RetryableRpcCall thriftCall =
         new RetryableRpcCall<>(1000, RetryableRpcCall.MAX_WAIT_TIME, 25, () -> {
-          Client coordinatorClient = getCoordinatorClient();
+          var coordinatorClient = getGrpcCoordinatorClient();
           try {
-            coordinatorClient.compactionFailed(TraceUtil.traceInfo(), getContext().rpcCreds(),
-                job.getExternalCompactionId(), convert(job.getExtent()));
+            var ignored = coordinatorClient.compactionFailed(CompactionFailedRequest.newBuilder()
+                .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(getContext().gRpcCreds())
+                .setExternalCompactionId(job.getExternalCompactionId()).setExtent(job.getExtent())
+                .build());
             return "";
           } finally {
-            ThriftUtil.returnClient(coordinatorClient, getContext());
+            // TODO: Channel is currently cached and shared, look into using pooling
           }
         });
     thriftCall.run();
@@ -578,8 +588,10 @@ protected FileCompactorRunnable createCompactionJob(final PExternalCompactionJob
       public void initialize() throws RetriesExceededException {
         LOG.info("Starting up compaction runnable for job: {}", job);
         this.compactionStartTime = NanoTime.now();
-        TCompactionStatusUpdate update = new TCompactionStatusUpdate(TCompactionState.STARTED,
-            "Compaction started", -1, -1, -1, getCompactionAge().toNanos());
+        PCompactionStatusUpdate update =
+            PCompactionStatusUpdate.newBuilder().setState(PCompactionState.STARTED)
+                .setMessage("Compaction started").setEntriesToBeCompacted(-1).setEntriesRead(-1)
+                .setEntriesWritten(-1).setCompactionAgeNanos(getCompactionAge().toNanos()).build();
         updateCompactionState(job, update);
         final var extent = KeyExtent.fromProtobuf(job.getExtent());
         final AccumuloConfiguration aConfig;
@@ -646,8 +658,11 @@ public void run() {
 
           LOG.info("Compaction completed successfully {} ", job.getExternalCompactionId());
           // Update state when completed
-          TCompactionStatusUpdate update2 = new TCompactionStatusUpdate(TCompactionState.SUCCEEDED,
-              "Compaction completed successfully", -1, -1, -1, this.getCompactionAge().toNanos());
+          PCompactionStatusUpdate update2 = PCompactionStatusUpdate.newBuilder()
+              .setState(PCompactionState.SUCCEEDED).setMessage("Compaction completed successfully")
+              .setEntriesToBeCompacted(-1).setEntriesRead(-1).setEntriesWritten(-1)
+              .setCompactionAgeNanos(this.getCompactionAge().toNanos()).build();
+
           updateCompactionState(job, update2);
         } catch (FileCompactor.CompactionCanceledException cce) {
           LOG.debug("Compaction canceled {}", job.getExternalCompactionId());
@@ -847,9 +862,12 @@ public void run() {
                 watcher.run();
                 try {
                   LOG.debug("Updating coordinator with compaction progress: {}.", message);
-                  TCompactionStatusUpdate update = new TCompactionStatusUpdate(
-                      TCompactionState.IN_PROGRESS, message, inputEntries, entriesRead,
-                      entriesWritten, fcr.getCompactionAge().toNanos());
+                  PCompactionStatusUpdate update =
+                      PCompactionStatusUpdate.newBuilder().setState(PCompactionState.IN_PROGRESS)
+                          .setMessage(message).setEntriesToBeCompacted(inputEntries)
+                          .setEntriesRead(entriesRead).setEntriesWritten(entriesWritten)
+                          .setCompactionAgeNanos(fcr.getCompactionAge().toNanos()).build();
+
                   updateCompactionState(job, update);
                 } catch (RetriesExceededException e) {
                   LOG.warn("Error updating coordinator with compaction progress, error: {}",
@@ -876,9 +894,11 @@ public void run() {
               || (err.get() != null && err.get().getClass().equals(InterruptedException.class))) {
             LOG.warn("Compaction thread was interrupted, sending CANCELLED state");
             try {
-              TCompactionStatusUpdate update =
-                  new TCompactionStatusUpdate(TCompactionState.CANCELLED, "Compaction cancelled",
-                      -1, -1, -1, fcr.getCompactionAge().toNanos());
+              PCompactionStatusUpdate update = PCompactionStatusUpdate.newBuilder()
+                  .setState(PCompactionState.CANCELLED).setMessage("Compaction cancelled")
+                  .setEntriesToBeCompacted(-1).setEntriesRead(-1).setEntriesWritten(-1)
+                  .setCompactionAgeNanos(fcr.getCompactionAge().toNanos()).build();
+
               updateCompactionState(job, update);
               updateCompactionFailed(job);
             } catch (RetriesExceededException e) {
@@ -891,9 +911,12 @@ public void run() {
             try {
               LOG.info("Updating coordinator with compaction failure: id: {}, extent: {}",
                   job.getExternalCompactionId(), fromProtobufExtent);
-              TCompactionStatusUpdate update = new TCompactionStatusUpdate(TCompactionState.FAILED,
-                  "Compaction failed due to: " + err.get().getMessage(), -1, -1, -1,
-                  fcr.getCompactionAge().toNanos());
+              PCompactionStatusUpdate update =
+                  PCompactionStatusUpdate.newBuilder().setState(PCompactionState.FAILED)
+                      .setMessage("Compaction failed due to: " + err.get().getMessage())
+                      .setEntriesToBeCompacted(-1).setEntriesRead(-1).setEntriesWritten(-1)
+                      .setCompactionAgeNanos(fcr.getCompactionAge().toNanos()).build();
+
               updateCompactionState(job, update);
               updateCompactionFailed(job);
             } catch (RetriesExceededException e) {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
index 744879abd40..893183febf9 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -66,18 +66,25 @@
 import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException;
+import org.apache.accumulo.core.compaction.protobuf.CancelRequest;
 import org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest;
 import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc;
+import org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest;
 import org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest;
+import org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest;
+import org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest;
 import org.apache.accumulo.core.compaction.protobuf.PCompactionKind;
+import org.apache.accumulo.core.compaction.protobuf.PCompactionState;
+import org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate;
 import org.apache.accumulo.core.compaction.protobuf.PCredentials;
 import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob;
+import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList;
 import org.apache.accumulo.core.compaction.protobuf.PInputFile;
 import org.apache.accumulo.core.compaction.protobuf.PIteratorConfig;
 import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob;
 import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo;
+import org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest;
 import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService;
-import org.apache.accumulo.core.compaction.thrift.TCompactionState;
 import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate;
 import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
 import org.apache.accumulo.core.compaction.thrift.TExternalCompactionList;
@@ -315,10 +322,10 @@ public void run() {
     } else {
       LOG.info("Found {} running external compactions", running.size());
       running.forEach(rc -> {
-        TCompactionStatusUpdate update = new TCompactionStatusUpdate();
-        update.setState(TCompactionState.IN_PROGRESS);
-        update.setMessage("Coordinator restarted, compaction found in progress");
-        rc.addUpdate(System.currentTimeMillis(), update);
+        PCompactionStatusUpdate update =
+            PCompactionStatusUpdate.newBuilder().setState(PCompactionState.IN_PROGRESS)
+                .setMessage("Coordinator restarted, compaction found in progress").build();
+        rc.addUpdate(System.currentTimeMillis(), convert(update));
         RUNNING_CACHE.put(ExternalCompactionId.of(rc.getJob().getExternalCompactionId()), rc);
       });
     }
@@ -758,15 +765,7 @@ public void compactionCompleted(TInfo tinfo, TCredentials credentials,
   @Override
   public void compactionFailed(TInfo tinfo, TCredentials credentials, String externalCompactionId,
       TKeyExtent extent) throws ThriftSecurityException {
-    // do not expect users to call this directly, expect other tservers to call this method
-    if (!security.canPerformSystemActions(credentials)) {
-      throw new AccumuloSecurityException(credentials.getPrincipal(),
-          SecurityErrorCode.PERMISSION_DENIED).asThriftException();
-    }
-    KeyExtent fromThriftExtent = KeyExtent.fromThrift(extent);
-    LOG.info("Compaction failed, id: {}, extent: {}", externalCompactionId, fromThriftExtent);
-    final var ecid = ExternalCompactionId.of(externalCompactionId);
-    compactionsFailed(Map.of(ecid, KeyExtent.fromThrift(extent)));
+    throw new UnsupportedOperationException();
   }
 
   void compactionsFailed(Map compactions) {
@@ -884,17 +883,7 @@ public boolean test(TabletMetadata tabletMetadata) {
   public void updateCompactionStatus(TInfo tinfo, TCredentials credentials,
       String externalCompactionId, TCompactionStatusUpdate update, long timestamp)
       throws ThriftSecurityException {
-    // do not expect users to call this directly, expect other tservers to call this method
-    if (!security.canPerformSystemActions(credentials)) {
-      throw new AccumuloSecurityException(credentials.getPrincipal(),
-          SecurityErrorCode.PERMISSION_DENIED).asThriftException();
-    }
-    LOG.debug("Compaction status update, id: {}, timestamp: {}, update: {}", externalCompactionId,
-        timestamp, update);
-    final RunningCompaction rc = RUNNING_CACHE.get(ExternalCompactionId.of(externalCompactionId));
-    if (null != rc) {
-      rc.addUpdate(timestamp, update);
-    }
+    throw new UnsupportedOperationException();
   }
 
   public void recordCompletion(ExternalCompactionId ecid) {
@@ -1172,11 +1161,11 @@ public void compactionCompleted(CompactionCompletedRequest request,
       // TODO: Do we want to offload this processing to a new thread like we plan to do with
       // getCompactionJob() ?
 
-      var credentials = request.getCredentials();
+      var credentials = convert(request.getCredentials());
 
       try {
         // do not expect users to call this directly, expect other tservers to call this method
-        if (!security.canPerformSystemActions(convert(credentials))) {
+        if (!security.canPerformSystemActions(credentials)) {
           throw new AccumuloSecurityException(credentials.getPrincipal(),
               SecurityErrorCode.PERMISSION_DENIED).asThriftException();
         }
@@ -1231,8 +1220,185 @@ public void compactionCompleted(CompactionCompletedRequest request,
 
         responseObserver.onCompleted();
       } catch (ThriftSecurityException e) {
+        responseObserver.onError(e);
+        throw new RuntimeException(e);
+      } catch (Exception e) {
+        responseObserver.onError(e);
+        LOG.error(e.getMessage(), e);
+        throw e;
+      }
+    }
+
+    @Override
+    public void updateCompactionStatus(UpdateCompactionStatusRequest request,
+        StreamObserver responseObserver) {
+
+      // TODO: Do we want to offload this processing to a new thread like we plan to do with
+      // getCompactionJob() ?
+
+      var credentials = convert(request.getCredentials());
+
+      try {
+        // do not expect users to call this directly, expect other tservers to call this method
+        if (!security.canPerformSystemActions(credentials)) {
+          throw new AccumuloSecurityException(credentials.getPrincipal(),
+              SecurityErrorCode.PERMISSION_DENIED).asThriftException();
+        }
+        LOG.debug("Compaction status update, id: {}, timestamp: {}, update: {}",
+            request.getExternalCompactionId(), request.getTimestamp(), request.getStatus());
+        final RunningCompaction rc =
+            RUNNING_CACHE.get(ExternalCompactionId.of(request.getExternalCompactionId()));
+        if (null != rc) {
+          rc.addUpdate(request.getTimestamp(), convert(request.getStatus()));
+        }
+        responseObserver.onCompleted();
+      } catch (ThriftSecurityException e) {
+        responseObserver.onError(e);
+        throw new RuntimeException(e);
+      } catch (Exception e) {
+        responseObserver.onError(e);
+        LOG.error(e.getMessage(), e);
+        throw e;
+      }
+    }
+
+    @Override
+    public void compactionFailed(CompactionFailedRequest request,
+        StreamObserver responseObserver) {
+
+      // TODO: Do we want to offload this processing to a new thread like we plan to do with
+      // getCompactionJob() ?
+
+      var credentials = convert(request.getCredentials());
+
+      try {
+        // do not expect users to call this directly, expect other tservers to call this method
+        if (!security.canPerformSystemActions(credentials)) {
+          throw new AccumuloSecurityException(credentials.getPrincipal(),
+              SecurityErrorCode.PERMISSION_DENIED).asThriftException();
+        }
+        KeyExtent extent = KeyExtent.fromProtobuf(request.getExtent());
+        LOG.info("Compaction failed, id: {}, extent: {}", request.getExternalCompactionId(),
+            extent);
+        final var ecid = ExternalCompactionId.of(request.getExternalCompactionId());
+        compactionsFailed(Map.of(ecid, extent));
+      } catch (ThriftSecurityException e) {
+        responseObserver.onError(e);
+        throw new RuntimeException(e);
+      } catch (Exception e) {
+        responseObserver.onError(e);
+        LOG.error(e.getMessage(), e);
+        throw e;
+      }
+    }
+
+    @Override
+    public void getRunningCompactions(GetRunningCompactionsRequest request,
+        StreamObserver responseObserver) {
+
+      // TODO
+      super.getRunningCompactions(request, responseObserver);
+
+      // // TODO: Do we want to offload this processing to a new thread like we plan to do with
+      // // getCompactionJob() ?
+      //
+      // var credentials = convert(request.getCredentials());
+      //
+      // try {
+      // // do not expect users to call this directly, expect other tservers to call this method
+      // if (!security.canPerformSystemActions(credentials)) {
+      // throw new AccumuloSecurityException(credentials.getPrincipal(),
+      // SecurityErrorCode.PERMISSION_DENIED).asThriftException();
+      // }
+      //
+      // final PExternalCompactionList.Builder resultBuilder = PExternalCompactionList.newBuilder();
+      // RUNNING_CACHE.forEach((ecid, rc) -> {
+      // PExternalCompaction prc = PExternalCompaction.newBuilder().setGroupName(rc.getGroupName())
+      // .setCompactor(rc.getCompactorAddress()).setJob(convert(rc.getJob()))
+      // .putAllUpdates(rc.getUpdates()).build();
+      // resultBuilder.putCompactions(ecid.canonical(), prc);
+      // });
+      // responseObserver.onNext(resultBuilder.build());
+      // responseObserver.onCompleted();
+      // } catch (ThriftSecurityException e) {
+      // responseObserver.onError(e);
+      // throw new RuntimeException(e);
+      // } catch (Exception e) {
+      // responseObserver.onError(e);
+      // LOG.error(e.getMessage(), e);
+      // throw e;
+      // }
+    }
+
+    @Override
+    public void getCompletedCompactions(GetCompletedCompactionsRequest request,
+        StreamObserver responseObserver) {
+
+      // TODO
+      super.getCompletedCompactions(request, responseObserver);
+
+      // // TODO: Do we want to offload this processing to a new thread like we plan to do with
+      // // getCompactionJob() ?
+      //
+      // var credentials = convert(request.getCredentials());
+      //
+      // try {
+      // // do not expect users to call this directly, expect other tservers to call this method
+      // if (!security.canPerformSystemActions(credentials)) {
+      // throw new AccumuloSecurityException(credentials.getPrincipal(),
+      // SecurityErrorCode.PERMISSION_DENIED).asThriftException();
+      // }
+      // final PExternalCompactionList.Builder resultBuilder = PExternalCompactionList.newBuilder();
+      //
+      // completed.asMap().forEach((ecid, rc) -> {
+      // PExternalCompaction prc = PExternalCompaction.newBuilder().setGroupName(rc.getGroupName())
+      // .setCompactor(rc.getCompactorAddress()).setJob(convert(rc.getJob()))
+      // .putAllUpdates(rc.getUpdates()).build();
+      // resultBuilder.putCompactions(ecid.canonical(), prc);
+      // });
+      // responseObserver.onNext(resultBuilder.build());
+      // responseObserver.onCompleted();
+      // } catch (ThriftSecurityException e) {
+      // responseObserver.onError(e);
+      // throw new RuntimeException(e);
+      // } catch (Exception e) {
+      // responseObserver.onError(e);
+      // LOG.error(e.getMessage(), e);
+      // throw e;
+      // }
+    }
+
+    @Override
+    public void cancel(CancelRequest request, StreamObserver responseObserver) {
+      // TODO: Do we want to offload this processing to a new thread like we plan to do with
+      // getCompactionJob() ?
+
+      var credentials = convert(request.getCredentials());
+
+      try {
+        var runningCompaction =
+            RUNNING_CACHE.get(ExternalCompactionId.of(request.getExternalCompactionId()));
+        var extent = KeyExtent.fromThrift(runningCompaction.getJob().getExtent());
+        try {
+          NamespaceId nsId = CompactionCoordinator.this.ctx.getNamespaceId(extent.tableId());
+          if (!security.canCompact(credentials, extent.tableId(), nsId)) {
+            throw new AccumuloSecurityException(credentials.getPrincipal(),
+                SecurityErrorCode.PERMISSION_DENIED).asThriftException();
+          }
+        } catch (TableNotFoundException e) {
+          throw new ThriftTableOperationException(extent.tableId().canonical(), null,
+              TableOperation.COMPACT_CANCEL, TableOperationExceptionType.NOTFOUND, e.getMessage());
+        }
+
+        cancelCompactionOnCompactor(runningCompaction.getCompactorAddress(),
+            request.getExternalCompactionId());
+
+        responseObserver.onCompleted();
+      } catch (ThriftSecurityException | ThriftTableOperationException e) {
+        responseObserver.onError(e);
         throw new RuntimeException(e);
       } catch (Exception e) {
+        responseObserver.onError(e);
         LOG.error(e.getMessage(), e);
         throw e;
       }
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java
index 3b3e049eabf..54fa0d5fe0a 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java
@@ -28,10 +28,10 @@
 
 import org.apache.accumulo.compactor.Compactor;
 import org.apache.accumulo.core.cli.ConfigOpts;
+import org.apache.accumulo.core.compaction.protobuf.PCompactionState;
+import org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate;
 import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob;
 import org.apache.accumulo.core.compaction.thrift.CompactorService.Iface;
-import org.apache.accumulo.core.compaction.thrift.TCompactionState;
-import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.metadata.ReferencedTabletFile;
 import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
@@ -85,9 +85,8 @@ public Duration getCompactionAge() {
       public void run() {
         try {
           LOG.info("Starting up compaction runnable for job: {}", job);
-          TCompactionStatusUpdate update = new TCompactionStatusUpdate();
-          update.setState(TCompactionState.STARTED);
-          update.setMessage("Compaction started");
+          PCompactionStatusUpdate update = PCompactionStatusUpdate.newBuilder()
+              .setState(PCompactionState.STARTED).setMessage("Compaction started").build();
           updateCompactionState(job, update);
 
           // Create tmp output file

From 548d2cac95c1df3bb6424ff436b5d427b6d958ac Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Fri, 19 Jul 2024 10:32:34 -0400
Subject: [PATCH 14/25] Move new gRPC generation to a new module

---
 core/pom.xml                                  |  59 +---
 .../core/clientImpl/ClientContext.java        |   2 +-
 .../accumulo/core/clientImpl/Credentials.java |   2 +-
 .../accumulo/core/dataImpl/KeyExtent.java     |   2 +-
 .../system/SystemIteratorUtil.java            |   4 +-
 .../accumulo/core/rpc/ThriftProtobufUtil.java |  24 +-
 .../apache/accumulo/core/trace/TraceUtil.java |   4 +-
 core/src/main/spotbugs/exclude-filter.xml     |   6 -
 pom.xml                                       |  19 +-
 rpc/grpc/.gitignore                           |  36 +++
 rpc/grpc/pom.xml                              | 110 ++++++++
 .../grpc}/src/main/proto/client.proto         |   2 +-
 .../main/proto/compaction-coordinator.proto   |   2 +-
 {core => rpc/grpc}/src/main/proto/data.proto  |   2 +-
 .../grpc}/src/main/proto/manager.proto        |   2 +-
 .../grpc}/src/main/proto/security.proto       |   2 +-
 .../grpc}/src/main/proto/tabletserver.proto   |   2 +-
 .../compaction/protobuf/CancelRequest.java    | 152 +++++-----
 .../protobuf/CancelRequestOrBuilder.java      |  10 +-
 .../compaction/protobuf/ClientProto.java      |   6 +-
 .../protobuf/CompactionCompletedRequest.java  | 224 +++++++--------
 .../CompactionCompletedRequestOrBuilder.java  |  18 +-
 .../CompactionCoordinatorServiceGrpc.java     | 229 ++++++++-------
 .../CompactionCoordinatorServiceProto.java    |  24 +-
 .../protobuf/CompactionFailedRequest.java     | 188 ++++++-------
 .../CompactionFailedRequestOrBuilder.java     |  14 +-
 .../protobuf/CompactionJobRequest.java        | 152 +++++-----
 .../CompactionJobRequestOrBuilder.java        |  10 +-
 .../grpc}/compaction/protobuf/DataProto.java  |   4 +-
 .../GetCompletedCompactionsRequest.java       | 152 +++++-----
 ...tCompletedCompactionsRequestOrBuilder.java |  10 +-
 .../GetRunningCompactionsRequest.java         | 152 +++++-----
 ...GetRunningCompactionsRequestOrBuilder.java |  10 +-
 .../compaction/protobuf/ManagerProto.java     |   4 +-
 .../compaction/protobuf/PCompactionKind.java  |   4 +-
 .../compaction/protobuf/PCompactionState.java |   4 +-
 .../compaction/protobuf/PCompactionStats.java |  80 +++---
 .../protobuf/PCompactionStatsOrBuilder.java   |   2 +-
 .../protobuf/PCompactionStatusUpdate.java     |  98 +++----
 .../PCompactionStatusUpdateOrBuilder.java     |   4 +-
 .../compaction/protobuf/PCredentials.java     |  80 +++---
 .../protobuf/PCredentialsOrBuilder.java       |   2 +-
 .../protobuf/PExternalCompaction.java         | 200 ++++++-------
 .../protobuf/PExternalCompactionJob.java      | 264 +++++++++---------
 .../PExternalCompactionJobOrBuilder.java      |  24 +-
 .../protobuf/PExternalCompactionList.java     | 164 +++++------
 .../PExternalCompactionListOrBuilder.java     |  12 +-
 .../PExternalCompactionOrBuilder.java         |  16 +-
 .../grpc}/compaction/protobuf/PFateId.java    |  98 +++----
 .../compaction/protobuf/PFateIdOrBuilder.java |   4 +-
 .../protobuf/PFateInstanceType.java           |   4 +-
 .../grpc}/compaction/protobuf/PInputFile.java |  80 +++---
 .../protobuf/PInputFileOrBuilder.java         |   2 +-
 .../compaction/protobuf/PIteratorConfig.java  | 140 +++++-----
 .../protobuf/PIteratorConfigOrBuilder.java    |  10 +-
 .../compaction/protobuf/PIteratorSetting.java |  82 +++---
 .../protobuf/PIteratorSettingOrBuilder.java   |   2 +-
 .../grpc}/compaction/protobuf/PKeyExtent.java |  80 +++---
 .../protobuf/PKeyExtentOrBuilder.java         |   2 +-
 .../protobuf/PNextCompactionJob.java          | 116 ++++----
 .../protobuf/PNextCompactionJobOrBuilder.java |   6 +-
 .../grpc}/compaction/protobuf/ProtoTInfo.java |  82 +++---
 .../protobuf/ProtoTInfoOrBuilder.java         |   2 +-
 .../compaction/protobuf/SecurityProto.java    |   4 +-
 .../protobuf/TabletServerProto.java           |  12 +-
 .../UpdateCompactionStatusRequest.java        | 188 ++++++-------
 ...pdateCompactionStatusRequestOrBuilder.java |  14 +-
 rpc/grpc/src/main/spotbugs/exclude-filter.xml |  37 +++
 server/base/pom.xml                           |   4 +
 .../CompactionCoordinatorServiceServer.java   |   2 +-
 server/compactor/pom.xml                      |  12 +
 .../compactor/CompactionJobHolder.java        |   4 +-
 .../apache/accumulo/compactor/Compactor.java  |  24 +-
 .../apache/accumulo/compactor/ExtCEnv.java    |   2 +-
 server/manager/pom.xml                        |  16 ++
 .../coordinator/CompactionCoordinator.java    |  36 +--
 .../coordinator/commit/CommitCompaction.java  |   2 +-
 .../commit/CompactionCommitData.java          |   2 +-
 .../compaction/CompactionCoordinatorTest.java |   8 +-
 test/pom.xml                                  |   4 +
 .../ExternalDoNothingCompactor.java           |   6 +-
 81 files changed, 1918 insertions(+), 1762 deletions(-)
 create mode 100644 rpc/grpc/.gitignore
 create mode 100644 rpc/grpc/pom.xml
 rename {core => rpc/grpc}/src/main/proto/client.proto (93%)
 rename {core => rpc/grpc}/src/main/proto/compaction-coordinator.proto (98%)
 rename {core => rpc/grpc}/src/main/proto/data.proto (94%)
 rename {core => rpc/grpc}/src/main/proto/manager.proto (94%)
 rename {core => rpc/grpc}/src/main/proto/security.proto (95%)
 rename {core => rpc/grpc}/src/main/proto/tabletserver.proto (97%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/CancelRequest.java (82%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/CancelRequestOrBuilder.java (87%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/ClientProto.java (94%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/CompactionCompletedRequest.java (81%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/CompactionCompletedRequestOrBuilder.java (83%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/CompactionCoordinatorServiceGrpc.java (79%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/CompactionCoordinatorServiceProto.java (95%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/CompactionFailedRequest.java (82%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/CompactionFailedRequestOrBuilder.java (84%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/CompactionJobRequest.java (86%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/CompactionJobRequestOrBuilder.java (89%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/DataProto.java (96%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/GetCompletedCompactionsRequest.java (80%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/GetCompletedCompactionsRequestOrBuilder.java (85%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/GetRunningCompactionsRequest.java (80%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/GetRunningCompactionsRequestOrBuilder.java (85%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/ManagerProto.java (96%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PCompactionKind.java (97%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PCompactionState.java (98%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PCompactionStats.java (86%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PCompactionStatsOrBuilder.java (96%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PCompactionStatusUpdate.java (89%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PCompactionStatusUpdateOrBuilder.java (94%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PCredentials.java (91%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PCredentialsOrBuilder.java (98%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PExternalCompaction.java (82%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PExternalCompactionJob.java (86%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PExternalCompactionJobOrBuilder.java (87%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PExternalCompactionList.java (79%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PExternalCompactionListOrBuilder.java (85%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PExternalCompactionOrBuilder.java (85%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PFateId.java (84%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PFateIdOrBuilder.java (93%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PFateInstanceType.java (97%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PInputFile.java (89%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PInputFileOrBuilder.java (97%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PIteratorConfig.java (82%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PIteratorConfigOrBuilder.java (84%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PIteratorSetting.java (92%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PIteratorSettingOrBuilder.java (97%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PKeyExtent.java (88%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PKeyExtentOrBuilder.java (97%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PNextCompactionJob.java (82%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/PNextCompactionJobOrBuilder.java (89%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/ProtoTInfo.java (88%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/ProtoTInfoOrBuilder.java (97%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/SecurityProto.java (96%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/TabletServerProto.java (96%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/UpdateCompactionStatusRequest.java (83%)
 rename {core/src/main/protobuf-gen-java/org/apache/accumulo/core => rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc}/compaction/protobuf/UpdateCompactionStatusRequestOrBuilder.java (86%)
 create mode 100644 rpc/grpc/src/main/spotbugs/exclude-filter.xml

diff --git a/core/pom.xml b/core/pom.xml
index 03de3099962..c953660e78e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -73,14 +73,6 @@
       commons-logging
       commons-logging
     
-    
-      io.grpc
-      grpc-protobuf
-    
-    
-      io.grpc
-      grpc-stub
-    
     
       io.micrometer
       micrometer-core
@@ -97,6 +89,10 @@
       org.apache.accumulo
       accumulo-access
     
+    
+      org.apache.accumulo
+      accumulo-grpc
+    
     
       org.apache.accumulo
       accumulo-start
@@ -166,12 +162,6 @@
       log4j-api
       provided
     
-    
-      
-      org.apache.tomcat
-      annotations-api
-      provided
-    
     
       io.grpc
       grpc-netty-shaded
@@ -285,8 +275,8 @@
                 org[.]apache[.]accumulo[.]core[.]security[.]crypto[.].*
               
               
-                
+                
                 org[.]apache[.]accumulo[.].*[.]thrift[.].*
                 org[.]apache[.]accumulo[.].*[.]protobuf[.].*
                 
       
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index 4ec034db8e4..a4bb1c707c5 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -68,7 +68,6 @@
 import org.apache.accumulo.core.client.admin.SecurityOperations;
 import org.apache.accumulo.core.client.admin.TableOperations;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
-import org.apache.accumulo.core.compaction.protobuf.PCredentials;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.ClientProperty;
 import org.apache.accumulo.core.conf.Property;
@@ -102,6 +101,7 @@
 import org.apache.accumulo.core.util.tables.TableZooHelper;
 import org.apache.accumulo.core.util.threads.ThreadPools;
 import org.apache.accumulo.core.util.threads.Threads;
+import org.apache.accumulo.grpc.compaction.protobuf.PCredentials;
 import org.apache.hadoop.conf.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java
index f1e73e9e3db..7a1c17232a1 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/Credentials.java
@@ -28,9 +28,9 @@
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
 import org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode;
-import org.apache.accumulo.core.compaction.protobuf.PCredentials;
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
+import org.apache.accumulo.grpc.compaction.protobuf.PCredentials;
 
 import com.google.protobuf.ByteString;
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java
index 4771beb635f..7c74e7e6106 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java
@@ -42,7 +42,6 @@
 import java.util.TreeSet;
 import java.util.UUID;
 
-import org.apache.accumulo.core.compaction.protobuf.PKeyExtent;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.TableId;
@@ -55,6 +54,7 @@
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.TextUtil;
+import org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent;
 import org.apache.hadoop.io.BinaryComparable;
 import org.apache.hadoop.io.Text;
 
diff --git a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SystemIteratorUtil.java b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SystemIteratorUtil.java
index 73a8263ffa6..eb93998878e 100644
--- a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SystemIteratorUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/SystemIteratorUtil.java
@@ -24,14 +24,14 @@
 import java.util.Set;
 
 import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.compaction.protobuf.PIteratorConfig;
-import org.apache.accumulo.core.compaction.protobuf.PIteratorSetting;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.data.Column;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig;
+import org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting;
 
 /**
  * System utility class. Not for client use.
diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java
index 3209860f2f0..9dae2c0aa57 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java
@@ -23,18 +23,6 @@
 import java.util.Optional;
 
 import org.apache.accumulo.core.clientImpl.thrift.TInfo;
-import org.apache.accumulo.core.compaction.protobuf.PCompactionKind;
-import org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate;
-import org.apache.accumulo.core.compaction.protobuf.PCredentials;
-import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob;
-import org.apache.accumulo.core.compaction.protobuf.PFateId;
-import org.apache.accumulo.core.compaction.protobuf.PFateInstanceType;
-import org.apache.accumulo.core.compaction.protobuf.PInputFile;
-import org.apache.accumulo.core.compaction.protobuf.PIteratorConfig;
-import org.apache.accumulo.core.compaction.protobuf.PIteratorSetting;
-import org.apache.accumulo.core.compaction.protobuf.PKeyExtent;
-import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob;
-import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo;
 import org.apache.accumulo.core.compaction.thrift.TCompactionState;
 import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate;
 import org.apache.accumulo.core.compaction.thrift.TNextCompactionJob;
@@ -47,6 +35,18 @@
 import org.apache.accumulo.core.tabletserver.thrift.TCompactionKind;
 import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob;
 import org.apache.accumulo.core.tabletserver.thrift.TIteratorSetting;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate;
+import org.apache.accumulo.grpc.compaction.protobuf.PCredentials;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob;
+import org.apache.accumulo.grpc.compaction.protobuf.PFateId;
+import org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType;
+import org.apache.accumulo.grpc.compaction.protobuf.PInputFile;
+import org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig;
+import org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting;
+import org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent;
+import org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob;
+import org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java b/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java
index 8dc23add6fc..6b9a5a4ac76 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java
@@ -26,10 +26,10 @@
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.clientImpl.thrift.TInfo;
-import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo;
-import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo;
+import org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/spotbugs/exclude-filter.xml b/core/src/main/spotbugs/exclude-filter.xml
index 03ce7cdca32..ded70a98dc4 100644
--- a/core/src/main/spotbugs/exclude-filter.xml
+++ b/core/src/main/spotbugs/exclude-filter.xml
@@ -40,12 +40,6 @@
       
     
   
-  
-    
-    
-      
-    
-  
   
     
     
diff --git a/pom.xml b/pom.xml
index 332a2189098..66cdde1f4b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,7 @@
     hadoop-mapreduce
     iterator-test-harness
     minicluster
+    rpc/grpc
     server/base
     server/compactor
     server/gc
@@ -347,6 +348,11 @@
         accumulo-gc
         ${project.version}
       
+      
+        org.apache.accumulo
+        accumulo-grpc
+        ${project.version}
+      
       
         org.apache.accumulo
         accumulo-hadoop-mapreduce
@@ -521,12 +527,6 @@
         libthrift
         ${version.thrift}
       
-      
-        
-        org.apache.tomcat
-        annotations-api
-        6.0.53
-      
       
         org.apache.zookeeper
         zookeeper
@@ -927,11 +927,6 @@
                 org.apache.httpcomponents:httpcore:jar:*
                 org.powermock:powermock-core:jar:*
                 org.powermock:powermock-reflect:jar:*
-                
-                com.google.protobuf:protobuf-java:*
-                
-                io.grpc:grpc-api:*
-                io.grpc:grpc-stub:*
               
               
                 
@@ -956,8 +951,6 @@
                 
                 biz.aQute.bnd:biz.aQute.bnd.annotation:jar:*
                 org.junit.jupiter:junit-jupiter-engine:jar:*
-                
-                org.apache.tomcat:annotations-api:jar:*
                 
                 io.grpc:grpc-netty-shaded:jar:*
               
diff --git a/rpc/grpc/.gitignore b/rpc/grpc/.gitignore
new file mode 100644
index 00000000000..55d7f58f9d5
--- /dev/null
+++ b/rpc/grpc/.gitignore
@@ -0,0 +1,36 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Maven ignores
+/target/
+
+# IDE ignores
+/.settings/
+/.project
+/.classpath
+/.pydevproject
+/.idea
+/*.iml
+/*.ipr
+/*.iws
+/nbproject/
+/nbactions.xml
+/nb-configuration.xml
+/.vscode/
+/.factorypath
diff --git a/rpc/grpc/pom.xml b/rpc/grpc/pom.xml
new file mode 100644
index 00000000000..059c3fc4449
--- /dev/null
+++ b/rpc/grpc/pom.xml
@@ -0,0 +1,110 @@
+
+
+
+  4.0.0
+  
+    org.apache.accumulo
+    accumulo-project
+    4.0.0-SNAPSHOT
+  
+  accumulo-grpc
+  Apache Accumulo gRPC
+  Apache Accumulo gRPC module.
+  
+    
+      com.google.guava
+      guava
+    
+    
+      com.google.protobuf
+      protobuf-java
+    
+    
+      io.grpc
+      grpc-api
+    
+    
+      io.grpc
+      grpc-protobuf
+    
+    
+      io.grpc
+      grpc-stub
+    
+    
+      io.grpc
+      grpc-netty-shaded
+      runtime
+    
+  
+  
+    
+      
+        kr.motd.maven
+        os-maven-plugin
+        1.7.1
+      
+    
+  
+  
+    
+      protobuf
+      
+        
+          
+            org.xolstice.maven.plugins
+            protobuf-maven-plugin
+            0.6.1
+            
+              com.google.protobuf:protoc:3.25.3:exe:${os.detected.classifier}
+              grpc-java
+              io.grpc:protoc-gen-grpc-java:1.64.0:exe:${os.detected.classifier}
+              src/main/protobuf-gen-java/
+              
+              @generated=omit
+            
+            
+              
+                generate-protobuf
+                
+                  compile
+                
+                generate-sources
+              
+              
+                generate-grpc
+                
+                  compile-custom
+                
+                generate-sources
+                
+                  false
+                
+              
+            
+          
+        
+      
+    
+  
+
diff --git a/core/src/main/proto/client.proto b/rpc/grpc/src/main/proto/client.proto
similarity index 93%
rename from core/src/main/proto/client.proto
rename to rpc/grpc/src/main/proto/client.proto
index b2d54415b9e..13cbb05a8cd 100644
--- a/core/src/main/proto/client.proto
+++ b/rpc/grpc/src/main/proto/client.proto
@@ -20,7 +20,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.apache.accumulo.core.compaction.protobuf";
+option java_package = "org.apache.accumulo.grpc.compaction.protobuf";
 option java_outer_classname = "ClientProto";
 
 package client;
diff --git a/core/src/main/proto/compaction-coordinator.proto b/rpc/grpc/src/main/proto/compaction-coordinator.proto
similarity index 98%
rename from core/src/main/proto/compaction-coordinator.proto
rename to rpc/grpc/src/main/proto/compaction-coordinator.proto
index eca19ed9a2b..8d3f4e46b8a 100644
--- a/core/src/main/proto/compaction-coordinator.proto
+++ b/rpc/grpc/src/main/proto/compaction-coordinator.proto
@@ -20,7 +20,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.apache.accumulo.core.compaction.protobuf";
+option java_package = "org.apache.accumulo.grpc.compaction.protobuf";
 option java_outer_classname = "CompactionCoordinatorServiceProto";
 
 import "google/protobuf/empty.proto";
diff --git a/core/src/main/proto/data.proto b/rpc/grpc/src/main/proto/data.proto
similarity index 94%
rename from core/src/main/proto/data.proto
rename to rpc/grpc/src/main/proto/data.proto
index 8d531b61d93..3dc89e10009 100644
--- a/core/src/main/proto/data.proto
+++ b/rpc/grpc/src/main/proto/data.proto
@@ -20,7 +20,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.apache.accumulo.core.compaction.protobuf";
+option java_package = "org.apache.accumulo.grpc.compaction.protobuf";
 option java_outer_classname = "DataProto";
 
 package data;
diff --git a/core/src/main/proto/manager.proto b/rpc/grpc/src/main/proto/manager.proto
similarity index 94%
rename from core/src/main/proto/manager.proto
rename to rpc/grpc/src/main/proto/manager.proto
index b3b2970c472..1140b9461b6 100644
--- a/core/src/main/proto/manager.proto
+++ b/rpc/grpc/src/main/proto/manager.proto
@@ -20,7 +20,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.apache.accumulo.core.compaction.protobuf";
+option java_package = "org.apache.accumulo.grpc.compaction.protobuf";
 option java_outer_classname = "ManagerProto";
 
 package manager;
diff --git a/core/src/main/proto/security.proto b/rpc/grpc/src/main/proto/security.proto
similarity index 95%
rename from core/src/main/proto/security.proto
rename to rpc/grpc/src/main/proto/security.proto
index 80c85f3d1c4..9a3c645aa74 100644
--- a/core/src/main/proto/security.proto
+++ b/rpc/grpc/src/main/proto/security.proto
@@ -20,7 +20,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.apache.accumulo.core.compaction.protobuf";
+option java_package = "org.apache.accumulo.grpc.compaction.protobuf";
 option java_outer_classname = "SecurityProto";
 
 package security;
diff --git a/core/src/main/proto/tabletserver.proto b/rpc/grpc/src/main/proto/tabletserver.proto
similarity index 97%
rename from core/src/main/proto/tabletserver.proto
rename to rpc/grpc/src/main/proto/tabletserver.proto
index ccd1ce9dfdd..28e4157b80b 100644
--- a/core/src/main/proto/tabletserver.proto
+++ b/rpc/grpc/src/main/proto/tabletserver.proto
@@ -20,7 +20,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.apache.accumulo.core.compaction.protobuf";
+option java_package = "org.apache.accumulo.grpc.compaction.protobuf";
 option java_outer_classname = "TabletServerProto";
 
 import "data.proto";
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequest.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CancelRequest.java
similarity index 82%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequest.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CancelRequest.java
index 8e3f57a3499..2e52f260e6e 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequest.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CancelRequest.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code compaction_coordinator.CancelRequest}
@@ -47,20 +47,20 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.CancelRequest.class, org.apache.accumulo.core.compaction.protobuf.CancelRequest.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.CancelRequest.class, org.apache.accumulo.grpc.compaction.protobuf.CancelRequest.Builder.class);
   }
 
   private int bitField0_;
   public static final int PTINFO_FIELD_NUMBER = 1;
-  private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_;
+  private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_;
   /**
    * .client.ProtoTInfo ptinfo = 1;
    * @return Whether the ptinfo field is set.
@@ -74,19 +74,19 @@ public boolean hasPtinfo() {
    * @return The ptinfo.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() {
-    return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+  public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() {
+    return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
   }
   /**
    * .client.ProtoTInfo ptinfo = 1;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
-    return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+  public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
+    return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
   }
 
   public static final int CREDENTIALS_FIELD_NUMBER = 2;
-  private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_;
+  private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_;
   /**
    * .security.PCredentials credentials = 2;
    * @return Whether the credentials field is set.
@@ -100,15 +100,15 @@ public boolean hasCredentials() {
    * @return The credentials.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() {
-    return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() {
+    return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
   }
   /**
    * .security.PCredentials credentials = 2;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
-    return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
+    return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
   }
 
   public static final int EXTERNALCOMPACTIONID_FIELD_NUMBER = 3;
@@ -203,10 +203,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.CancelRequest)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.CancelRequest)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.CancelRequest other = (org.apache.accumulo.core.compaction.protobuf.CancelRequest) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.CancelRequest other = (org.apache.accumulo.grpc.compaction.protobuf.CancelRequest) obj;
 
     if (hasPtinfo() != other.hasPtinfo()) return false;
     if (hasPtinfo()) {
@@ -246,44 +246,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -291,26 +291,26 @@ public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -323,7 +323,7 @@ public static org.apache.accumulo.core.compaction.protobuf.CancelRequest parseFr
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.CancelRequest prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.CancelRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -344,21 +344,21 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:compaction_coordinator.CancelRequest)
-      org.apache.accumulo.core.compaction.protobuf.CancelRequestOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.CancelRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.CancelRequest.class, org.apache.accumulo.core.compaction.protobuf.CancelRequest.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.CancelRequest.class, org.apache.accumulo.grpc.compaction.protobuf.CancelRequest.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.CancelRequest.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.CancelRequest.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -396,17 +396,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CancelRequest_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.CancelRequest getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.CancelRequest.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.CancelRequest getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.CancelRequest.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.CancelRequest build() {
-      org.apache.accumulo.core.compaction.protobuf.CancelRequest result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.CancelRequest build() {
+      org.apache.accumulo.grpc.compaction.protobuf.CancelRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -414,14 +414,14 @@ public org.apache.accumulo.core.compaction.protobuf.CancelRequest build() {
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.CancelRequest buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.CancelRequest result = new org.apache.accumulo.core.compaction.protobuf.CancelRequest(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.CancelRequest buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.CancelRequest result = new org.apache.accumulo.grpc.compaction.protobuf.CancelRequest(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.CancelRequest result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.CancelRequest result) {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -476,16 +476,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.CancelRequest) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.CancelRequest)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.CancelRequest) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.CancelRequest)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.CancelRequest other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.CancelRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.CancelRequest other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.CancelRequest.getDefaultInstance()) return this;
       if (other.hasPtinfo()) {
         mergePtinfo(other.getPtinfo());
       }
@@ -559,9 +559,9 @@ public Builder mergeFrom(
     }
     private int bitField0_;
 
-    private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_;
+    private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_;
     /**
      * .client.ProtoTInfo ptinfo = 1;
      * @return Whether the ptinfo field is set.
@@ -573,9 +573,9 @@ public boolean hasPtinfo() {
      * .client.ProtoTInfo ptinfo = 1;
      * @return The ptinfo.
      */
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() {
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() {
       if (ptinfoBuilder_ == null) {
-        return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+        return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
       } else {
         return ptinfoBuilder_.getMessage();
       }
@@ -583,7 +583,7 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() {
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) {
+    public Builder setPtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) {
       if (ptinfoBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -600,7 +600,7 @@ public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo
      * .client.ProtoTInfo ptinfo = 1;
      */
     public Builder setPtinfo(
-        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder builderForValue) {
       if (ptinfoBuilder_ == null) {
         ptinfo_ = builderForValue.build();
       } else {
@@ -613,11 +613,11 @@ public Builder setPtinfo(
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) {
+    public Builder mergePtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) {
       if (ptinfoBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0) &&
           ptinfo_ != null &&
-          ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) {
+          ptinfo_ != org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance()) {
           getPtinfoBuilder().mergeFrom(value);
         } else {
           ptinfo_ = value;
@@ -647,7 +647,7 @@ public Builder clearPtinfo() {
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
       return getPtinfoFieldBuilder().getBuilder();
@@ -655,23 +655,23 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfo
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
       if (ptinfoBuilder_ != null) {
         return ptinfoBuilder_.getMessageOrBuilder();
       } else {
         return ptinfo_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+            org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
       }
     }
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> 
         getPtinfoFieldBuilder() {
       if (ptinfoBuilder_ == null) {
         ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder>(
                 getPtinfo(),
                 getParentForChildren(),
                 isClean());
@@ -680,9 +680,9 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinf
       return ptinfoBuilder_;
     }
 
-    private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_;
+    private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_;
     /**
      * .security.PCredentials credentials = 2;
      * @return Whether the credentials field is set.
@@ -694,9 +694,9 @@ public boolean hasCredentials() {
      * .security.PCredentials credentials = 2;
      * @return The credentials.
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() {
       if (credentialsBuilder_ == null) {
-        return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+        return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
       } else {
         return credentialsBuilder_.getMessage();
       }
@@ -704,7 +704,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(
     /**
      * .security.PCredentials credentials = 2;
      */
-    public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) {
+    public Builder setCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) {
       if (credentialsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -721,7 +721,7 @@ public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCred
      * .security.PCredentials credentials = 2;
      */
     public Builder setCredentials(
-        org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder builderForValue) {
       if (credentialsBuilder_ == null) {
         credentials_ = builderForValue.build();
       } else {
@@ -734,11 +734,11 @@ public Builder setCredentials(
     /**
      * .security.PCredentials credentials = 2;
      */
-    public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) {
+    public Builder mergeCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) {
       if (credentialsBuilder_ == null) {
         if (((bitField0_ & 0x00000002) != 0) &&
           credentials_ != null &&
-          credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) {
+          credentials_ != org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance()) {
           getCredentialsBuilder().mergeFrom(value);
         } else {
           credentials_ = value;
@@ -768,7 +768,7 @@ public Builder clearCredentials() {
     /**
      * .security.PCredentials credentials = 2;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
       return getCredentialsFieldBuilder().getBuilder();
@@ -776,23 +776,23 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCred
     /**
      * .security.PCredentials credentials = 2;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
       if (credentialsBuilder_ != null) {
         return credentialsBuilder_.getMessageOrBuilder();
       } else {
         return credentials_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+            org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
       }
     }
     /**
      * .security.PCredentials credentials = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> 
         getCredentialsFieldBuilder() {
       if (credentialsBuilder_ == null) {
         credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder>(
                 getCredentials(),
                 getParentForChildren(),
                 isClean());
@@ -889,12 +889,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:compaction_coordinator.CancelRequest)
-  private static final org.apache.accumulo.core.compaction.protobuf.CancelRequest DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.CancelRequest DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.CancelRequest();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.CancelRequest();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.CancelRequest getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.CancelRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -930,7 +930,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.CancelRequest getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.CancelRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequestOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CancelRequestOrBuilder.java
similarity index 87%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequestOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CancelRequestOrBuilder.java
index 1dca2517834..17cdc5c5a30 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CancelRequestOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CancelRequestOrBuilder.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface CancelRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:compaction_coordinator.CancelRequest)
@@ -35,11 +35,11 @@ public interface CancelRequestOrBuilder extends
    * .client.ProtoTInfo ptinfo = 1;
    * @return The ptinfo.
    */
-  org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo();
+  org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo();
   /**
    * .client.ProtoTInfo ptinfo = 1;
    */
-  org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder();
 
   /**
    * .security.PCredentials credentials = 2;
@@ -50,11 +50,11 @@ public interface CancelRequestOrBuilder extends
    * .security.PCredentials credentials = 2;
    * @return The credentials.
    */
-  org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials();
+  org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials();
   /**
    * .security.PCredentials credentials = 2;
    */
-  org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder();
 
   /**
    * string externalCompactionId = 3;
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ClientProto.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ClientProto.java
similarity index 94%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ClientProto.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ClientProto.java
index a26042b416d..b13d8b160d8 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ClientProto.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ClientProto.java
@@ -20,7 +20,7 @@
 // source: client.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public final class ClientProto {
   private ClientProto() {}
@@ -55,8 +55,8 @@ public static void registerAllExtensions(
       "\n\014client.proto\022\006client\"n\n\nProtoTInfo\0220\n\007" +
       "headers\030\001 \003(\0132\037.client.ProtoTInfo.Header" +
       "sEntry\032.\n\014HeadersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005v" +
-      "alue\030\002 \001(\t:\0028\001B=\n,org.apache.accumulo.co" +
-      "re.compaction.protobufB\013ClientProtoP\001b\006p" +
+      "alue\030\002 \001(\t:\0028\001B=\n,org.apache.accumulo.gr" +
+      "pc.compaction.protobufB\013ClientProtoP\001b\006p" +
       "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequest.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCompletedRequest.java
similarity index 81%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequest.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCompletedRequest.java
index 516c02fd5e7..83c155ed027 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequest.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCompletedRequest.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code compaction_coordinator.CompactionCompletedRequest}
@@ -47,20 +47,20 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest.class, org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest.Builder.class);
   }
 
   private int bitField0_;
   public static final int PTINFO_FIELD_NUMBER = 1;
-  private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_;
+  private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_;
   /**
    * .client.ProtoTInfo ptinfo = 1;
    * @return Whether the ptinfo field is set.
@@ -74,19 +74,19 @@ public boolean hasPtinfo() {
    * @return The ptinfo.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() {
-    return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+  public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() {
+    return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
   }
   /**
    * .client.ProtoTInfo ptinfo = 1;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
-    return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+  public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
+    return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
   }
 
   public static final int CREDENTIALS_FIELD_NUMBER = 2;
-  private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_;
+  private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_;
   /**
    * .security.PCredentials credentials = 2;
    * @return Whether the credentials field is set.
@@ -100,15 +100,15 @@ public boolean hasCredentials() {
    * @return The credentials.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() {
-    return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() {
+    return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
   }
   /**
    * .security.PCredentials credentials = 2;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
-    return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
+    return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
   }
 
   public static final int EXTERNALCOMPACTIONID_FIELD_NUMBER = 3;
@@ -151,7 +151,7 @@ public java.lang.String getExternalCompactionId() {
   }
 
   public static final int EXTENT_FIELD_NUMBER = 4;
-  private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_;
+  private org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent extent_;
   /**
    * .data.PKeyExtent extent = 4;
    * @return Whether the extent field is set.
@@ -165,19 +165,19 @@ public boolean hasExtent() {
    * @return The extent.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() {
-    return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getExtent() {
+    return extent_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
   }
   /**
    * .data.PKeyExtent extent = 4;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() {
-    return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() {
+    return extent_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
   }
 
   public static final int STATS_FIELD_NUMBER = 5;
-  private org.apache.accumulo.core.compaction.protobuf.PCompactionStats stats_;
+  private org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats stats_;
   /**
    * .tabletserver.PCompactionStats stats = 5;
    * @return Whether the stats field is set.
@@ -191,15 +191,15 @@ public boolean hasStats() {
    * @return The stats.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCompactionStats getStats() {
-    return stats_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats getStats() {
+    return stats_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_;
   }
   /**
    * .tabletserver.PCompactionStats stats = 5;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder getStatsOrBuilder() {
-    return stats_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatsOrBuilder getStatsOrBuilder() {
+    return stats_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -269,10 +269,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest other = (org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest other = (org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest) obj;
 
     if (hasPtinfo() != other.hasPtinfo()) return false;
     if (hasPtinfo()) {
@@ -330,44 +330,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -375,26 +375,26 @@ public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRe
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -407,7 +407,7 @@ public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRe
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -428,21 +428,21 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:compaction_coordinator.CompactionCompletedRequest)
-      org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequestOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest.class, org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -492,17 +492,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionCompletedRequest_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest build() {
-      org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest build() {
+      org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -510,14 +510,14 @@ public org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest b
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest result = new org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest result = new org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest result) {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -584,16 +584,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest.getDefaultInstance()) return this;
       if (other.hasPtinfo()) {
         mergePtinfo(other.getPtinfo());
       }
@@ -687,9 +687,9 @@ public Builder mergeFrom(
     }
     private int bitField0_;
 
-    private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_;
+    private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_;
     /**
      * .client.ProtoTInfo ptinfo = 1;
      * @return Whether the ptinfo field is set.
@@ -701,9 +701,9 @@ public boolean hasPtinfo() {
      * .client.ProtoTInfo ptinfo = 1;
      * @return The ptinfo.
      */
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() {
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() {
       if (ptinfoBuilder_ == null) {
-        return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+        return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
       } else {
         return ptinfoBuilder_.getMessage();
       }
@@ -711,7 +711,7 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() {
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) {
+    public Builder setPtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) {
       if (ptinfoBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -728,7 +728,7 @@ public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo
      * .client.ProtoTInfo ptinfo = 1;
      */
     public Builder setPtinfo(
-        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder builderForValue) {
       if (ptinfoBuilder_ == null) {
         ptinfo_ = builderForValue.build();
       } else {
@@ -741,11 +741,11 @@ public Builder setPtinfo(
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) {
+    public Builder mergePtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) {
       if (ptinfoBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0) &&
           ptinfo_ != null &&
-          ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) {
+          ptinfo_ != org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance()) {
           getPtinfoBuilder().mergeFrom(value);
         } else {
           ptinfo_ = value;
@@ -775,7 +775,7 @@ public Builder clearPtinfo() {
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
       return getPtinfoFieldBuilder().getBuilder();
@@ -783,23 +783,23 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfo
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
       if (ptinfoBuilder_ != null) {
         return ptinfoBuilder_.getMessageOrBuilder();
       } else {
         return ptinfo_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+            org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
       }
     }
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> 
         getPtinfoFieldBuilder() {
       if (ptinfoBuilder_ == null) {
         ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder>(
                 getPtinfo(),
                 getParentForChildren(),
                 isClean());
@@ -808,9 +808,9 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinf
       return ptinfoBuilder_;
     }
 
-    private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_;
+    private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_;
     /**
      * .security.PCredentials credentials = 2;
      * @return Whether the credentials field is set.
@@ -822,9 +822,9 @@ public boolean hasCredentials() {
      * .security.PCredentials credentials = 2;
      * @return The credentials.
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() {
       if (credentialsBuilder_ == null) {
-        return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+        return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
       } else {
         return credentialsBuilder_.getMessage();
       }
@@ -832,7 +832,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(
     /**
      * .security.PCredentials credentials = 2;
      */
-    public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) {
+    public Builder setCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) {
       if (credentialsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -849,7 +849,7 @@ public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCred
      * .security.PCredentials credentials = 2;
      */
     public Builder setCredentials(
-        org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder builderForValue) {
       if (credentialsBuilder_ == null) {
         credentials_ = builderForValue.build();
       } else {
@@ -862,11 +862,11 @@ public Builder setCredentials(
     /**
      * .security.PCredentials credentials = 2;
      */
-    public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) {
+    public Builder mergeCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) {
       if (credentialsBuilder_ == null) {
         if (((bitField0_ & 0x00000002) != 0) &&
           credentials_ != null &&
-          credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) {
+          credentials_ != org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance()) {
           getCredentialsBuilder().mergeFrom(value);
         } else {
           credentials_ = value;
@@ -896,7 +896,7 @@ public Builder clearCredentials() {
     /**
      * .security.PCredentials credentials = 2;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
       return getCredentialsFieldBuilder().getBuilder();
@@ -904,23 +904,23 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCred
     /**
      * .security.PCredentials credentials = 2;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
       if (credentialsBuilder_ != null) {
         return credentialsBuilder_.getMessageOrBuilder();
       } else {
         return credentials_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+            org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
       }
     }
     /**
      * .security.PCredentials credentials = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> 
         getCredentialsFieldBuilder() {
       if (credentialsBuilder_ == null) {
         credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder>(
                 getCredentials(),
                 getParentForChildren(),
                 isClean());
@@ -1001,9 +1001,9 @@ public Builder setExternalCompactionIdBytes(
       return this;
     }
 
-    private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_;
+    private org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent extent_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> extentBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder> extentBuilder_;
     /**
      * .data.PKeyExtent extent = 4;
      * @return Whether the extent field is set.
@@ -1015,9 +1015,9 @@ public boolean hasExtent() {
      * .data.PKeyExtent extent = 4;
      * @return The extent.
      */
-    public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getExtent() {
       if (extentBuilder_ == null) {
-        return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
+        return extent_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
       } else {
         return extentBuilder_.getMessage();
       }
@@ -1025,7 +1025,7 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() {
     /**
      * .data.PKeyExtent extent = 4;
      */
-    public Builder setExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) {
+    public Builder setExtent(org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent value) {
       if (extentBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1042,7 +1042,7 @@ public Builder setExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent
      * .data.PKeyExtent extent = 4;
      */
     public Builder setExtent(
-        org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder builderForValue) {
       if (extentBuilder_ == null) {
         extent_ = builderForValue.build();
       } else {
@@ -1055,11 +1055,11 @@ public Builder setExtent(
     /**
      * .data.PKeyExtent extent = 4;
      */
-    public Builder mergeExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) {
+    public Builder mergeExtent(org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent value) {
       if (extentBuilder_ == null) {
         if (((bitField0_ & 0x00000008) != 0) &&
           extent_ != null &&
-          extent_ != org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance()) {
+          extent_ != org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance()) {
           getExtentBuilder().mergeFrom(value);
         } else {
           extent_ = value;
@@ -1089,7 +1089,7 @@ public Builder clearExtent() {
     /**
      * .data.PKeyExtent extent = 4;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder getExtentBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder getExtentBuilder() {
       bitField0_ |= 0x00000008;
       onChanged();
       return getExtentFieldBuilder().getBuilder();
@@ -1097,23 +1097,23 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder getExtent
     /**
      * .data.PKeyExtent extent = 4;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() {
       if (extentBuilder_ != null) {
         return extentBuilder_.getMessageOrBuilder();
       } else {
         return extent_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
+            org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
       }
     }
     /**
      * .data.PKeyExtent extent = 4;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder> 
         getExtentFieldBuilder() {
       if (extentBuilder_ == null) {
         extentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder>(
                 getExtent(),
                 getParentForChildren(),
                 isClean());
@@ -1122,9 +1122,9 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExten
       return extentBuilder_;
     }
 
-    private org.apache.accumulo.core.compaction.protobuf.PCompactionStats stats_;
+    private org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats stats_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PCompactionStats, org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder> statsBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatsOrBuilder> statsBuilder_;
     /**
      * .tabletserver.PCompactionStats stats = 5;
      * @return Whether the stats field is set.
@@ -1136,9 +1136,9 @@ public boolean hasStats() {
      * .tabletserver.PCompactionStats stats = 5;
      * @return The stats.
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCompactionStats getStats() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats getStats() {
       if (statsBuilder_ == null) {
-        return stats_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_;
+        return stats_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_;
       } else {
         return statsBuilder_.getMessage();
       }
@@ -1146,7 +1146,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCompactionStats getStats()
     /**
      * .tabletserver.PCompactionStats stats = 5;
      */
-    public Builder setStats(org.apache.accumulo.core.compaction.protobuf.PCompactionStats value) {
+    public Builder setStats(org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats value) {
       if (statsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1163,7 +1163,7 @@ public Builder setStats(org.apache.accumulo.core.compaction.protobuf.PCompaction
      * .tabletserver.PCompactionStats stats = 5;
      */
     public Builder setStats(
-        org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.Builder builderForValue) {
       if (statsBuilder_ == null) {
         stats_ = builderForValue.build();
       } else {
@@ -1176,11 +1176,11 @@ public Builder setStats(
     /**
      * .tabletserver.PCompactionStats stats = 5;
      */
-    public Builder mergeStats(org.apache.accumulo.core.compaction.protobuf.PCompactionStats value) {
+    public Builder mergeStats(org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats value) {
       if (statsBuilder_ == null) {
         if (((bitField0_ & 0x00000010) != 0) &&
           stats_ != null &&
-          stats_ != org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance()) {
+          stats_ != org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.getDefaultInstance()) {
           getStatsBuilder().mergeFrom(value);
         } else {
           stats_ = value;
@@ -1210,7 +1210,7 @@ public Builder clearStats() {
     /**
      * .tabletserver.PCompactionStats stats = 5;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder getStatsBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.Builder getStatsBuilder() {
       bitField0_ |= 0x00000010;
       onChanged();
       return getStatsFieldBuilder().getBuilder();
@@ -1218,23 +1218,23 @@ public org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder get
     /**
      * .tabletserver.PCompactionStats stats = 5;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder getStatsOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatsOrBuilder getStatsOrBuilder() {
       if (statsBuilder_ != null) {
         return statsBuilder_.getMessageOrBuilder();
       } else {
         return stats_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_;
+            org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.getDefaultInstance() : stats_;
       }
     }
     /**
      * .tabletserver.PCompactionStats stats = 5;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PCompactionStats, org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatsOrBuilder> 
         getStatsFieldBuilder() {
       if (statsBuilder_ == null) {
         statsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PCompactionStats, org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatsOrBuilder>(
                 getStats(),
                 getParentForChildren(),
                 isClean());
@@ -1259,12 +1259,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:compaction_coordinator.CompactionCompletedRequest)
-  private static final org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -1300,7 +1300,7 @@ public com.google.protobuf.Parser getParserForType()
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequestOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCompletedRequestOrBuilder.java
similarity index 83%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequestOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCompletedRequestOrBuilder.java
index 420e3c2d04f..e8e9341375e 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCompletedRequestOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCompletedRequestOrBuilder.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface CompactionCompletedRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:compaction_coordinator.CompactionCompletedRequest)
@@ -35,11 +35,11 @@ public interface CompactionCompletedRequestOrBuilder extends
    * .client.ProtoTInfo ptinfo = 1;
    * @return The ptinfo.
    */
-  org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo();
+  org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo();
   /**
    * .client.ProtoTInfo ptinfo = 1;
    */
-  org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder();
 
   /**
    * .security.PCredentials credentials = 2;
@@ -50,11 +50,11 @@ public interface CompactionCompletedRequestOrBuilder extends
    * .security.PCredentials credentials = 2;
    * @return The credentials.
    */
-  org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials();
+  org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials();
   /**
    * .security.PCredentials credentials = 2;
    */
-  org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder();
 
   /**
    * string externalCompactionId = 3;
@@ -77,11 +77,11 @@ public interface CompactionCompletedRequestOrBuilder extends
    * .data.PKeyExtent extent = 4;
    * @return The extent.
    */
-  org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent();
+  org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getExtent();
   /**
    * .data.PKeyExtent extent = 4;
    */
-  org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder();
 
   /**
    * .tabletserver.PCompactionStats stats = 5;
@@ -92,9 +92,9 @@ public interface CompactionCompletedRequestOrBuilder extends
    * .tabletserver.PCompactionStats stats = 5;
    * @return The stats.
    */
-  org.apache.accumulo.core.compaction.protobuf.PCompactionStats getStats();
+  org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats getStats();
   /**
    * .tabletserver.PCompactionStats stats = 5;
    */
-  org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder getStatsOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatsOrBuilder getStatsOrBuilder();
 }
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCoordinatorServiceGrpc.java
similarity index 79%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCoordinatorServiceGrpc.java
index 806d950b53b..6eb79ad4678 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceGrpc.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCoordinatorServiceGrpc.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 import static io.grpc.MethodDescriptor.generateFullMethodName;
 
@@ -25,9 +25,6 @@
  * Interface exported by the server.
  *
*/ -@javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.64.0)", - comments = "Source: compaction-coordinator.proto") @io.grpc.stub.annotations.GrpcGenerated public final class CompactionCoordinatorServiceGrpc { @@ -36,29 +33,29 @@ private CompactionCoordinatorServiceGrpc() {} public static final java.lang.String SERVICE_NAME = "compaction_coordinator.CompactionCoordinatorService"; // Static method descriptors that strictly reflect the proto. - private static volatile io.grpc.MethodDescriptor getGetCompactionJobMethod; + private static volatile io.grpc.MethodDescriptor getGetCompactionJobMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "GetCompactionJob", - requestType = org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.class, - responseType = org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.class, + requestType = org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest.class, + responseType = org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getGetCompactionJobMethod() { - io.grpc.MethodDescriptor getGetCompactionJobMethod; + public static io.grpc.MethodDescriptor getGetCompactionJobMethod() { + io.grpc.MethodDescriptor getGetCompactionJobMethod; if ((getGetCompactionJobMethod = CompactionCoordinatorServiceGrpc.getGetCompactionJobMethod) == null) { synchronized (CompactionCoordinatorServiceGrpc.class) { if ((getGetCompactionJobMethod = CompactionCoordinatorServiceGrpc.getGetCompactionJobMethod) == null) { CompactionCoordinatorServiceGrpc.getGetCompactionJobMethod = getGetCompactionJobMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetCompactionJob")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.getDefaultInstance())) + org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.getDefaultInstance())) + org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob.getDefaultInstance())) .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("GetCompactionJob")) .build(); } @@ -67,27 +64,27 @@ org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob> getGetCompactio return getGetCompactionJobMethod; } - private static volatile io.grpc.MethodDescriptor getCompactionCompletedMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "CompactionCompleted", - requestType = org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.class, + requestType = org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest.class, responseType = com.google.protobuf.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getCompactionCompletedMethod() { - io.grpc.MethodDescriptor getCompactionCompletedMethod; + io.grpc.MethodDescriptor getCompactionCompletedMethod; if ((getCompactionCompletedMethod = CompactionCoordinatorServiceGrpc.getCompactionCompletedMethod) == null) { synchronized (CompactionCoordinatorServiceGrpc.class) { if ((getCompactionCompletedMethod = CompactionCoordinatorServiceGrpc.getCompactionCompletedMethod) == null) { CompactionCoordinatorServiceGrpc.getCompactionCompletedMethod = getCompactionCompletedMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CompactionCompleted")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest.getDefaultInstance())) + org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( com.google.protobuf.Empty.getDefaultInstance())) .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("CompactionCompleted")) @@ -98,27 +95,27 @@ com.google.protobuf.Empty> getCompactionCompletedMethod() { return getCompactionCompletedMethod; } - private static volatile io.grpc.MethodDescriptor getUpdateCompactionStatusMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "UpdateCompactionStatus", - requestType = org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.class, + requestType = org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest.class, responseType = com.google.protobuf.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getUpdateCompactionStatusMethod() { - io.grpc.MethodDescriptor getUpdateCompactionStatusMethod; + io.grpc.MethodDescriptor getUpdateCompactionStatusMethod; if ((getUpdateCompactionStatusMethod = CompactionCoordinatorServiceGrpc.getUpdateCompactionStatusMethod) == null) { synchronized (CompactionCoordinatorServiceGrpc.class) { if ((getUpdateCompactionStatusMethod = CompactionCoordinatorServiceGrpc.getUpdateCompactionStatusMethod) == null) { CompactionCoordinatorServiceGrpc.getUpdateCompactionStatusMethod = getUpdateCompactionStatusMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UpdateCompactionStatus")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.getDefaultInstance())) + org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( com.google.protobuf.Empty.getDefaultInstance())) .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("UpdateCompactionStatus")) @@ -129,27 +126,27 @@ com.google.protobuf.Empty> getUpdateCompactionStatusMethod() { return getUpdateCompactionStatusMethod; } - private static volatile io.grpc.MethodDescriptor getCompactionFailedMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "CompactionFailed", - requestType = org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.class, + requestType = org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest.class, responseType = com.google.protobuf.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getCompactionFailedMethod() { - io.grpc.MethodDescriptor getCompactionFailedMethod; + io.grpc.MethodDescriptor getCompactionFailedMethod; if ((getCompactionFailedMethod = CompactionCoordinatorServiceGrpc.getCompactionFailedMethod) == null) { synchronized (CompactionCoordinatorServiceGrpc.class) { if ((getCompactionFailedMethod = CompactionCoordinatorServiceGrpc.getCompactionFailedMethod) == null) { CompactionCoordinatorServiceGrpc.getCompactionFailedMethod = getCompactionFailedMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CompactionFailed")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.getDefaultInstance())) + org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( com.google.protobuf.Empty.getDefaultInstance())) .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("CompactionFailed")) @@ -160,29 +157,29 @@ com.google.protobuf.Empty> getCompactionFailedMethod() { return getCompactionFailedMethod; } - private static volatile io.grpc.MethodDescriptor getGetRunningCompactionsMethod; + private static volatile io.grpc.MethodDescriptor getGetRunningCompactionsMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "GetRunningCompactions", - requestType = org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.class, - responseType = org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.class, + requestType = org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest.class, + responseType = org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getGetRunningCompactionsMethod() { - io.grpc.MethodDescriptor getGetRunningCompactionsMethod; + public static io.grpc.MethodDescriptor getGetRunningCompactionsMethod() { + io.grpc.MethodDescriptor getGetRunningCompactionsMethod; if ((getGetRunningCompactionsMethod = CompactionCoordinatorServiceGrpc.getGetRunningCompactionsMethod) == null) { synchronized (CompactionCoordinatorServiceGrpc.class) { if ((getGetRunningCompactionsMethod = CompactionCoordinatorServiceGrpc.getGetRunningCompactionsMethod) == null) { CompactionCoordinatorServiceGrpc.getGetRunningCompactionsMethod = getGetRunningCompactionsMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetRunningCompactions")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.getDefaultInstance())) + org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.getDefaultInstance())) + org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList.getDefaultInstance())) .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("GetRunningCompactions")) .build(); } @@ -191,29 +188,29 @@ org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList> getGetRunn return getGetRunningCompactionsMethod; } - private static volatile io.grpc.MethodDescriptor getGetCompletedCompactionsMethod; + private static volatile io.grpc.MethodDescriptor getGetCompletedCompactionsMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "GetCompletedCompactions", - requestType = org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.class, - responseType = org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.class, + requestType = org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest.class, + responseType = org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getGetCompletedCompactionsMethod() { - io.grpc.MethodDescriptor getGetCompletedCompactionsMethod; + public static io.grpc.MethodDescriptor getGetCompletedCompactionsMethod() { + io.grpc.MethodDescriptor getGetCompletedCompactionsMethod; if ((getGetCompletedCompactionsMethod = CompactionCoordinatorServiceGrpc.getGetCompletedCompactionsMethod) == null) { synchronized (CompactionCoordinatorServiceGrpc.class) { if ((getGetCompletedCompactionsMethod = CompactionCoordinatorServiceGrpc.getGetCompletedCompactionsMethod) == null) { CompactionCoordinatorServiceGrpc.getGetCompletedCompactionsMethod = getGetCompletedCompactionsMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetCompletedCompactions")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.getDefaultInstance())) + org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.getDefaultInstance())) + org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList.getDefaultInstance())) .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("GetCompletedCompactions")) .build(); } @@ -222,27 +219,27 @@ org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList> getGetComp return getGetCompletedCompactionsMethod; } - private static volatile io.grpc.MethodDescriptor getCancelMethod; @io.grpc.stub.annotations.RpcMethod( fullMethodName = SERVICE_NAME + '/' + "Cancel", - requestType = org.apache.accumulo.core.compaction.protobuf.CancelRequest.class, + requestType = org.apache.accumulo.grpc.compaction.protobuf.CancelRequest.class, responseType = com.google.protobuf.Empty.class, methodType = io.grpc.MethodDescriptor.MethodType.UNARY) - public static io.grpc.MethodDescriptor getCancelMethod() { - io.grpc.MethodDescriptor getCancelMethod; + io.grpc.MethodDescriptor getCancelMethod; if ((getCancelMethod = CompactionCoordinatorServiceGrpc.getCancelMethod) == null) { synchronized (CompactionCoordinatorServiceGrpc.class) { if ((getCancelMethod = CompactionCoordinatorServiceGrpc.getCancelMethod) == null) { CompactionCoordinatorServiceGrpc.getCancelMethod = getCancelMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName(SERVICE_NAME, "Cancel")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - org.apache.accumulo.core.compaction.protobuf.CancelRequest.getDefaultInstance())) + org.apache.accumulo.grpc.compaction.protobuf.CancelRequest.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( com.google.protobuf.Empty.getDefaultInstance())) .setSchemaDescriptor(new CompactionCoordinatorServiceMethodDescriptorSupplier("Cancel")) @@ -309,8 +306,8 @@ public interface AsyncService { * Called by Compactor to get the next compaction job * */ - default void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request, - io.grpc.stub.StreamObserver responseObserver) { + default void getCompactionJob(org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetCompactionJobMethod(), responseObserver); } @@ -319,7 +316,7 @@ default void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.Compa * Called by Compactor on successful completion of compaction job * */ - default void compactionCompleted(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest request, + default void compactionCompleted(org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCompactionCompletedMethod(), responseObserver); } @@ -329,7 +326,7 @@ default void compactionCompleted(org.apache.accumulo.core.compaction.protobuf.Co * Called by Compactor to update the Coordinator with the state of the compaction * */ - default void updateCompactionStatus(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest request, + default void updateCompactionStatus(org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getUpdateCompactionStatusMethod(), responseObserver); } @@ -339,7 +336,7 @@ default void updateCompactionStatus(org.apache.accumulo.core.compaction.protobuf * Called by Compactor on unsuccessful completion of compaction job * */ - default void compactionFailed(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest request, + default void compactionFailed(org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCompactionFailedMethod(), responseObserver); } @@ -349,8 +346,8 @@ default void compactionFailed(org.apache.accumulo.core.compaction.protobuf.Compa * Called by the Monitor to get progress information * */ - default void getRunningCompactions(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest request, - io.grpc.stub.StreamObserver responseObserver) { + default void getRunningCompactions(org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetRunningCompactionsMethod(), responseObserver); } @@ -359,8 +356,8 @@ default void getRunningCompactions(org.apache.accumulo.core.compaction.protobuf. * Called by the Monitor to get progress information * */ - default void getCompletedCompactions(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest request, - io.grpc.stub.StreamObserver responseObserver) { + default void getCompletedCompactions(org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetCompletedCompactionsMethod(), responseObserver); } @@ -369,7 +366,7 @@ default void getCompletedCompactions(org.apache.accumulo.core.compaction.protobu * Called by Compactor on unsuccessful completion of compaction job * */ - default void cancel(org.apache.accumulo.core.compaction.protobuf.CancelRequest request, + default void cancel(org.apache.accumulo.grpc.compaction.protobuf.CancelRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCancelMethod(), responseObserver); } @@ -413,8 +410,8 @@ protected CompactionCoordinatorServiceStub build( * Called by Compactor to get the next compaction job * */ - public void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void getCompactionJob(org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getGetCompactionJobMethod(), getCallOptions()), request, responseObserver); } @@ -424,7 +421,7 @@ public void getCompactionJob(org.apache.accumulo.core.compaction.protobuf.Compac * Called by Compactor on successful completion of compaction job * */ - public void compactionCompleted(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest request, + public void compactionCompleted(org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getCompactionCompletedMethod(), getCallOptions()), request, responseObserver); @@ -435,7 +432,7 @@ public void compactionCompleted(org.apache.accumulo.core.compaction.protobuf.Com * Called by Compactor to update the Coordinator with the state of the compaction * */ - public void updateCompactionStatus(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest request, + public void updateCompactionStatus(org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getUpdateCompactionStatusMethod(), getCallOptions()), request, responseObserver); @@ -446,7 +443,7 @@ public void updateCompactionStatus(org.apache.accumulo.core.compaction.protobuf. * Called by Compactor on unsuccessful completion of compaction job * */ - public void compactionFailed(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest request, + public void compactionFailed(org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getCompactionFailedMethod(), getCallOptions()), request, responseObserver); @@ -457,8 +454,8 @@ public void compactionFailed(org.apache.accumulo.core.compaction.protobuf.Compac * Called by the Monitor to get progress information * */ - public void getRunningCompactions(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void getRunningCompactions(org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getGetRunningCompactionsMethod(), getCallOptions()), request, responseObserver); } @@ -468,8 +465,8 @@ public void getRunningCompactions(org.apache.accumulo.core.compaction.protobuf.G * Called by the Monitor to get progress information * */ - public void getCompletedCompactions(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest request, - io.grpc.stub.StreamObserver responseObserver) { + public void getCompletedCompactions(org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest request, + io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getGetCompletedCompactionsMethod(), getCallOptions()), request, responseObserver); } @@ -479,7 +476,7 @@ public void getCompletedCompactions(org.apache.accumulo.core.compaction.protobuf * Called by Compactor on unsuccessful completion of compaction job * */ - public void cancel(org.apache.accumulo.core.compaction.protobuf.CancelRequest request, + public void cancel(org.apache.accumulo.grpc.compaction.protobuf.CancelRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getCancelMethod(), getCallOptions()), request, responseObserver); @@ -510,7 +507,7 @@ protected CompactionCoordinatorServiceBlockingStub build( * Called by Compactor to get the next compaction job * */ - public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getCompactionJob(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request) { + public org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob getCompactionJob(org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetCompactionJobMethod(), getCallOptions(), request); } @@ -520,7 +517,7 @@ public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getCompac * Called by Compactor on successful completion of compaction job * */ - public com.google.protobuf.Empty compactionCompleted(org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest request) { + public com.google.protobuf.Empty compactionCompleted(org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCompactionCompletedMethod(), getCallOptions(), request); } @@ -530,7 +527,7 @@ public com.google.protobuf.Empty compactionCompleted(org.apache.accumulo.core.co * Called by Compactor to update the Coordinator with the state of the compaction * */ - public com.google.protobuf.Empty updateCompactionStatus(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest request) { + public com.google.protobuf.Empty updateCompactionStatus(org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getUpdateCompactionStatusMethod(), getCallOptions(), request); } @@ -540,7 +537,7 @@ public com.google.protobuf.Empty updateCompactionStatus(org.apache.accumulo.core * Called by Compactor on unsuccessful completion of compaction job * */ - public com.google.protobuf.Empty compactionFailed(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest request) { + public com.google.protobuf.Empty compactionFailed(org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCompactionFailedMethod(), getCallOptions(), request); } @@ -550,7 +547,7 @@ public com.google.protobuf.Empty compactionFailed(org.apache.accumulo.core.compa * Called by the Monitor to get progress information * */ - public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getRunningCompactions(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest request) { + public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList getRunningCompactions(org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetRunningCompactionsMethod(), getCallOptions(), request); } @@ -560,7 +557,7 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getR * Called by the Monitor to get progress information * */ - public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getCompletedCompactions(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest request) { + public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList getCompletedCompactions(org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getGetCompletedCompactionsMethod(), getCallOptions(), request); } @@ -570,7 +567,7 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getC * Called by Compactor on unsuccessful completion of compaction job * */ - public com.google.protobuf.Empty cancel(org.apache.accumulo.core.compaction.protobuf.CancelRequest request) { + public com.google.protobuf.Empty cancel(org.apache.accumulo.grpc.compaction.protobuf.CancelRequest request) { return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getCancelMethod(), getCallOptions(), request); } @@ -600,8 +597,8 @@ protected CompactionCoordinatorServiceFutureStub build( * Called by Compactor to get the next compaction job * */ - public com.google.common.util.concurrent.ListenableFuture getCompactionJob( - org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest request) { + public com.google.common.util.concurrent.ListenableFuture getCompactionJob( + org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getGetCompactionJobMethod(), getCallOptions()), request); } @@ -612,7 +609,7 @@ public com.google.common.util.concurrent.ListenableFuture */ public com.google.common.util.concurrent.ListenableFuture compactionCompleted( - org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest request) { + org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getCompactionCompletedMethod(), getCallOptions()), request); } @@ -623,7 +620,7 @@ public com.google.common.util.concurrent.ListenableFuture */ public com.google.common.util.concurrent.ListenableFuture updateCompactionStatus( - org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest request) { + org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getUpdateCompactionStatusMethod(), getCallOptions()), request); } @@ -634,7 +631,7 @@ public com.google.common.util.concurrent.ListenableFuture */ public com.google.common.util.concurrent.ListenableFuture compactionFailed( - org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest request) { + org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getCompactionFailedMethod(), getCallOptions()), request); } @@ -644,8 +641,8 @@ public com.google.common.util.concurrent.ListenableFuture */ - public com.google.common.util.concurrent.ListenableFuture getRunningCompactions( - org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest request) { + public com.google.common.util.concurrent.ListenableFuture getRunningCompactions( + org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getGetRunningCompactionsMethod(), getCallOptions()), request); } @@ -655,8 +652,8 @@ public com.google.common.util.concurrent.ListenableFuture */ - public com.google.common.util.concurrent.ListenableFuture getCompletedCompactions( - org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest request) { + public com.google.common.util.concurrent.ListenableFuture getCompletedCompactions( + org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getGetCompletedCompactionsMethod(), getCallOptions()), request); } @@ -667,7 +664,7 @@ public com.google.common.util.concurrent.ListenableFuture */ public com.google.common.util.concurrent.ListenableFuture cancel( - org.apache.accumulo.core.compaction.protobuf.CancelRequest request) { + org.apache.accumulo.grpc.compaction.protobuf.CancelRequest request) { return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getCancelMethod(), getCallOptions()), request); } @@ -699,31 +696,31 @@ private static final class MethodHandlers implements public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { case METHODID_GET_COMPACTION_JOB: - serviceImpl.getCompactionJob((org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.getCompactionJob((org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_COMPACTION_COMPLETED: - serviceImpl.compactionCompleted((org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest) request, + serviceImpl.compactionCompleted((org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest) request, (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_UPDATE_COMPACTION_STATUS: - serviceImpl.updateCompactionStatus((org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest) request, + serviceImpl.updateCompactionStatus((org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest) request, (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_COMPACTION_FAILED: - serviceImpl.compactionFailed((org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest) request, + serviceImpl.compactionFailed((org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest) request, (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_GET_RUNNING_COMPACTIONS: - serviceImpl.getRunningCompactions((org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.getRunningCompactions((org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_GET_COMPLETED_COMPACTIONS: - serviceImpl.getCompletedCompactions((org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.getCompletedCompactions((org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_CANCEL: - serviceImpl.cancel((org.apache.accumulo.core.compaction.protobuf.CancelRequest) request, + serviceImpl.cancel((org.apache.accumulo.grpc.compaction.protobuf.CancelRequest) request, (io.grpc.stub.StreamObserver) responseObserver); break; default: @@ -748,49 +745,49 @@ public static final io.grpc.ServerServiceDefinition bindService(AsyncService ser getGetCompactionJobMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest, - org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob>( + org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest, + org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob>( service, METHODID_GET_COMPACTION_JOB))) .addMethod( getCompactionCompletedMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest, + org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest, com.google.protobuf.Empty>( service, METHODID_COMPACTION_COMPLETED))) .addMethod( getUpdateCompactionStatusMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest, + org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest, com.google.protobuf.Empty>( service, METHODID_UPDATE_COMPACTION_STATUS))) .addMethod( getCompactionFailedMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest, + org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest, com.google.protobuf.Empty>( service, METHODID_COMPACTION_FAILED))) .addMethod( getGetRunningCompactionsMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest, - org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList>( + org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest, + org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList>( service, METHODID_GET_RUNNING_COMPACTIONS))) .addMethod( getGetCompletedCompactionsMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest, - org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList>( + org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest, + org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList>( service, METHODID_GET_COMPLETED_COMPACTIONS))) .addMethod( getCancelMethod(), io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< - org.apache.accumulo.core.compaction.protobuf.CancelRequest, + org.apache.accumulo.grpc.compaction.protobuf.CancelRequest, com.google.protobuf.Empty>( service, METHODID_CANCEL))) .build(); @@ -802,7 +799,7 @@ private static abstract class CompactionCoordinatorServiceBaseDescriptorSupplier @java.lang.Override public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.getDescriptor(); + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.getDescriptor(); } @java.lang.Override diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCoordinatorServiceProto.java similarity index 95% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCoordinatorServiceProto.java index 89a481dd185..20a5bd39fb6 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionCoordinatorServiceProto.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionCoordinatorServiceProto.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; public final class CompactionCoordinatorServiceProto { private CompactionCoordinatorServiceProto() {} @@ -182,7 +182,7 @@ public static void registerAllExtensions( "ction_coordinator.PExternalCompactionLis" + "t\022G\n\006Cancel\022%.compaction_coordinator.Can" + "celRequest\032\026.google.protobuf.EmptyBS\n,or" + - "g.apache.accumulo.core.compaction.protob" + + "g.apache.accumulo.grpc.compaction.protob" + "ufB!CompactionCoordinatorServiceProtoP\001b" + "\006proto3" }; @@ -190,11 +190,11 @@ public static void registerAllExtensions( .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.protobuf.EmptyProto.getDescriptor(), - org.apache.accumulo.core.compaction.protobuf.SecurityProto.getDescriptor(), - org.apache.accumulo.core.compaction.protobuf.ClientProto.getDescriptor(), - org.apache.accumulo.core.compaction.protobuf.DataProto.getDescriptor(), - org.apache.accumulo.core.compaction.protobuf.TabletServerProto.getDescriptor(), - org.apache.accumulo.core.compaction.protobuf.ManagerProto.getDescriptor(), + org.apache.accumulo.grpc.compaction.protobuf.SecurityProto.getDescriptor(), + org.apache.accumulo.grpc.compaction.protobuf.ClientProto.getDescriptor(), + org.apache.accumulo.grpc.compaction.protobuf.DataProto.getDescriptor(), + org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.getDescriptor(), + org.apache.accumulo.grpc.compaction.protobuf.ManagerProto.getDescriptor(), }); internal_static_compaction_coordinator_CompactionJobRequest_descriptor = getDescriptor().getMessageTypes().get(0); @@ -275,11 +275,11 @@ public static void registerAllExtensions( internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor, new java.lang.String[] { "State", "Message", "EntriesToBeCompacted", "EntriesRead", "EntriesWritten", "CompactionAgeNanos", }); com.google.protobuf.EmptyProto.getDescriptor(); - org.apache.accumulo.core.compaction.protobuf.SecurityProto.getDescriptor(); - org.apache.accumulo.core.compaction.protobuf.ClientProto.getDescriptor(); - org.apache.accumulo.core.compaction.protobuf.DataProto.getDescriptor(); - org.apache.accumulo.core.compaction.protobuf.TabletServerProto.getDescriptor(); - org.apache.accumulo.core.compaction.protobuf.ManagerProto.getDescriptor(); + org.apache.accumulo.grpc.compaction.protobuf.SecurityProto.getDescriptor(); + org.apache.accumulo.grpc.compaction.protobuf.ClientProto.getDescriptor(); + org.apache.accumulo.grpc.compaction.protobuf.DataProto.getDescriptor(); + org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.getDescriptor(); + org.apache.accumulo.grpc.compaction.protobuf.ManagerProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequest.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionFailedRequest.java similarity index 82% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequest.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionFailedRequest.java index c9ff80bbb81..4a239ee7728 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequest.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionFailedRequest.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; /** * Protobuf type {@code compaction_coordinator.CompactionFailedRequest} @@ -47,20 +47,20 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest.class, org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest.Builder.class); } private int bitField0_; public static final int PTINFO_FIELD_NUMBER = 1; - private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_; /** * .client.ProtoTInfo ptinfo = 1; * @return Whether the ptinfo field is set. @@ -74,19 +74,19 @@ public boolean hasPtinfo() { * @return The ptinfo. */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() { + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } /** * .client.ProtoTInfo ptinfo = 1; */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } public static final int CREDENTIALS_FIELD_NUMBER = 2; - private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_; /** * .security.PCredentials credentials = 2; * @return Whether the credentials field is set. @@ -100,15 +100,15 @@ public boolean hasCredentials() { * @return The credentials. */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() { + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } /** * .security.PCredentials credentials = 2; */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } public static final int EXTERNALCOMPACTIONID_FIELD_NUMBER = 3; @@ -151,7 +151,7 @@ public java.lang.String getExternalCompactionId() { } public static final int EXTENT_FIELD_NUMBER = 4; - private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_; + private org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent extent_; /** * .data.PKeyExtent extent = 4; * @return Whether the extent field is set. @@ -165,15 +165,15 @@ public boolean hasExtent() { * @return The extent. */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { - return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getExtent() { + return extent_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; } /** * .data.PKeyExtent extent = 4; */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { - return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { + return extent_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; } private byte memoizedIsInitialized = -1; @@ -236,10 +236,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest)) { + if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest)) { return super.equals(obj); } - org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest other = (org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest) obj; + org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest other = (org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest) obj; if (hasPtinfo() != other.hasPtinfo()) return false; if (hasPtinfo()) { @@ -288,44 +288,44 @@ public int hashCode() { return hash; } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom(byte[] data) + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -333,26 +333,26 @@ public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedReque .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseDelimitedFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseDelimitedFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -365,7 +365,7 @@ public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedReque public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest prototype) { + public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -386,21 +386,21 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:compaction_coordinator.CompactionFailedRequest) - org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequestOrBuilder { + org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest.class, org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest.Builder.class); } - // Construct using org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.newBuilder() + // Construct using org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -444,17 +444,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionFailedRequest_descriptor; } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest getDefaultInstanceForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.getDefaultInstance(); + public org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest getDefaultInstanceForType() { + return org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest.getDefaultInstance(); } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest build() { - org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest result = buildPartial(); + public org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest build() { + org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -462,14 +462,14 @@ public org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest buil } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest buildPartial() { - org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest result = new org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest(this); + public org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest buildPartial() { + org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest result = new org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest result) { + private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -530,16 +530,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest) { - return mergeFrom((org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest)other); + if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest) { + return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest other) { - if (other == org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest other) { + if (other == org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest.getDefaultInstance()) return this; if (other.hasPtinfo()) { mergePtinfo(other.getPtinfo()); } @@ -623,9 +623,9 @@ public Builder mergeFrom( } private int bitField0_; - private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_; private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; /** * .client.ProtoTInfo ptinfo = 1; * @return Whether the ptinfo field is set. @@ -637,9 +637,9 @@ public boolean hasPtinfo() { * .client.ProtoTInfo ptinfo = 1; * @return The ptinfo. */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() { if (ptinfoBuilder_ == null) { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } else { return ptinfoBuilder_.getMessage(); } @@ -647,7 +647,7 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { /** * .client.ProtoTInfo ptinfo = 1; */ - public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + public Builder setPtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) { if (ptinfoBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -664,7 +664,7 @@ public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo * .client.ProtoTInfo ptinfo = 1; */ public Builder setPtinfo( - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) { + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder builderForValue) { if (ptinfoBuilder_ == null) { ptinfo_ = builderForValue.build(); } else { @@ -677,11 +677,11 @@ public Builder setPtinfo( /** * .client.ProtoTInfo ptinfo = 1; */ - public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + public Builder mergePtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) { if (ptinfoBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0) && ptinfo_ != null && - ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { + ptinfo_ != org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { getPtinfoBuilder().mergeFrom(value); } else { ptinfo_ = value; @@ -711,7 +711,7 @@ public Builder clearPtinfo() { /** * .client.ProtoTInfo ptinfo = 1; */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { bitField0_ |= 0x00000001; onChanged(); return getPtinfoFieldBuilder().getBuilder(); @@ -719,23 +719,23 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfo /** * .client.ProtoTInfo ptinfo = 1; */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { if (ptinfoBuilder_ != null) { return ptinfoBuilder_.getMessageOrBuilder(); } else { return ptinfo_ == null ? - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } } /** * .client.ProtoTInfo ptinfo = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> getPtinfoFieldBuilder() { if (ptinfoBuilder_ == null) { ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>( + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder>( getPtinfo(), getParentForChildren(), isClean()); @@ -744,9 +744,9 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinf return ptinfoBuilder_; } - private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_; private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; /** * .security.PCredentials credentials = 2; * @return Whether the credentials field is set. @@ -758,9 +758,9 @@ public boolean hasCredentials() { * .security.PCredentials credentials = 2; * @return The credentials. */ - public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() { if (credentialsBuilder_ == null) { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } else { return credentialsBuilder_.getMessage(); } @@ -768,7 +768,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials( /** * .security.PCredentials credentials = 2; */ - public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + public Builder setCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) { if (credentialsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -785,7 +785,7 @@ public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCred * .security.PCredentials credentials = 2; */ public Builder setCredentials( - org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) { + org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder builderForValue) { if (credentialsBuilder_ == null) { credentials_ = builderForValue.build(); } else { @@ -798,11 +798,11 @@ public Builder setCredentials( /** * .security.PCredentials credentials = 2; */ - public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + public Builder mergeCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) { if (credentialsBuilder_ == null) { if (((bitField0_ & 0x00000002) != 0) && credentials_ != null && - credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) { + credentials_ != org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance()) { getCredentialsBuilder().mergeFrom(value); } else { credentials_ = value; @@ -832,7 +832,7 @@ public Builder clearCredentials() { /** * .security.PCredentials credentials = 2; */ - public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { bitField0_ |= 0x00000002; onChanged(); return getCredentialsFieldBuilder().getBuilder(); @@ -840,23 +840,23 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCred /** * .security.PCredentials credentials = 2; */ - public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { if (credentialsBuilder_ != null) { return credentialsBuilder_.getMessageOrBuilder(); } else { return credentials_ == null ? - org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } } /** * .security.PCredentials credentials = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> getCredentialsFieldBuilder() { if (credentialsBuilder_ == null) { credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>( + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder>( getCredentials(), getParentForChildren(), isClean()); @@ -937,9 +937,9 @@ public Builder setExternalCompactionIdBytes( return this; } - private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_; + private org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent extent_; private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> extentBuilder_; + org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder> extentBuilder_; /** * .data.PKeyExtent extent = 4; * @return Whether the extent field is set. @@ -951,9 +951,9 @@ public boolean hasExtent() { * .data.PKeyExtent extent = 4; * @return The extent. */ - public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { + public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getExtent() { if (extentBuilder_ == null) { - return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + return extent_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; } else { return extentBuilder_.getMessage(); } @@ -961,7 +961,7 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() { /** * .data.PKeyExtent extent = 4; */ - public Builder setExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) { + public Builder setExtent(org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent value) { if (extentBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -978,7 +978,7 @@ public Builder setExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent * .data.PKeyExtent extent = 4; */ public Builder setExtent( - org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder builderForValue) { + org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder builderForValue) { if (extentBuilder_ == null) { extent_ = builderForValue.build(); } else { @@ -991,11 +991,11 @@ public Builder setExtent( /** * .data.PKeyExtent extent = 4; */ - public Builder mergeExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) { + public Builder mergeExtent(org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent value) { if (extentBuilder_ == null) { if (((bitField0_ & 0x00000008) != 0) && extent_ != null && - extent_ != org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance()) { + extent_ != org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance()) { getExtentBuilder().mergeFrom(value); } else { extent_ = value; @@ -1025,7 +1025,7 @@ public Builder clearExtent() { /** * .data.PKeyExtent extent = 4; */ - public org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder getExtentBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder getExtentBuilder() { bitField0_ |= 0x00000008; onChanged(); return getExtentFieldBuilder().getBuilder(); @@ -1033,23 +1033,23 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder getExtent /** * .data.PKeyExtent extent = 4; */ - public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() { if (extentBuilder_ != null) { return extentBuilder_.getMessageOrBuilder(); } else { return extent_ == null ? - org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; + org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_; } } /** * .data.PKeyExtent extent = 4; */ private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> + org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder> getExtentFieldBuilder() { if (extentBuilder_ == null) { extentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder>( + org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder>( getExtent(), getParentForChildren(), isClean()); @@ -1074,12 +1074,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:compaction_coordinator.CompactionFailedRequest) - private static final org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest DEFAULT_INSTANCE; + private static final org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest(); + DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest(); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest getDefaultInstance() { + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -1115,7 +1115,7 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest getDefaultInstanceForType() { + public org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequestOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionFailedRequestOrBuilder.java similarity index 84% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequestOrBuilder.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionFailedRequestOrBuilder.java index 8882da96c0c..f8ae2df87d3 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionFailedRequestOrBuilder.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionFailedRequestOrBuilder.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; public interface CompactionFailedRequestOrBuilder extends // @@protoc_insertion_point(interface_extends:compaction_coordinator.CompactionFailedRequest) @@ -35,11 +35,11 @@ public interface CompactionFailedRequestOrBuilder extends * .client.ProtoTInfo ptinfo = 1; * @return The ptinfo. */ - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo(); + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo(); /** * .client.ProtoTInfo ptinfo = 1; */ - org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); /** * .security.PCredentials credentials = 2; @@ -50,11 +50,11 @@ public interface CompactionFailedRequestOrBuilder extends * .security.PCredentials credentials = 2; * @return The credentials. */ - org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(); + org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials(); /** * .security.PCredentials credentials = 2; */ - org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); + org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); /** * string externalCompactionId = 3; @@ -77,9 +77,9 @@ public interface CompactionFailedRequestOrBuilder extends * .data.PKeyExtent extent = 4; * @return The extent. */ - org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent(); + org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getExtent(); /** * .data.PKeyExtent extent = 4; */ - org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder(); + org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder(); } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionJobRequest.java similarity index 86% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionJobRequest.java index 3e32f8c2bf3..78d2b933a8d 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequest.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionJobRequest.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; /** * Protobuf type {@code compaction_coordinator.CompactionJobRequest} @@ -49,20 +49,20 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest.class, org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest.Builder.class); } private int bitField0_; public static final int PTINFO_FIELD_NUMBER = 1; - private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_; /** * .client.ProtoTInfo ptinfo = 1; * @return Whether the ptinfo field is set. @@ -76,19 +76,19 @@ public boolean hasPtinfo() { * @return The ptinfo. */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() { + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } /** * .client.ProtoTInfo ptinfo = 1; */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } public static final int CREDENTIALS_FIELD_NUMBER = 2; - private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_; /** * .security.PCredentials credentials = 2; * @return Whether the credentials field is set. @@ -102,15 +102,15 @@ public boolean hasCredentials() { * @return The credentials. */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() { + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } /** * .security.PCredentials credentials = 2; */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } public static final int GROUPNAME_FIELD_NUMBER = 3; @@ -295,10 +295,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest)) { + if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest)) { return super.equals(obj); } - org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest other = (org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest) obj; + org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest other = (org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest) obj; if (hasPtinfo() != other.hasPtinfo()) return false; if (hasPtinfo()) { @@ -346,44 +346,44 @@ public int hashCode() { return hash; } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom(byte[] data) + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -391,26 +391,26 @@ public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseDelimitedFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseDelimitedFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -423,7 +423,7 @@ public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest prototype) { + public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -444,21 +444,21 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:compaction_coordinator.CompactionJobRequest) - org.apache.accumulo.core.compaction.protobuf.CompactionJobRequestOrBuilder { + org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.class, org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest.class, org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest.Builder.class); } - // Construct using org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.newBuilder() + // Construct using org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -498,17 +498,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_CompactionJobRequest_descriptor; } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest getDefaultInstanceForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.getDefaultInstance(); + public org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest getDefaultInstanceForType() { + return org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest.getDefaultInstance(); } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest build() { - org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest result = buildPartial(); + public org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest build() { + org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -516,14 +516,14 @@ public org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest build() } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest buildPartial() { - org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest result = new org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest(this); + public org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest buildPartial() { + org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest result = new org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest result) { + private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -584,16 +584,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest) { - return mergeFrom((org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest)other); + if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest) { + return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest other) { - if (other == org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest other) { + if (other == org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest.getDefaultInstance()) return this; if (other.hasPtinfo()) { mergePtinfo(other.getPtinfo()); } @@ -687,9 +687,9 @@ public Builder mergeFrom( } private int bitField0_; - private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_; private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; /** * .client.ProtoTInfo ptinfo = 1; * @return Whether the ptinfo field is set. @@ -701,9 +701,9 @@ public boolean hasPtinfo() { * .client.ProtoTInfo ptinfo = 1; * @return The ptinfo. */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() { if (ptinfoBuilder_ == null) { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } else { return ptinfoBuilder_.getMessage(); } @@ -711,7 +711,7 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { /** * .client.ProtoTInfo ptinfo = 1; */ - public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + public Builder setPtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) { if (ptinfoBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -728,7 +728,7 @@ public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo * .client.ProtoTInfo ptinfo = 1; */ public Builder setPtinfo( - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) { + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder builderForValue) { if (ptinfoBuilder_ == null) { ptinfo_ = builderForValue.build(); } else { @@ -741,11 +741,11 @@ public Builder setPtinfo( /** * .client.ProtoTInfo ptinfo = 1; */ - public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + public Builder mergePtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) { if (ptinfoBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0) && ptinfo_ != null && - ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { + ptinfo_ != org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { getPtinfoBuilder().mergeFrom(value); } else { ptinfo_ = value; @@ -775,7 +775,7 @@ public Builder clearPtinfo() { /** * .client.ProtoTInfo ptinfo = 1; */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { bitField0_ |= 0x00000001; onChanged(); return getPtinfoFieldBuilder().getBuilder(); @@ -783,23 +783,23 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfo /** * .client.ProtoTInfo ptinfo = 1; */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { if (ptinfoBuilder_ != null) { return ptinfoBuilder_.getMessageOrBuilder(); } else { return ptinfo_ == null ? - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } } /** * .client.ProtoTInfo ptinfo = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> getPtinfoFieldBuilder() { if (ptinfoBuilder_ == null) { ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>( + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder>( getPtinfo(), getParentForChildren(), isClean()); @@ -808,9 +808,9 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinf return ptinfoBuilder_; } - private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_; private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; /** * .security.PCredentials credentials = 2; * @return Whether the credentials field is set. @@ -822,9 +822,9 @@ public boolean hasCredentials() { * .security.PCredentials credentials = 2; * @return The credentials. */ - public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() { if (credentialsBuilder_ == null) { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } else { return credentialsBuilder_.getMessage(); } @@ -832,7 +832,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials( /** * .security.PCredentials credentials = 2; */ - public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + public Builder setCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) { if (credentialsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -849,7 +849,7 @@ public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCred * .security.PCredentials credentials = 2; */ public Builder setCredentials( - org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) { + org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder builderForValue) { if (credentialsBuilder_ == null) { credentials_ = builderForValue.build(); } else { @@ -862,11 +862,11 @@ public Builder setCredentials( /** * .security.PCredentials credentials = 2; */ - public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + public Builder mergeCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) { if (credentialsBuilder_ == null) { if (((bitField0_ & 0x00000002) != 0) && credentials_ != null && - credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) { + credentials_ != org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance()) { getCredentialsBuilder().mergeFrom(value); } else { credentials_ = value; @@ -896,7 +896,7 @@ public Builder clearCredentials() { /** * .security.PCredentials credentials = 2; */ - public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { bitField0_ |= 0x00000002; onChanged(); return getCredentialsFieldBuilder().getBuilder(); @@ -904,23 +904,23 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCred /** * .security.PCredentials credentials = 2; */ - public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { if (credentialsBuilder_ != null) { return credentialsBuilder_.getMessageOrBuilder(); } else { return credentials_ == null ? - org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } } /** * .security.PCredentials credentials = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> getCredentialsFieldBuilder() { if (credentialsBuilder_ == null) { credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>( + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder>( getCredentials(), getParentForChildren(), isClean()); @@ -1161,12 +1161,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:compaction_coordinator.CompactionJobRequest) - private static final org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest DEFAULT_INSTANCE; + private static final org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest(); + DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest(); } - public static org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest getDefaultInstance() { + public static org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -1202,7 +1202,7 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest getDefaultInstanceForType() { + public org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionJobRequestOrBuilder.java similarity index 89% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionJobRequestOrBuilder.java index 377f66f0b84..29e2366bf11 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/CompactionJobRequestOrBuilder.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/CompactionJobRequestOrBuilder.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; public interface CompactionJobRequestOrBuilder extends // @@protoc_insertion_point(interface_extends:compaction_coordinator.CompactionJobRequest) @@ -35,11 +35,11 @@ public interface CompactionJobRequestOrBuilder extends * .client.ProtoTInfo ptinfo = 1; * @return The ptinfo. */ - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo(); + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo(); /** * .client.ProtoTInfo ptinfo = 1; */ - org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); /** * .security.PCredentials credentials = 2; @@ -50,11 +50,11 @@ public interface CompactionJobRequestOrBuilder extends * .security.PCredentials credentials = 2; * @return The credentials. */ - org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(); + org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials(); /** * .security.PCredentials credentials = 2; */ - org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); + org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); /** * string groupName = 3; diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/DataProto.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/DataProto.java similarity index 96% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/DataProto.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/DataProto.java index e92b09545ea..fd4a34f3ddc 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/DataProto.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/DataProto.java @@ -20,7 +20,7 @@ // source: data.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; public final class DataProto { private DataProto() {} @@ -50,7 +50,7 @@ public static void registerAllExtensions( "\n\ndata.proto\022\004data\"c\n\nPKeyExtent\022\r\n\005tabl" + "e\030\001 \001(\014\022\023\n\006endRow\030\002 \001(\014H\000\210\001\001\022\027\n\nprevEndR" + "ow\030\003 \001(\014H\001\210\001\001B\t\n\007_endRowB\r\n\013_prevEndRowB" + - ";\n,org.apache.accumulo.core.compaction.p" + + ";\n,org.apache.accumulo.grpc.compaction.p" + "rotobufB\tDataProtoP\001b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequest.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetCompletedCompactionsRequest.java similarity index 80% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequest.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetCompletedCompactionsRequest.java index 8ea94bc8dee..99b0ec22a96 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequest.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetCompletedCompactionsRequest.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; /** * Protobuf type {@code compaction_coordinator.GetCompletedCompactionsRequest} @@ -46,20 +46,20 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.class, org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest.class, org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest.Builder.class); } private int bitField0_; public static final int PTINFO_FIELD_NUMBER = 1; - private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_; /** * .client.ProtoTInfo ptinfo = 1; * @return Whether the ptinfo field is set. @@ -73,19 +73,19 @@ public boolean hasPtinfo() { * @return The ptinfo. */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() { + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } /** * .client.ProtoTInfo ptinfo = 1; */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } public static final int CREDENTIALS_FIELD_NUMBER = 2; - private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_; /** * .security.PCredentials credentials = 2; * @return Whether the credentials field is set. @@ -99,15 +99,15 @@ public boolean hasCredentials() { * @return The credentials. */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() { + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } /** * .security.PCredentials credentials = 2; */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } private byte memoizedIsInitialized = -1; @@ -157,10 +157,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest)) { + if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest)) { return super.equals(obj); } - org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest other = (org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest) obj; + org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest other = (org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest) obj; if (hasPtinfo() != other.hasPtinfo()) return false; if (hasPtinfo()) { @@ -196,44 +196,44 @@ public int hashCode() { return hash; } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom(byte[] data) + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -241,26 +241,26 @@ public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactio .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseDelimitedFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseDelimitedFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -273,7 +273,7 @@ public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactio public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest prototype) { + public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -294,21 +294,21 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:compaction_coordinator.GetCompletedCompactionsRequest) - org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequestOrBuilder { + org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.class, org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest.class, org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest.Builder.class); } - // Construct using org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.newBuilder() + // Construct using org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -345,17 +345,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetCompletedCompactionsRequest_descriptor; } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest getDefaultInstanceForType() { - return org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.getDefaultInstance(); + public org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest getDefaultInstanceForType() { + return org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest.getDefaultInstance(); } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest build() { - org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest result = buildPartial(); + public org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest build() { + org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -363,14 +363,14 @@ public org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsReque } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest buildPartial() { - org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest result = new org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest(this); + public org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest buildPartial() { + org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest result = new org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest result) { + private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -422,16 +422,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest) { - return mergeFrom((org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest)other); + if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest) { + return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest other) { - if (other == org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest other) { + if (other == org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest.getDefaultInstance()) return this; if (other.hasPtinfo()) { mergePtinfo(other.getPtinfo()); } @@ -495,9 +495,9 @@ public Builder mergeFrom( } private int bitField0_; - private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_; private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; /** * .client.ProtoTInfo ptinfo = 1; * @return Whether the ptinfo field is set. @@ -509,9 +509,9 @@ public boolean hasPtinfo() { * .client.ProtoTInfo ptinfo = 1; * @return The ptinfo. */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() { if (ptinfoBuilder_ == null) { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } else { return ptinfoBuilder_.getMessage(); } @@ -519,7 +519,7 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { /** * .client.ProtoTInfo ptinfo = 1; */ - public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + public Builder setPtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) { if (ptinfoBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -536,7 +536,7 @@ public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo * .client.ProtoTInfo ptinfo = 1; */ public Builder setPtinfo( - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) { + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder builderForValue) { if (ptinfoBuilder_ == null) { ptinfo_ = builderForValue.build(); } else { @@ -549,11 +549,11 @@ public Builder setPtinfo( /** * .client.ProtoTInfo ptinfo = 1; */ - public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + public Builder mergePtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) { if (ptinfoBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0) && ptinfo_ != null && - ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { + ptinfo_ != org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { getPtinfoBuilder().mergeFrom(value); } else { ptinfo_ = value; @@ -583,7 +583,7 @@ public Builder clearPtinfo() { /** * .client.ProtoTInfo ptinfo = 1; */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { bitField0_ |= 0x00000001; onChanged(); return getPtinfoFieldBuilder().getBuilder(); @@ -591,23 +591,23 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfo /** * .client.ProtoTInfo ptinfo = 1; */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { if (ptinfoBuilder_ != null) { return ptinfoBuilder_.getMessageOrBuilder(); } else { return ptinfo_ == null ? - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } } /** * .client.ProtoTInfo ptinfo = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> getPtinfoFieldBuilder() { if (ptinfoBuilder_ == null) { ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>( + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder>( getPtinfo(), getParentForChildren(), isClean()); @@ -616,9 +616,9 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinf return ptinfoBuilder_; } - private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_; private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; /** * .security.PCredentials credentials = 2; * @return Whether the credentials field is set. @@ -630,9 +630,9 @@ public boolean hasCredentials() { * .security.PCredentials credentials = 2; * @return The credentials. */ - public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() { if (credentialsBuilder_ == null) { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } else { return credentialsBuilder_.getMessage(); } @@ -640,7 +640,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials( /** * .security.PCredentials credentials = 2; */ - public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + public Builder setCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) { if (credentialsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -657,7 +657,7 @@ public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCred * .security.PCredentials credentials = 2; */ public Builder setCredentials( - org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) { + org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder builderForValue) { if (credentialsBuilder_ == null) { credentials_ = builderForValue.build(); } else { @@ -670,11 +670,11 @@ public Builder setCredentials( /** * .security.PCredentials credentials = 2; */ - public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + public Builder mergeCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) { if (credentialsBuilder_ == null) { if (((bitField0_ & 0x00000002) != 0) && credentials_ != null && - credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) { + credentials_ != org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance()) { getCredentialsBuilder().mergeFrom(value); } else { credentials_ = value; @@ -704,7 +704,7 @@ public Builder clearCredentials() { /** * .security.PCredentials credentials = 2; */ - public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { bitField0_ |= 0x00000002; onChanged(); return getCredentialsFieldBuilder().getBuilder(); @@ -712,23 +712,23 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCred /** * .security.PCredentials credentials = 2; */ - public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { if (credentialsBuilder_ != null) { return credentialsBuilder_.getMessageOrBuilder(); } else { return credentials_ == null ? - org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } } /** * .security.PCredentials credentials = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> getCredentialsFieldBuilder() { if (credentialsBuilder_ == null) { credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>( + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder>( getCredentials(), getParentForChildren(), isClean()); @@ -753,12 +753,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:compaction_coordinator.GetCompletedCompactionsRequest) - private static final org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest DEFAULT_INSTANCE; + private static final org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest(); + DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest(); } - public static org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest getDefaultInstance() { + public static org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -794,7 +794,7 @@ public com.google.protobuf.Parser getParserForTy } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest getDefaultInstanceForType() { + public org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequestOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetCompletedCompactionsRequestOrBuilder.java similarity index 85% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequestOrBuilder.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetCompletedCompactionsRequestOrBuilder.java index 1ff2b59f2b6..6cde359d4a2 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetCompletedCompactionsRequestOrBuilder.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetCompletedCompactionsRequestOrBuilder.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; public interface GetCompletedCompactionsRequestOrBuilder extends // @@protoc_insertion_point(interface_extends:compaction_coordinator.GetCompletedCompactionsRequest) @@ -35,11 +35,11 @@ public interface GetCompletedCompactionsRequestOrBuilder extends * .client.ProtoTInfo ptinfo = 1; * @return The ptinfo. */ - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo(); + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo(); /** * .client.ProtoTInfo ptinfo = 1; */ - org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); /** * .security.PCredentials credentials = 2; @@ -50,9 +50,9 @@ public interface GetCompletedCompactionsRequestOrBuilder extends * .security.PCredentials credentials = 2; * @return The credentials. */ - org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(); + org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials(); /** * .security.PCredentials credentials = 2; */ - org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); + org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequest.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetRunningCompactionsRequest.java similarity index 80% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequest.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetRunningCompactionsRequest.java index f8c5e8068f1..55f825bd2fa 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequest.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetRunningCompactionsRequest.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; /** * Protobuf type {@code compaction_coordinator.GetRunningCompactionsRequest} @@ -46,20 +46,20 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.class, org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest.class, org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest.Builder.class); } private int bitField0_; public static final int PTINFO_FIELD_NUMBER = 1; - private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_; /** * .client.ProtoTInfo ptinfo = 1; * @return Whether the ptinfo field is set. @@ -73,19 +73,19 @@ public boolean hasPtinfo() { * @return The ptinfo. */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() { + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } /** * .client.ProtoTInfo ptinfo = 1; */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } public static final int CREDENTIALS_FIELD_NUMBER = 2; - private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_; /** * .security.PCredentials credentials = 2; * @return Whether the credentials field is set. @@ -99,15 +99,15 @@ public boolean hasCredentials() { * @return The credentials. */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() { + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } /** * .security.PCredentials credentials = 2; */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } private byte memoizedIsInitialized = -1; @@ -157,10 +157,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest)) { + if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest)) { return super.equals(obj); } - org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest other = (org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest) obj; + org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest other = (org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest) obj; if (hasPtinfo() != other.hasPtinfo()) return false; if (hasPtinfo()) { @@ -196,44 +196,44 @@ public int hashCode() { return hash; } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom(byte[] data) + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -241,26 +241,26 @@ public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactions .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseDelimitedFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseDelimitedFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -273,7 +273,7 @@ public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactions public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest prototype) { + public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -294,21 +294,21 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:compaction_coordinator.GetRunningCompactionsRequest) - org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequestOrBuilder { + org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.class, org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest.class, org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest.Builder.class); } - // Construct using org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.newBuilder() + // Construct using org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -345,17 +345,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_GetRunningCompactionsRequest_descriptor; } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest getDefaultInstanceForType() { - return org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.getDefaultInstance(); + public org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest getDefaultInstanceForType() { + return org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest.getDefaultInstance(); } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest build() { - org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest result = buildPartial(); + public org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest build() { + org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -363,14 +363,14 @@ public org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest buildPartial() { - org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest result = new org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest(this); + public org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest buildPartial() { + org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest result = new org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest result) { + private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -422,16 +422,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest) { - return mergeFrom((org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest)other); + if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest) { + return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest other) { - if (other == org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest other) { + if (other == org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest.getDefaultInstance()) return this; if (other.hasPtinfo()) { mergePtinfo(other.getPtinfo()); } @@ -495,9 +495,9 @@ public Builder mergeFrom( } private int bitField0_; - private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_; + private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_; private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_; /** * .client.ProtoTInfo ptinfo = 1; * @return Whether the ptinfo field is set. @@ -509,9 +509,9 @@ public boolean hasPtinfo() { * .client.ProtoTInfo ptinfo = 1; * @return The ptinfo. */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() { if (ptinfoBuilder_ == null) { - return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } else { return ptinfoBuilder_.getMessage(); } @@ -519,7 +519,7 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() { /** * .client.ProtoTInfo ptinfo = 1; */ - public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + public Builder setPtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) { if (ptinfoBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -536,7 +536,7 @@ public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo * .client.ProtoTInfo ptinfo = 1; */ public Builder setPtinfo( - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) { + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder builderForValue) { if (ptinfoBuilder_ == null) { ptinfo_ = builderForValue.build(); } else { @@ -549,11 +549,11 @@ public Builder setPtinfo( /** * .client.ProtoTInfo ptinfo = 1; */ - public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) { + public Builder mergePtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) { if (ptinfoBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0) && ptinfo_ != null && - ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { + ptinfo_ != org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance()) { getPtinfoBuilder().mergeFrom(value); } else { ptinfo_ = value; @@ -583,7 +583,7 @@ public Builder clearPtinfo() { /** * .client.ProtoTInfo ptinfo = 1; */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() { bitField0_ |= 0x00000001; onChanged(); return getPtinfoFieldBuilder().getBuilder(); @@ -591,23 +591,23 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfo /** * .client.ProtoTInfo ptinfo = 1; */ - public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() { if (ptinfoBuilder_ != null) { return ptinfoBuilder_.getMessageOrBuilder(); } else { return ptinfo_ == null ? - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_; } } /** * .client.ProtoTInfo ptinfo = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> getPtinfoFieldBuilder() { if (ptinfoBuilder_ == null) { ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>( + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder>( getPtinfo(), getParentForChildren(), isClean()); @@ -616,9 +616,9 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinf return ptinfoBuilder_; } - private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_; + private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_; private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_; /** * .security.PCredentials credentials = 2; * @return Whether the credentials field is set. @@ -630,9 +630,9 @@ public boolean hasCredentials() { * .security.PCredentials credentials = 2; * @return The credentials. */ - public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() { if (credentialsBuilder_ == null) { - return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } else { return credentialsBuilder_.getMessage(); } @@ -640,7 +640,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials( /** * .security.PCredentials credentials = 2; */ - public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + public Builder setCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) { if (credentialsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -657,7 +657,7 @@ public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCred * .security.PCredentials credentials = 2; */ public Builder setCredentials( - org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) { + org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder builderForValue) { if (credentialsBuilder_ == null) { credentials_ = builderForValue.build(); } else { @@ -670,11 +670,11 @@ public Builder setCredentials( /** * .security.PCredentials credentials = 2; */ - public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) { + public Builder mergeCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) { if (credentialsBuilder_ == null) { if (((bitField0_ & 0x00000002) != 0) && credentials_ != null && - credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) { + credentials_ != org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance()) { getCredentialsBuilder().mergeFrom(value); } else { credentials_ = value; @@ -704,7 +704,7 @@ public Builder clearCredentials() { /** * .security.PCredentials credentials = 2; */ - public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() { bitField0_ |= 0x00000002; onChanged(); return getCredentialsFieldBuilder().getBuilder(); @@ -712,23 +712,23 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCred /** * .security.PCredentials credentials = 2; */ - public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { + public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() { if (credentialsBuilder_ != null) { return credentialsBuilder_.getMessageOrBuilder(); } else { return credentials_ == null ? - org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; + org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_; } } /** * .security.PCredentials credentials = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> getCredentialsFieldBuilder() { if (credentialsBuilder_ == null) { credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>( + org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder>( getCredentials(), getParentForChildren(), isClean()); @@ -753,12 +753,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:compaction_coordinator.GetRunningCompactionsRequest) - private static final org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest DEFAULT_INSTANCE; + private static final org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest(); + DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest(); } - public static org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest getDefaultInstance() { + public static org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -794,7 +794,7 @@ public com.google.protobuf.Parser getParserForType } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest getDefaultInstanceForType() { + public org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequestOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetRunningCompactionsRequestOrBuilder.java similarity index 85% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequestOrBuilder.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetRunningCompactionsRequestOrBuilder.java index eb553f41e99..d18486105e2 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/GetRunningCompactionsRequestOrBuilder.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/GetRunningCompactionsRequestOrBuilder.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; public interface GetRunningCompactionsRequestOrBuilder extends // @@protoc_insertion_point(interface_extends:compaction_coordinator.GetRunningCompactionsRequest) @@ -35,11 +35,11 @@ public interface GetRunningCompactionsRequestOrBuilder extends * .client.ProtoTInfo ptinfo = 1; * @return The ptinfo. */ - org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo(); + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo(); /** * .client.ProtoTInfo ptinfo = 1; */ - org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); + org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder(); /** * .security.PCredentials credentials = 2; @@ -50,9 +50,9 @@ public interface GetRunningCompactionsRequestOrBuilder extends * .security.PCredentials credentials = 2; * @return The credentials. */ - org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(); + org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials(); /** * .security.PCredentials credentials = 2; */ - org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); + org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder(); } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ManagerProto.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ManagerProto.java similarity index 96% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ManagerProto.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ManagerProto.java index 1106572fe4f..89c3c782eb5 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ManagerProto.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ManagerProto.java @@ -20,7 +20,7 @@ // source: manager.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; public final class ManagerProto { private ManagerProto() {} @@ -51,7 +51,7 @@ public static void registerAllExtensions( "ype\030\001 \001(\0162\032.manager.PFateInstanceType\022\021\n" + "\ttxUUIDStr\030\002 \001(\t*4\n\021PFateInstanceType\022\013\n" + "\007UNKNOWN\020\000\022\010\n\004META\020\001\022\010\n\004USER\020\002B>\n,org.ap" + - "ache.accumulo.core.compaction.protobufB\014" + + "ache.accumulo.grpc.compaction.protobufB\014" + "ManagerProtoP\001b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionKind.java similarity index 97% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionKind.java index eb1c7268eec..b3c06d6d6ac 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionKind.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionKind.java @@ -20,7 +20,7 @@ // source: tabletserver.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; /** * Protobuf enum {@code tabletserver.PCompactionKind} @@ -123,7 +123,7 @@ public PCompactionKind findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.getDescriptor().getEnumTypes().get(0); + return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.getDescriptor().getEnumTypes().get(0); } private static final PCompactionKind[] VALUES = values(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionState.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionState.java similarity index 98% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionState.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionState.java index afeed373b97..e4aab748a6f 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionState.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionState.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; /** * Protobuf enum {@code compaction_coordinator.PCompactionState} @@ -188,7 +188,7 @@ public PCompactionState findValueByNumber(int number) { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.getDescriptor().getEnumTypes().get(0); + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.getDescriptor().getEnumTypes().get(0); } private static final PCompactionState[] VALUES = values(); diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStats.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStats.java similarity index 86% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStats.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStats.java index d248580c2c5..9098338c995 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStats.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStats.java @@ -20,7 +20,7 @@ // source: tabletserver.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; /** * Protobuf type {@code tabletserver.PCompactionStats} @@ -46,15 +46,15 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.PCompactionStats.class, org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.class, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.Builder.class); } public static final int ENTRIESREAD_FIELD_NUMBER = 1; @@ -144,10 +144,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStats)) { + if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats)) { return super.equals(obj); } - org.apache.accumulo.core.compaction.protobuf.PCompactionStats other = (org.apache.accumulo.core.compaction.protobuf.PCompactionStats) obj; + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats other = (org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats) obj; if (getEntriesRead() != other.getEntriesRead()) return false; @@ -180,44 +180,44 @@ public int hashCode() { return hash; } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom(byte[] data) + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -225,26 +225,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats pars .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseDelimitedFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseDelimitedFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -257,7 +257,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats pars public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PCompactionStats prototype) { + public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -278,21 +278,21 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:tabletserver.PCompactionStats) - org.apache.accumulo.core.compaction.protobuf.PCompactionStatsOrBuilder { + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.PCompactionStats.class, org.apache.accumulo.core.compaction.protobuf.PCompactionStats.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.class, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.Builder.class); } - // Construct using org.apache.accumulo.core.compaction.protobuf.PCompactionStats.newBuilder() + // Construct using org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.newBuilder() private Builder() { } @@ -315,17 +315,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PCompactionStats_descriptor; } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCompactionStats getDefaultInstanceForType() { - return org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance(); + public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats getDefaultInstanceForType() { + return org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.getDefaultInstance(); } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCompactionStats build() { - org.apache.accumulo.core.compaction.protobuf.PCompactionStats result = buildPartial(); + public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats build() { + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -333,14 +333,14 @@ public org.apache.accumulo.core.compaction.protobuf.PCompactionStats build() { } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCompactionStats buildPartial() { - org.apache.accumulo.core.compaction.protobuf.PCompactionStats result = new org.apache.accumulo.core.compaction.protobuf.PCompactionStats(this); + public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats buildPartial() { + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats result = new org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PCompactionStats result) { + private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { result.entriesRead_ = entriesRead_; @@ -387,16 +387,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStats) { - return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PCompactionStats)other); + if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats) { + return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PCompactionStats other) { - if (other == org.apache.accumulo.core.compaction.protobuf.PCompactionStats.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats other) { + if (other == org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats.getDefaultInstance()) return this; if (other.getEntriesRead() != 0L) { setEntriesRead(other.getEntriesRead()); } @@ -576,12 +576,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:tabletserver.PCompactionStats) - private static final org.apache.accumulo.core.compaction.protobuf.PCompactionStats DEFAULT_INSTANCE; + private static final org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PCompactionStats(); + DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats(); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStats getDefaultInstance() { + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -617,7 +617,7 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCompactionStats getDefaultInstanceForType() { + public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatsOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStatsOrBuilder.java similarity index 96% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatsOrBuilder.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStatsOrBuilder.java index 559460b1cdf..cff10a214e0 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatsOrBuilder.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStatsOrBuilder.java @@ -20,7 +20,7 @@ // source: tabletserver.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; public interface PCompactionStatsOrBuilder extends // @@protoc_insertion_point(interface_extends:tabletserver.PCompactionStats) diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdate.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStatusUpdate.java similarity index 89% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdate.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStatusUpdate.java index f6a8d374534..e17858593e5 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdate.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStatusUpdate.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; /** * Protobuf type {@code compaction_coordinator.PCompactionStatusUpdate} @@ -48,15 +48,15 @@ protected java.lang.Object newInstance( public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.class, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.class, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.Builder.class); } public static final int STATE_FIELD_NUMBER = 1; @@ -72,9 +72,9 @@ protected java.lang.Object newInstance( * .compaction_coordinator.PCompactionState state = 1; * @return The state. */ - @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PCompactionState getState() { - org.apache.accumulo.core.compaction.protobuf.PCompactionState result = org.apache.accumulo.core.compaction.protobuf.PCompactionState.forNumber(state_); - return result == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionState.UNRECOGNIZED : result; + @java.lang.Override public org.apache.accumulo.grpc.compaction.protobuf.PCompactionState getState() { + org.apache.accumulo.grpc.compaction.protobuf.PCompactionState result = org.apache.accumulo.grpc.compaction.protobuf.PCompactionState.forNumber(state_); + return result == null ? org.apache.accumulo.grpc.compaction.protobuf.PCompactionState.UNRECOGNIZED : result; } public static final int MESSAGE_FIELD_NUMBER = 2; @@ -174,7 +174,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (state_ != org.apache.accumulo.core.compaction.protobuf.PCompactionState.ASSIGNED.getNumber()) { + if (state_ != org.apache.accumulo.grpc.compaction.protobuf.PCompactionState.ASSIGNED.getNumber()) { output.writeEnum(1, state_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) { @@ -201,7 +201,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (state_ != org.apache.accumulo.core.compaction.protobuf.PCompactionState.ASSIGNED.getNumber()) { + if (state_ != org.apache.accumulo.grpc.compaction.protobuf.PCompactionState.ASSIGNED.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(1, state_); } @@ -234,10 +234,10 @@ public boolean equals(final java.lang.Object obj) { if (obj == this) { return true; } - if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate)) { + if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate)) { return super.equals(obj); } - org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate other = (org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) obj; + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate other = (org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate) obj; if (state_ != other.state_) return false; if (!getMessage() @@ -282,44 +282,44 @@ public int hashCode() { return hash; } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(byte[] data) + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -327,26 +327,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpda .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseDelimitedFrom(java.io.InputStream input) + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseDelimitedFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate parseFrom( + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -359,7 +359,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpda public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate prototype) { + public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -380,21 +380,21 @@ protected Builder newBuilderForType( public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:compaction_coordinator.PCompactionStatusUpdate) - org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder { + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdateOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_fieldAccessorTable + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.class, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder.class); + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.class, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.Builder.class); } - // Construct using org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.newBuilder() + // Construct using org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.newBuilder() private Builder() { } @@ -420,17 +420,17 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor; + return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PCompactionStatusUpdate_descriptor; } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getDefaultInstanceForType() { - return org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance(); + public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate getDefaultInstanceForType() { + return org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance(); } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate build() { - org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate result = buildPartial(); + public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate build() { + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -438,14 +438,14 @@ public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate buil } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate buildPartial() { - org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate result = new org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate(this); + public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate buildPartial() { + org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate result = new org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate result) { + private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { result.state_ = state_; @@ -501,16 +501,16 @@ public Builder addRepeatedField( } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) { - return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate)other); + if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate) { + return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate other) { - if (other == org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance()) return this; + public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate other) { + if (other == org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance()) return this; if (other.state_ != 0) { setStateValue(other.getStateValue()); } @@ -628,16 +628,16 @@ public Builder setStateValue(int value) { * @return The state. */ @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCompactionState getState() { - org.apache.accumulo.core.compaction.protobuf.PCompactionState result = org.apache.accumulo.core.compaction.protobuf.PCompactionState.forNumber(state_); - return result == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionState.UNRECOGNIZED : result; + public org.apache.accumulo.grpc.compaction.protobuf.PCompactionState getState() { + org.apache.accumulo.grpc.compaction.protobuf.PCompactionState result = org.apache.accumulo.grpc.compaction.protobuf.PCompactionState.forNumber(state_); + return result == null ? org.apache.accumulo.grpc.compaction.protobuf.PCompactionState.UNRECOGNIZED : result; } /** * .compaction_coordinator.PCompactionState state = 1; * @param value The state to set. * @return This builder for chaining. */ - public Builder setState(org.apache.accumulo.core.compaction.protobuf.PCompactionState value) { + public Builder setState(org.apache.accumulo.grpc.compaction.protobuf.PCompactionState value) { if (value == null) { throw new NullPointerException(); } @@ -873,12 +873,12 @@ public final Builder mergeUnknownFields( } // @@protoc_insertion_point(class_scope:compaction_coordinator.PCompactionStatusUpdate) - private static final org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate DEFAULT_INSTANCE; + private static final org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate(); + DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate(); } - public static org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getDefaultInstance() { + public static org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -914,7 +914,7 @@ public com.google.protobuf.Parser getParserForType() { } @java.lang.Override - public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getDefaultInstanceForType() { + public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdateOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStatusUpdateOrBuilder.java similarity index 94% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdateOrBuilder.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStatusUpdateOrBuilder.java index a5344feddda..b01dd1382c0 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCompactionStatusUpdateOrBuilder.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCompactionStatusUpdateOrBuilder.java @@ -20,7 +20,7 @@ // source: compaction-coordinator.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; public interface PCompactionStatusUpdateOrBuilder extends // @@protoc_insertion_point(interface_extends:compaction_coordinator.PCompactionStatusUpdate) @@ -35,7 +35,7 @@ public interface PCompactionStatusUpdateOrBuilder extends * .compaction_coordinator.PCompactionState state = 1; * @return The state. */ - org.apache.accumulo.core.compaction.protobuf.PCompactionState getState(); + org.apache.accumulo.grpc.compaction.protobuf.PCompactionState getState(); /** * string message = 2; diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCredentials.java similarity index 91% rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCredentials.java index f2f7027fcfa..bbea49564d2 100644 --- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentials.java +++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCredentials.java @@ -20,7 +20,7 @@ // source: security.proto // Protobuf Java Version: 3.25.3 -package org.apache.accumulo.core.compaction.protobuf; +package org.apache.accumulo.grpc.compaction.protobuf; /** * 
@@ -57,15 +57,15 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.PCredentials.class, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.PCredentials.class, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder.class);
   }
 
   private int bitField0_;
@@ -287,10 +287,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PCredentials)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PCredentials)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.PCredentials other = (org.apache.accumulo.core.compaction.protobuf.PCredentials) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.PCredentials other = (org.apache.accumulo.grpc.compaction.protobuf.PCredentials) obj;
 
     if (hasPrincipal() != other.hasPrincipal()) return false;
     if (hasPrincipal()) {
@@ -344,44 +344,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -389,26 +389,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -421,7 +421,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PCredentials parseFro
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PCredentials prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PCredentials prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -449,21 +449,21 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:security.PCredentials)
-      org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.PCredentials.class, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.PCredentials.class, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.PCredentials.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.PCredentials.newBuilder()
     private Builder() {
 
     }
@@ -487,17 +487,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.SecurityProto.internal_static_security_PCredentials_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PCredentials getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PCredentials build() {
-      org.apache.accumulo.core.compaction.protobuf.PCredentials result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentials build() {
+      org.apache.accumulo.grpc.compaction.protobuf.PCredentials result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -505,14 +505,14 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials build() {
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PCredentials buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.PCredentials result = new org.apache.accumulo.core.compaction.protobuf.PCredentials(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentials buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.PCredentials result = new org.apache.accumulo.grpc.compaction.protobuf.PCredentials(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PCredentials result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PCredentials result) {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -568,16 +568,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PCredentials) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PCredentials)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PCredentials) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PCredentials)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PCredentials other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PCredentials other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance()) return this;
       if (other.hasPrincipal()) {
         principal_ = other.principal_;
         bitField0_ |= 0x00000001;
@@ -952,12 +952,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:security.PCredentials)
-  private static final org.apache.accumulo.core.compaction.protobuf.PCredentials DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.PCredentials DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PCredentials();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PCredentials();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PCredentials getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.PCredentials getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -993,7 +993,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCredentials getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCredentialsOrBuilder.java
similarity index 98%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCredentialsOrBuilder.java
index f7818dcc780..cb6c2d89296 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PCredentialsOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PCredentialsOrBuilder.java
@@ -20,7 +20,7 @@
 // source: security.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface PCredentialsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:security.PCredentials)
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompaction.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompaction.java
similarity index 82%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompaction.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompaction.java
index eeaff5a7063..db925152a50 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompaction.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompaction.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code compaction_coordinator.PExternalCompaction}
@@ -48,7 +48,7 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
@@ -66,9 +66,9 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.class, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.Builder.class);
   }
 
   private int bitField0_;
@@ -153,19 +153,19 @@ public java.lang.String getCompactor() {
   public static final int UPDATES_FIELD_NUMBER = 3;
   private static final class UpdatesDefaultEntryHolder {
     static final com.google.protobuf.MapEntry<
-        java.lang.Long, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate> defaultEntry =
+        java.lang.Long, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate> defaultEntry =
             com.google.protobuf.MapEntry
-            .newDefaultInstance(
-                org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_UpdatesEntry_descriptor, 
+            .newDefaultInstance(
+                org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_UpdatesEntry_descriptor, 
                 com.google.protobuf.WireFormat.FieldType.INT64,
                 0L,
                 com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance());
+                org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance());
   }
   @SuppressWarnings("serial")
   private com.google.protobuf.MapField<
-      java.lang.Long, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate> updates_;
-  private com.google.protobuf.MapField
+      java.lang.Long, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate> updates_;
+  private com.google.protobuf.MapField
   internalGetUpdates() {
     if (updates_ == null) {
       return com.google.protobuf.MapField.emptyMapField(
@@ -190,14 +190,14 @@ public boolean containsUpdates(
    */
   @java.lang.Override
   @java.lang.Deprecated
-  public java.util.Map getUpdates() {
+  public java.util.Map getUpdates() {
     return getUpdatesMap();
   }
   /**
    * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
    */
   @java.lang.Override
-  public java.util.Map getUpdatesMap() {
+  public java.util.Map getUpdatesMap() {
     return internalGetUpdates().getMap();
   }
   /**
@@ -205,12 +205,12 @@ public java.util.Map map =
+    java.util.Map map =
         internalGetUpdates().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
@@ -218,10 +218,10 @@ org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesO
    * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrThrow(
+  public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrThrow(
       long key) {
 
-    java.util.Map map =
+    java.util.Map map =
         internalGetUpdates().getMap();
     if (!map.containsKey(key)) {
       throw new java.lang.IllegalArgumentException();
@@ -230,7 +230,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getU
   }
 
   public static final int JOB_FIELD_NUMBER = 4;
-  private org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob job_;
+  private org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob job_;
   /**
    * .tabletserver.PExternalCompactionJob job = 4;
    * @return Whether the job field is set.
@@ -244,15 +244,15 @@ public boolean hasJob() {
    * @return The job.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob() {
-    return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob getJob() {
+    return job_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
   }
   /**
    * .tabletserver.PExternalCompactionJob job = 4;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
-    return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
+    return job_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -299,9 +299,9 @@ public int getSerializedSize() {
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(compactor_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, compactor_);
     }
-    for (java.util.Map.Entry entry
+    for (java.util.Map.Entry entry
          : internalGetUpdates().getMap().entrySet()) {
-      com.google.protobuf.MapEntry
+      com.google.protobuf.MapEntry
       updates__ = UpdatesDefaultEntryHolder.defaultEntry.newBuilderForType()
           .setKey(entry.getKey())
           .setValue(entry.getValue())
@@ -323,10 +323,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompaction)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.PExternalCompaction other = (org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction other = (org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction) obj;
 
     if (!getGroupName()
         .equals(other.getGroupName())) return false;
@@ -367,44 +367,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -412,26 +412,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -444,7 +444,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction p
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PExternalCompaction prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -465,10 +465,10 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:compaction_coordinator.PExternalCompaction)
-      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -496,12 +496,12 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.class, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -535,17 +535,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompaction_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction build() {
-      org.apache.accumulo.core.compaction.protobuf.PExternalCompaction result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction build() {
+      org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -553,14 +553,14 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction build()
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.PExternalCompaction result = new org.apache.accumulo.core.compaction.protobuf.PExternalCompaction(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction result = new org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PExternalCompaction result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.groupName_ = groupName_;
@@ -615,16 +615,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PExternalCompaction)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PExternalCompaction other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.getDefaultInstance()) return this;
       if (!other.getGroupName().isEmpty()) {
         groupName_ = other.groupName_;
         bitField0_ |= 0x00000001;
@@ -678,7 +678,7 @@ public Builder mergeFrom(
               break;
             } // case 18
             case 26: {
-              com.google.protobuf.MapEntry
+              com.google.protobuf.MapEntry
               updates__ = input.readMessage(
                   UpdatesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
               internalGetMutableUpdates().ensureBuilderMap().put(
@@ -854,30 +854,30 @@ public Builder setCompactorBytes(
       return this;
     }
 
-    private static final class UpdatesConverter implements com.google.protobuf.MapFieldBuilder.Converter {
+    private static final class UpdatesConverter implements com.google.protobuf.MapFieldBuilder.Converter {
       @java.lang.Override
-      public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate build(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder val) {
-        if (val instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) { return (org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) val; }
-        return ((org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder) val).build();
+      public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate build(org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdateOrBuilder val) {
+        if (val instanceof org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate) { return (org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate) val; }
+        return ((org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.Builder) val).build();
       }
 
       @java.lang.Override
-      public com.google.protobuf.MapEntry defaultEntry() {
+      public com.google.protobuf.MapEntry defaultEntry() {
         return UpdatesDefaultEntryHolder.defaultEntry;
       }
     };
     private static final UpdatesConverter updatesConverter = new UpdatesConverter();
 
     private com.google.protobuf.MapFieldBuilder<
-        java.lang.Long, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder> updates_;
-    private com.google.protobuf.MapFieldBuilder
+        java.lang.Long, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdateOrBuilder, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.Builder> updates_;
+    private com.google.protobuf.MapFieldBuilder
         internalGetUpdates() {
       if (updates_ == null) {
         return new com.google.protobuf.MapFieldBuilder<>(updatesConverter);
       }
       return updates_;
     }
-    private com.google.protobuf.MapFieldBuilder
+    private com.google.protobuf.MapFieldBuilder
         internalGetMutableUpdates() {
       if (updates_ == null) {
         updates_ = new com.google.protobuf.MapFieldBuilder<>(updatesConverter);
@@ -903,14 +903,14 @@ public boolean containsUpdates(
      */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map getUpdates() {
+    public java.util.Map getUpdates() {
       return getUpdatesMap();
     }
     /**
      * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
      */
     @java.lang.Override
-    public java.util.Map getUpdatesMap() {
+    public java.util.Map getUpdatesMap() {
       return internalGetUpdates().getImmutableMap();
     }
     /**
@@ -918,22 +918,22 @@ public java.util.Map map = internalGetMutableUpdates().ensureBuilderMap();
+      java.util.Map map = internalGetMutableUpdates().ensureBuilderMap();
       return map.containsKey(key) ? updatesConverter.build(map.get(key)) : defaultValue;
     }
     /**
      * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
      */
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrThrow(
+    public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrThrow(
         long key) {
 
-      java.util.Map map = internalGetMutableUpdates().ensureBuilderMap();
+      java.util.Map map = internalGetMutableUpdates().ensureBuilderMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -958,7 +958,7 @@ public Builder removeUpdates(
      * Use alternate mutation accessors instead.
      */
     @java.lang.Deprecated
-    public java.util.Map
+    public java.util.Map
         getMutableUpdates() {
       bitField0_ |= 0x00000004;
       return internalGetMutableUpdates().ensureMessageMap();
@@ -968,7 +968,7 @@ public Builder removeUpdates(
      */
     public Builder putUpdates(
         long key,
-        org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate value) {
+        org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate value) {
 
       if (value == null) { throw new NullPointerException("map value"); }
       internalGetMutableUpdates().ensureBuilderMap()
@@ -980,8 +980,8 @@ public Builder putUpdates(
      * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
      */
     public Builder putAllUpdates(
-        java.util.Map values) {
-      for (java.util.Map.Entry e : values.entrySet()) {
+        java.util.Map values) {
+      for (java.util.Map.Entry e : values.entrySet()) {
         if (e.getKey() == null || e.getValue() == null) {
           throw new NullPointerException();
         }
@@ -994,24 +994,24 @@ public Builder putAllUpdates(
     /**
      * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder putUpdatesBuilderIfAbsent(
+    public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.Builder putUpdatesBuilderIfAbsent(
         long key) {
-      java.util.Map builderMap = internalGetMutableUpdates().ensureBuilderMap();
-      org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder entry = builderMap.get(key);
+      java.util.Map builderMap = internalGetMutableUpdates().ensureBuilderMap();
+      org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdateOrBuilder entry = builderMap.get(key);
       if (entry == null) {
-        entry = org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.newBuilder();
+        entry = org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.newBuilder();
         builderMap.put(key, entry);
       }
-      if (entry instanceof org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) {
-        entry = ((org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate) entry).toBuilder();
+      if (entry instanceof org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate) {
+        entry = ((org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate) entry).toBuilder();
         builderMap.put(key, entry);
       }
-      return (org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder) entry;
+      return (org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.Builder) entry;
     }
 
-    private org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob job_;
+    private org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob job_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder> jobBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder> jobBuilder_;
     /**
      * .tabletserver.PExternalCompactionJob job = 4;
      * @return Whether the job field is set.
@@ -1023,9 +1023,9 @@ public boolean hasJob() {
      * .tabletserver.PExternalCompactionJob job = 4;
      * @return The job.
      */
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob getJob() {
       if (jobBuilder_ == null) {
-        return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+        return job_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
       } else {
         return jobBuilder_.getMessage();
       }
@@ -1033,7 +1033,7 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJo
     /**
      * .tabletserver.PExternalCompactionJob job = 4;
      */
-    public Builder setJob(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob value) {
+    public Builder setJob(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob value) {
       if (jobBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1050,7 +1050,7 @@ public Builder setJob(org.apache.accumulo.core.compaction.protobuf.PExternalComp
      * .tabletserver.PExternalCompactionJob job = 4;
      */
     public Builder setJob(
-        org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder builderForValue) {
       if (jobBuilder_ == null) {
         job_ = builderForValue.build();
       } else {
@@ -1063,11 +1063,11 @@ public Builder setJob(
     /**
      * .tabletserver.PExternalCompactionJob job = 4;
      */
-    public Builder mergeJob(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob value) {
+    public Builder mergeJob(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob value) {
       if (jobBuilder_ == null) {
         if (((bitField0_ & 0x00000008) != 0) &&
           job_ != null &&
-          job_ != org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance()) {
+          job_ != org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance()) {
           getJobBuilder().mergeFrom(value);
         } else {
           job_ = value;
@@ -1097,7 +1097,7 @@ public Builder clearJob() {
     /**
      * .tabletserver.PExternalCompactionJob job = 4;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder getJobBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder getJobBuilder() {
       bitField0_ |= 0x00000008;
       onChanged();
       return getJobFieldBuilder().getBuilder();
@@ -1105,23 +1105,23 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Build
     /**
      * .tabletserver.PExternalCompactionJob job = 4;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
       if (jobBuilder_ != null) {
         return jobBuilder_.getMessageOrBuilder();
       } else {
         return job_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+            org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
       }
     }
     /**
      * .tabletserver.PExternalCompactionJob job = 4;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder> 
         getJobFieldBuilder() {
       if (jobBuilder_ == null) {
         jobBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder>(
                 getJob(),
                 getParentForChildren(),
                 isClean());
@@ -1146,12 +1146,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:compaction_coordinator.PExternalCompaction)
-  private static final org.apache.accumulo.core.compaction.protobuf.PExternalCompaction DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PExternalCompaction();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -1187,7 +1187,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionJob.java
similarity index 86%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionJob.java
index 876111ea814..a4fd873e059 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJob.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionJob.java
@@ -20,7 +20,7 @@
 // source: tabletserver.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code tabletserver.PExternalCompactionJob}
@@ -50,7 +50,7 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
@@ -68,9 +68,9 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.class, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder.class);
   }
 
   private int bitField0_;
@@ -122,7 +122,7 @@ public java.lang.String getExternalCompactionId() {
   }
 
   public static final int EXTENT_FIELD_NUMBER = 2;
-  private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_;
+  private org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent extent_;
   /**
    * optional .data.PKeyExtent extent = 2;
    * @return Whether the extent field is set.
@@ -136,32 +136,32 @@ public boolean hasExtent() {
    * @return The extent.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() {
-    return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getExtent() {
+    return extent_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
   }
   /**
    * optional .data.PKeyExtent extent = 2;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() {
-    return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() {
+    return extent_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
   }
 
   public static final int FILES_FIELD_NUMBER = 3;
   @SuppressWarnings("serial")
-  private java.util.List files_;
+  private java.util.List files_;
   /**
    * repeated .tabletserver.PInputFile files = 3;
    */
   @java.lang.Override
-  public java.util.List getFilesList() {
+  public java.util.List getFilesList() {
     return files_;
   }
   /**
    * repeated .tabletserver.PInputFile files = 3;
    */
   @java.lang.Override
-  public java.util.List 
+  public java.util.List 
       getFilesOrBuilderList() {
     return files_;
   }
@@ -176,20 +176,20 @@ public int getFilesCount() {
    * repeated .tabletserver.PInputFile files = 3;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index) {
+  public org.apache.accumulo.grpc.compaction.protobuf.PInputFile getFiles(int index) {
     return files_.get(index);
   }
   /**
    * repeated .tabletserver.PInputFile files = 3;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder(
+  public org.apache.accumulo.grpc.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder(
       int index) {
     return files_.get(index);
   }
 
   public static final int ITERATORSETTINGS_FIELD_NUMBER = 4;
-  private org.apache.accumulo.core.compaction.protobuf.PIteratorConfig iteratorSettings_;
+  private org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig iteratorSettings_;
   /**
    * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
    * @return Whether the iteratorSettings field is set.
@@ -203,15 +203,15 @@ public boolean hasIteratorSettings() {
    * @return The iteratorSettings.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorSettings() {
-    return iteratorSettings_ == null ? org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig getIteratorSettings() {
+    return iteratorSettings_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_;
   }
   /**
    * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder() {
-    return iteratorSettings_ == null ? org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder() {
+    return iteratorSettings_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_;
   }
 
   public static final int OUTPUTFILE_FIELD_NUMBER = 5;
@@ -300,13 +300,13 @@ public boolean getPropagateDeletes() {
    * optional .tabletserver.PCompactionKind kind = 7;
    * @return The kind.
    */
-  @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind() {
-    org.apache.accumulo.core.compaction.protobuf.PCompactionKind result = org.apache.accumulo.core.compaction.protobuf.PCompactionKind.forNumber(kind_);
-    return result == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionKind.UNRECOGNIZED : result;
+  @java.lang.Override public org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind getKind() {
+    org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind result = org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind.forNumber(kind_);
+    return result == null ? org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind.UNRECOGNIZED : result;
   }
 
   public static final int FATEID_FIELD_NUMBER = 8;
-  private org.apache.accumulo.core.compaction.protobuf.PFateId fateId_;
+  private org.apache.accumulo.grpc.compaction.protobuf.PFateId fateId_;
   /**
    * optional .manager.PFateId fateId = 8;
    * @return Whether the fateId field is set.
@@ -320,15 +320,15 @@ public boolean hasFateId() {
    * @return The fateId.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PFateId getFateId() {
-    return fateId_ == null ? org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance() : fateId_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PFateId getFateId() {
+    return fateId_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PFateId.getDefaultInstance() : fateId_;
   }
   /**
    * optional .manager.PFateId fateId = 8;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder() {
-    return fateId_ == null ? org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance() : fateId_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder() {
+    return fateId_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PFateId.getDefaultInstance() : fateId_;
   }
 
   public static final int OVERRIDES_FIELD_NUMBER = 9;
@@ -337,7 +337,7 @@ private static final class OverridesDefaultEntryHolder {
         java.lang.String, java.lang.String> defaultEntry =
             com.google.protobuf.MapEntry
             .newDefaultInstance(
-                org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_OverridesEntry_descriptor, 
+                org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_OverridesEntry_descriptor, 
                 com.google.protobuf.WireFormat.FieldType.STRING,
                 "",
                 com.google.protobuf.WireFormat.FieldType.STRING,
@@ -513,10 +513,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob other = (org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob other = (org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob) obj;
 
     if (hasExternalCompactionId() != other.hasExternalCompactionId()) return false;
     if (hasExternalCompactionId()) {
@@ -609,44 +609,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -654,26 +654,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJo
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -686,7 +686,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJo
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -707,10 +707,10 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:tabletserver.PExternalCompactionJob)
-      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -738,12 +738,12 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.class, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -799,17 +799,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PExternalCompactionJob_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob build() {
-      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob build() {
+      org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -817,15 +817,15 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob build
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob result = new org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob result = new org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob(this);
       buildPartialRepeatedFields(result);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartialRepeatedFields(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob result) {
+    private void buildPartialRepeatedFields(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob result) {
       if (filesBuilder_ == null) {
         if (((bitField0_ & 0x00000004) != 0)) {
           files_ = java.util.Collections.unmodifiableList(files_);
@@ -837,7 +837,7 @@ private void buildPartialRepeatedFields(org.apache.accumulo.core.compaction.prot
       }
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob result) {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -915,16 +915,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance()) return this;
       if (other.hasExternalCompactionId()) {
         externalCompactionId_ = other.externalCompactionId_;
         bitField0_ |= 0x00000001;
@@ -1018,9 +1018,9 @@ public Builder mergeFrom(
               break;
             } // case 18
             case 26: {
-              org.apache.accumulo.core.compaction.protobuf.PInputFile m =
+              org.apache.accumulo.grpc.compaction.protobuf.PInputFile m =
                   input.readMessage(
-                      org.apache.accumulo.core.compaction.protobuf.PInputFile.parser(),
+                      org.apache.accumulo.grpc.compaction.protobuf.PInputFile.parser(),
                       extensionRegistry);
               if (filesBuilder_ == null) {
                 ensureFilesIsMutable();
@@ -1164,9 +1164,9 @@ public Builder setExternalCompactionIdBytes(
       return this;
     }
 
-    private org.apache.accumulo.core.compaction.protobuf.PKeyExtent extent_;
+    private org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent extent_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> extentBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder> extentBuilder_;
     /**
      * optional .data.PKeyExtent extent = 2;
      * @return Whether the extent field is set.
@@ -1178,9 +1178,9 @@ public boolean hasExtent() {
      * optional .data.PKeyExtent extent = 2;
      * @return The extent.
      */
-    public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getExtent() {
       if (extentBuilder_ == null) {
-        return extent_ == null ? org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
+        return extent_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
       } else {
         return extentBuilder_.getMessage();
       }
@@ -1188,7 +1188,7 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent() {
     /**
      * optional .data.PKeyExtent extent = 2;
      */
-    public Builder setExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) {
+    public Builder setExtent(org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent value) {
       if (extentBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1205,7 +1205,7 @@ public Builder setExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent
      * optional .data.PKeyExtent extent = 2;
      */
     public Builder setExtent(
-        org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder builderForValue) {
       if (extentBuilder_ == null) {
         extent_ = builderForValue.build();
       } else {
@@ -1218,11 +1218,11 @@ public Builder setExtent(
     /**
      * optional .data.PKeyExtent extent = 2;
      */
-    public Builder mergeExtent(org.apache.accumulo.core.compaction.protobuf.PKeyExtent value) {
+    public Builder mergeExtent(org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent value) {
       if (extentBuilder_ == null) {
         if (((bitField0_ & 0x00000002) != 0) &&
           extent_ != null &&
-          extent_ != org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance()) {
+          extent_ != org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance()) {
           getExtentBuilder().mergeFrom(value);
         } else {
           extent_ = value;
@@ -1252,7 +1252,7 @@ public Builder clearExtent() {
     /**
      * optional .data.PKeyExtent extent = 2;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder getExtentBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder getExtentBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
       return getExtentFieldBuilder().getBuilder();
@@ -1260,23 +1260,23 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder getExtent
     /**
      * optional .data.PKeyExtent extent = 2;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder() {
       if (extentBuilder_ != null) {
         return extentBuilder_.getMessageOrBuilder();
       } else {
         return extent_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
+            org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance() : extent_;
       }
     }
     /**
      * optional .data.PKeyExtent extent = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder> 
         getExtentFieldBuilder() {
       if (extentBuilder_ == null) {
         extentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PKeyExtent, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder>(
                 getExtent(),
                 getParentForChildren(),
                 isClean());
@@ -1285,22 +1285,22 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExten
       return extentBuilder_;
     }
 
-    private java.util.List files_ =
+    private java.util.List files_ =
       java.util.Collections.emptyList();
     private void ensureFilesIsMutable() {
       if (!((bitField0_ & 0x00000004) != 0)) {
-        files_ = new java.util.ArrayList(files_);
+        files_ = new java.util.ArrayList(files_);
         bitField0_ |= 0x00000004;
        }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PInputFile, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder, org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder> filesBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PInputFile, org.apache.accumulo.grpc.compaction.protobuf.PInputFile.Builder, org.apache.accumulo.grpc.compaction.protobuf.PInputFileOrBuilder> filesBuilder_;
 
     /**
      * repeated .tabletserver.PInputFile files = 3;
      */
-    public java.util.List getFilesList() {
+    public java.util.List getFilesList() {
       if (filesBuilder_ == null) {
         return java.util.Collections.unmodifiableList(files_);
       } else {
@@ -1320,7 +1320,7 @@ public int getFilesCount() {
     /**
      * repeated .tabletserver.PInputFile files = 3;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index) {
+    public org.apache.accumulo.grpc.compaction.protobuf.PInputFile getFiles(int index) {
       if (filesBuilder_ == null) {
         return files_.get(index);
       } else {
@@ -1331,7 +1331,7 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int inde
      * repeated .tabletserver.PInputFile files = 3;
      */
     public Builder setFiles(
-        int index, org.apache.accumulo.core.compaction.protobuf.PInputFile value) {
+        int index, org.apache.accumulo.grpc.compaction.protobuf.PInputFile value) {
       if (filesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1348,7 +1348,7 @@ public Builder setFiles(
      * repeated .tabletserver.PInputFile files = 3;
      */
     public Builder setFiles(
-        int index, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) {
+        int index, org.apache.accumulo.grpc.compaction.protobuf.PInputFile.Builder builderForValue) {
       if (filesBuilder_ == null) {
         ensureFilesIsMutable();
         files_.set(index, builderForValue.build());
@@ -1361,7 +1361,7 @@ public Builder setFiles(
     /**
      * repeated .tabletserver.PInputFile files = 3;
      */
-    public Builder addFiles(org.apache.accumulo.core.compaction.protobuf.PInputFile value) {
+    public Builder addFiles(org.apache.accumulo.grpc.compaction.protobuf.PInputFile value) {
       if (filesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1378,7 +1378,7 @@ public Builder addFiles(org.apache.accumulo.core.compaction.protobuf.PInputFile
      * repeated .tabletserver.PInputFile files = 3;
      */
     public Builder addFiles(
-        int index, org.apache.accumulo.core.compaction.protobuf.PInputFile value) {
+        int index, org.apache.accumulo.grpc.compaction.protobuf.PInputFile value) {
       if (filesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1395,7 +1395,7 @@ public Builder addFiles(
      * repeated .tabletserver.PInputFile files = 3;
      */
     public Builder addFiles(
-        org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PInputFile.Builder builderForValue) {
       if (filesBuilder_ == null) {
         ensureFilesIsMutable();
         files_.add(builderForValue.build());
@@ -1409,7 +1409,7 @@ public Builder addFiles(
      * repeated .tabletserver.PInputFile files = 3;
      */
     public Builder addFiles(
-        int index, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder builderForValue) {
+        int index, org.apache.accumulo.grpc.compaction.protobuf.PInputFile.Builder builderForValue) {
       if (filesBuilder_ == null) {
         ensureFilesIsMutable();
         files_.add(index, builderForValue.build());
@@ -1423,7 +1423,7 @@ public Builder addFiles(
      * repeated .tabletserver.PInputFile files = 3;
      */
     public Builder addAllFiles(
-        java.lang.Iterable values) {
+        java.lang.Iterable values) {
       if (filesBuilder_ == null) {
         ensureFilesIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -1463,14 +1463,14 @@ public Builder removeFiles(int index) {
     /**
      * repeated .tabletserver.PInputFile files = 3;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder getFilesBuilder(
+    public org.apache.accumulo.grpc.compaction.protobuf.PInputFile.Builder getFilesBuilder(
         int index) {
       return getFilesFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tabletserver.PInputFile files = 3;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder(
+    public org.apache.accumulo.grpc.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder(
         int index) {
       if (filesBuilder_ == null) {
         return files_.get(index);  } else {
@@ -1480,7 +1480,7 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFiles
     /**
      * repeated .tabletserver.PInputFile files = 3;
      */
-    public java.util.List 
+    public java.util.List 
          getFilesOrBuilderList() {
       if (filesBuilder_ != null) {
         return filesBuilder_.getMessageOrBuilderList();
@@ -1491,31 +1491,31 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFiles
     /**
      * repeated .tabletserver.PInputFile files = 3;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PInputFile.Builder addFilesBuilder() {
       return getFilesFieldBuilder().addBuilder(
-          org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance());
+          org.apache.accumulo.grpc.compaction.protobuf.PInputFile.getDefaultInstance());
     }
     /**
      * repeated .tabletserver.PInputFile files = 3;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesBuilder(
+    public org.apache.accumulo.grpc.compaction.protobuf.PInputFile.Builder addFilesBuilder(
         int index) {
       return getFilesFieldBuilder().addBuilder(
-          index, org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance());
+          index, org.apache.accumulo.grpc.compaction.protobuf.PInputFile.getDefaultInstance());
     }
     /**
      * repeated .tabletserver.PInputFile files = 3;
      */
-    public java.util.List 
+    public java.util.List 
          getFilesBuilderList() {
       return getFilesFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PInputFile, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder, org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PInputFile, org.apache.accumulo.grpc.compaction.protobuf.PInputFile.Builder, org.apache.accumulo.grpc.compaction.protobuf.PInputFileOrBuilder> 
         getFilesFieldBuilder() {
       if (filesBuilder_ == null) {
         filesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PInputFile, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder, org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PInputFile, org.apache.accumulo.grpc.compaction.protobuf.PInputFile.Builder, org.apache.accumulo.grpc.compaction.protobuf.PInputFileOrBuilder>(
                 files_,
                 ((bitField0_ & 0x00000004) != 0),
                 getParentForChildren(),
@@ -1525,9 +1525,9 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder addFilesB
       return filesBuilder_;
     }
 
-    private org.apache.accumulo.core.compaction.protobuf.PIteratorConfig iteratorSettings_;
+    private org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig iteratorSettings_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PIteratorConfig, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder> iteratorSettingsBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig, org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfigOrBuilder> iteratorSettingsBuilder_;
     /**
      * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
      * @return Whether the iteratorSettings field is set.
@@ -1539,9 +1539,9 @@ public boolean hasIteratorSettings() {
      * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
      * @return The iteratorSettings.
      */
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorSettings() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig getIteratorSettings() {
       if (iteratorSettingsBuilder_ == null) {
-        return iteratorSettings_ == null ? org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_;
+        return iteratorSettings_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_;
       } else {
         return iteratorSettingsBuilder_.getMessage();
       }
@@ -1549,7 +1549,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorS
     /**
      * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
      */
-    public Builder setIteratorSettings(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig value) {
+    public Builder setIteratorSettings(org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig value) {
       if (iteratorSettingsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1566,7 +1566,7 @@ public Builder setIteratorSettings(org.apache.accumulo.core.compaction.protobuf.
      * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
      */
     public Builder setIteratorSettings(
-        org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.Builder builderForValue) {
       if (iteratorSettingsBuilder_ == null) {
         iteratorSettings_ = builderForValue.build();
       } else {
@@ -1579,11 +1579,11 @@ public Builder setIteratorSettings(
     /**
      * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
      */
-    public Builder mergeIteratorSettings(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig value) {
+    public Builder mergeIteratorSettings(org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig value) {
       if (iteratorSettingsBuilder_ == null) {
         if (((bitField0_ & 0x00000008) != 0) &&
           iteratorSettings_ != null &&
-          iteratorSettings_ != org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance()) {
+          iteratorSettings_ != org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.getDefaultInstance()) {
           getIteratorSettingsBuilder().mergeFrom(value);
         } else {
           iteratorSettings_ = value;
@@ -1613,7 +1613,7 @@ public Builder clearIteratorSettings() {
     /**
      * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder getIteratorSettingsBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.Builder getIteratorSettingsBuilder() {
       bitField0_ |= 0x00000008;
       onChanged();
       return getIteratorSettingsFieldBuilder().getBuilder();
@@ -1621,23 +1621,23 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder getI
     /**
      * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder() {
       if (iteratorSettingsBuilder_ != null) {
         return iteratorSettingsBuilder_.getMessageOrBuilder();
       } else {
         return iteratorSettings_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_;
+            org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.getDefaultInstance() : iteratorSettings_;
       }
     }
     /**
      * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PIteratorConfig, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig, org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfigOrBuilder> 
         getIteratorSettingsFieldBuilder() {
       if (iteratorSettingsBuilder_ == null) {
         iteratorSettingsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PIteratorConfig, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig, org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.Builder, org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfigOrBuilder>(
                 getIteratorSettings(),
                 getParentForChildren(),
                 isClean());
@@ -1796,16 +1796,16 @@ public Builder setKindValue(int value) {
      * @return The kind.
      */
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind() {
-      org.apache.accumulo.core.compaction.protobuf.PCompactionKind result = org.apache.accumulo.core.compaction.protobuf.PCompactionKind.forNumber(kind_);
-      return result == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionKind.UNRECOGNIZED : result;
+    public org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind getKind() {
+      org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind result = org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind.forNumber(kind_);
+      return result == null ? org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind.UNRECOGNIZED : result;
     }
     /**
      * optional .tabletserver.PCompactionKind kind = 7;
      * @param value The kind to set.
      * @return This builder for chaining.
      */
-    public Builder setKind(org.apache.accumulo.core.compaction.protobuf.PCompactionKind value) {
+    public Builder setKind(org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -1825,9 +1825,9 @@ public Builder clearKind() {
       return this;
     }
 
-    private org.apache.accumulo.core.compaction.protobuf.PFateId fateId_;
+    private org.apache.accumulo.grpc.compaction.protobuf.PFateId fateId_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PFateId, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder, org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder> fateIdBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PFateId, org.apache.accumulo.grpc.compaction.protobuf.PFateId.Builder, org.apache.accumulo.grpc.compaction.protobuf.PFateIdOrBuilder> fateIdBuilder_;
     /**
      * optional .manager.PFateId fateId = 8;
      * @return Whether the fateId field is set.
@@ -1839,9 +1839,9 @@ public boolean hasFateId() {
      * optional .manager.PFateId fateId = 8;
      * @return The fateId.
      */
-    public org.apache.accumulo.core.compaction.protobuf.PFateId getFateId() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PFateId getFateId() {
       if (fateIdBuilder_ == null) {
-        return fateId_ == null ? org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance() : fateId_;
+        return fateId_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PFateId.getDefaultInstance() : fateId_;
       } else {
         return fateIdBuilder_.getMessage();
       }
@@ -1849,7 +1849,7 @@ public org.apache.accumulo.core.compaction.protobuf.PFateId getFateId() {
     /**
      * optional .manager.PFateId fateId = 8;
      */
-    public Builder setFateId(org.apache.accumulo.core.compaction.protobuf.PFateId value) {
+    public Builder setFateId(org.apache.accumulo.grpc.compaction.protobuf.PFateId value) {
       if (fateIdBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1866,7 +1866,7 @@ public Builder setFateId(org.apache.accumulo.core.compaction.protobuf.PFateId va
      * optional .manager.PFateId fateId = 8;
      */
     public Builder setFateId(
-        org.apache.accumulo.core.compaction.protobuf.PFateId.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PFateId.Builder builderForValue) {
       if (fateIdBuilder_ == null) {
         fateId_ = builderForValue.build();
       } else {
@@ -1879,11 +1879,11 @@ public Builder setFateId(
     /**
      * optional .manager.PFateId fateId = 8;
      */
-    public Builder mergeFateId(org.apache.accumulo.core.compaction.protobuf.PFateId value) {
+    public Builder mergeFateId(org.apache.accumulo.grpc.compaction.protobuf.PFateId value) {
       if (fateIdBuilder_ == null) {
         if (((bitField0_ & 0x00000080) != 0) &&
           fateId_ != null &&
-          fateId_ != org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance()) {
+          fateId_ != org.apache.accumulo.grpc.compaction.protobuf.PFateId.getDefaultInstance()) {
           getFateIdBuilder().mergeFrom(value);
         } else {
           fateId_ = value;
@@ -1913,7 +1913,7 @@ public Builder clearFateId() {
     /**
      * optional .manager.PFateId fateId = 8;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PFateId.Builder getFateIdBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PFateId.Builder getFateIdBuilder() {
       bitField0_ |= 0x00000080;
       onChanged();
       return getFateIdFieldBuilder().getBuilder();
@@ -1921,23 +1921,23 @@ public org.apache.accumulo.core.compaction.protobuf.PFateId.Builder getFateIdBui
     /**
      * optional .manager.PFateId fateId = 8;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder() {
       if (fateIdBuilder_ != null) {
         return fateIdBuilder_.getMessageOrBuilder();
       } else {
         return fateId_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance() : fateId_;
+            org.apache.accumulo.grpc.compaction.protobuf.PFateId.getDefaultInstance() : fateId_;
       }
     }
     /**
      * optional .manager.PFateId fateId = 8;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PFateId, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder, org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PFateId, org.apache.accumulo.grpc.compaction.protobuf.PFateId.Builder, org.apache.accumulo.grpc.compaction.protobuf.PFateIdOrBuilder> 
         getFateIdFieldBuilder() {
       if (fateIdBuilder_ == null) {
         fateIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PFateId, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder, org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PFateId, org.apache.accumulo.grpc.compaction.protobuf.PFateId.Builder, org.apache.accumulo.grpc.compaction.protobuf.PFateIdOrBuilder>(
                 getFateId(),
                 getParentForChildren(),
                 isClean());
@@ -2089,12 +2089,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:tabletserver.PExternalCompactionJob)
-  private static final org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -2130,7 +2130,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionJobOrBuilder.java
similarity index 87%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionJobOrBuilder.java
index 6fe3ea2e227..0efc29627b4 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionJobOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionJobOrBuilder.java
@@ -20,7 +20,7 @@
 // source: tabletserver.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface PExternalCompactionJobOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tabletserver.PExternalCompactionJob)
@@ -52,21 +52,21 @@ public interface PExternalCompactionJobOrBuilder extends
    * optional .data.PKeyExtent extent = 2;
    * @return The extent.
    */
-  org.apache.accumulo.core.compaction.protobuf.PKeyExtent getExtent();
+  org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getExtent();
   /**
    * optional .data.PKeyExtent extent = 2;
    */
-  org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder getExtentOrBuilder();
 
   /**
    * repeated .tabletserver.PInputFile files = 3;
    */
-  java.util.List 
+  java.util.List 
       getFilesList();
   /**
    * repeated .tabletserver.PInputFile files = 3;
    */
-  org.apache.accumulo.core.compaction.protobuf.PInputFile getFiles(int index);
+  org.apache.accumulo.grpc.compaction.protobuf.PInputFile getFiles(int index);
   /**
    * repeated .tabletserver.PInputFile files = 3;
    */
@@ -74,12 +74,12 @@ public interface PExternalCompactionJobOrBuilder extends
   /**
    * repeated .tabletserver.PInputFile files = 3;
    */
-  java.util.List 
+  java.util.List 
       getFilesOrBuilderList();
   /**
    * repeated .tabletserver.PInputFile files = 3;
    */
-  org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder(
+  org.apache.accumulo.grpc.compaction.protobuf.PInputFileOrBuilder getFilesOrBuilder(
       int index);
 
   /**
@@ -91,11 +91,11 @@ org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuild
    * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
    * @return The iteratorSettings.
    */
-  org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getIteratorSettings();
+  org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig getIteratorSettings();
   /**
    * optional .tabletserver.PIteratorConfig iteratorSettings = 4;
    */
-  org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfigOrBuilder getIteratorSettingsOrBuilder();
 
   /**
    * optional string outputFile = 5;
@@ -139,7 +139,7 @@ org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuild
    * optional .tabletserver.PCompactionKind kind = 7;
    * @return The kind.
    */
-  org.apache.accumulo.core.compaction.protobuf.PCompactionKind getKind();
+  org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind getKind();
 
   /**
    * optional .manager.PFateId fateId = 8;
@@ -150,11 +150,11 @@ org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder getFilesOrBuild
    * optional .manager.PFateId fateId = 8;
    * @return The fateId.
    */
-  org.apache.accumulo.core.compaction.protobuf.PFateId getFateId();
+  org.apache.accumulo.grpc.compaction.protobuf.PFateId getFateId();
   /**
    * optional .manager.PFateId fateId = 8;
    */
-  org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.PFateIdOrBuilder getFateIdOrBuilder();
 
   /**
    * map<string, string> overrides = 9;
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionList.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionList.java
similarity index 79%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionList.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionList.java
index e8416709b77..b9d60ee0fdd 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionList.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionList.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code compaction_coordinator.PExternalCompactionList}
@@ -46,7 +46,7 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
@@ -64,27 +64,27 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList.class, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList.Builder.class);
   }
 
   public static final int COMPACTIONS_FIELD_NUMBER = 1;
   private static final class CompactionsDefaultEntryHolder {
     static final com.google.protobuf.MapEntry<
-        java.lang.String, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction> defaultEntry =
+        java.lang.String, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction> defaultEntry =
             com.google.protobuf.MapEntry
-            .newDefaultInstance(
-                org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_CompactionsEntry_descriptor, 
+            .newDefaultInstance(
+                org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_CompactionsEntry_descriptor, 
                 com.google.protobuf.WireFormat.FieldType.STRING,
                 "",
                 com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.getDefaultInstance());
+                org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.getDefaultInstance());
   }
   @SuppressWarnings("serial")
   private com.google.protobuf.MapField<
-      java.lang.String, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction> compactions_;
-  private com.google.protobuf.MapField
+      java.lang.String, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction> compactions_;
+  private com.google.protobuf.MapField
   internalGetCompactions() {
     if (compactions_ == null) {
       return com.google.protobuf.MapField.emptyMapField(
@@ -109,14 +109,14 @@ public boolean containsCompactions(
    */
   @java.lang.Override
   @java.lang.Deprecated
-  public java.util.Map getCompactions() {
+  public java.util.Map getCompactions() {
     return getCompactionsMap();
   }
   /**
    * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
    */
   @java.lang.Override
-  public java.util.Map getCompactionsMap() {
+  public java.util.Map getCompactionsMap() {
     return internalGetCompactions().getMap();
   }
   /**
@@ -124,12 +124,12 @@ public java.util.Map map =
+    java.util.Map map =
         internalGetCompactions().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
@@ -137,10 +137,10 @@ org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getCompactionsO
    * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getCompactionsOrThrow(
+  public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction getCompactionsOrThrow(
       java.lang.String key) {
     if (key == null) { throw new NullPointerException("map key"); }
-    java.util.Map map =
+    java.util.Map map =
         internalGetCompactions().getMap();
     if (!map.containsKey(key)) {
       throw new java.lang.IllegalArgumentException();
@@ -177,9 +177,9 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    for (java.util.Map.Entry entry
+    for (java.util.Map.Entry entry
          : internalGetCompactions().getMap().entrySet()) {
-      com.google.protobuf.MapEntry
+      com.google.protobuf.MapEntry
       compactions__ = CompactionsDefaultEntryHolder.defaultEntry.newBuilderForType()
           .setKey(entry.getKey())
           .setValue(entry.getValue())
@@ -197,10 +197,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList other = (org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList other = (org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList) obj;
 
     if (!internalGetCompactions().equals(
         other.internalGetCompactions())) return false;
@@ -224,44 +224,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -269,26 +269,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionLi
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -301,7 +301,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionLi
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -322,10 +322,10 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:compaction_coordinator.PExternalCompactionList)
-      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionListOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionListOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -353,12 +353,12 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.class, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList.class, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList.newBuilder()
     private Builder() {
 
     }
@@ -379,17 +379,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PExternalCompactionList_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList build() {
-      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList build() {
+      org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -397,14 +397,14 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList buil
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList result = new org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList result = new org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.compactions_ = internalGetCompactions().build(CompactionsDefaultEntryHolder.defaultEntry);
@@ -445,16 +445,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList.getDefaultInstance()) return this;
       internalGetMutableCompactions().mergeFrom(
           other.internalGetCompactions());
       bitField0_ |= 0x00000001;
@@ -485,7 +485,7 @@ public Builder mergeFrom(
               done = true;
               break;
             case 10: {
-              com.google.protobuf.MapEntry
+              com.google.protobuf.MapEntry
               compactions__ = input.readMessage(
                   CompactionsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
               internalGetMutableCompactions().ensureBuilderMap().put(
@@ -510,30 +510,30 @@ public Builder mergeFrom(
     }
     private int bitField0_;
 
-    private static final class CompactionsConverter implements com.google.protobuf.MapFieldBuilder.Converter {
+    private static final class CompactionsConverter implements com.google.protobuf.MapFieldBuilder.Converter {
       @java.lang.Override
-      public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction build(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionOrBuilder val) {
-        if (val instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) { return (org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) val; }
-        return ((org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder) val).build();
+      public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction build(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionOrBuilder val) {
+        if (val instanceof org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction) { return (org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction) val; }
+        return ((org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.Builder) val).build();
       }
 
       @java.lang.Override
-      public com.google.protobuf.MapEntry defaultEntry() {
+      public com.google.protobuf.MapEntry defaultEntry() {
         return CompactionsDefaultEntryHolder.defaultEntry;
       }
     };
     private static final CompactionsConverter compactionsConverter = new CompactionsConverter();
 
     private com.google.protobuf.MapFieldBuilder<
-        java.lang.String, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionOrBuilder, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction, org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder> compactions_;
-    private com.google.protobuf.MapFieldBuilder
+        java.lang.String, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionOrBuilder, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.Builder> compactions_;
+    private com.google.protobuf.MapFieldBuilder
         internalGetCompactions() {
       if (compactions_ == null) {
         return new com.google.protobuf.MapFieldBuilder<>(compactionsConverter);
       }
       return compactions_;
     }
-    private com.google.protobuf.MapFieldBuilder
+    private com.google.protobuf.MapFieldBuilder
         internalGetMutableCompactions() {
       if (compactions_ == null) {
         compactions_ = new com.google.protobuf.MapFieldBuilder<>(compactionsConverter);
@@ -559,14 +559,14 @@ public boolean containsCompactions(
      */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map getCompactions() {
+    public java.util.Map getCompactions() {
       return getCompactionsMap();
     }
     /**
      * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
      */
     @java.lang.Override
-    public java.util.Map getCompactionsMap() {
+    public java.util.Map getCompactionsMap() {
       return internalGetCompactions().getImmutableMap();
     }
     /**
@@ -574,22 +574,22 @@ public java.util.Map map = internalGetMutableCompactions().ensureBuilderMap();
+      java.util.Map map = internalGetMutableCompactions().ensureBuilderMap();
       return map.containsKey(key) ? compactionsConverter.build(map.get(key)) : defaultValue;
     }
     /**
      * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
      */
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getCompactionsOrThrow(
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction getCompactionsOrThrow(
         java.lang.String key) {
       if (key == null) { throw new NullPointerException("map key"); }
-      java.util.Map map = internalGetMutableCompactions().ensureBuilderMap();
+      java.util.Map map = internalGetMutableCompactions().ensureBuilderMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
@@ -614,7 +614,7 @@ public Builder removeCompactions(
      * Use alternate mutation accessors instead.
      */
     @java.lang.Deprecated
-    public java.util.Map
+    public java.util.Map
         getMutableCompactions() {
       bitField0_ |= 0x00000001;
       return internalGetMutableCompactions().ensureMessageMap();
@@ -624,7 +624,7 @@ public Builder removeCompactions(
      */
     public Builder putCompactions(
         java.lang.String key,
-        org.apache.accumulo.core.compaction.protobuf.PExternalCompaction value) {
+        org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction value) {
       if (key == null) { throw new NullPointerException("map key"); }
       if (value == null) { throw new NullPointerException("map value"); }
       internalGetMutableCompactions().ensureBuilderMap()
@@ -636,8 +636,8 @@ public Builder putCompactions(
      * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
      */
     public Builder putAllCompactions(
-        java.util.Map values) {
-      for (java.util.Map.Entry e : values.entrySet()) {
+        java.util.Map values) {
+      for (java.util.Map.Entry e : values.entrySet()) {
         if (e.getKey() == null || e.getValue() == null) {
           throw new NullPointerException();
         }
@@ -650,19 +650,19 @@ public Builder putAllCompactions(
     /**
      * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder putCompactionsBuilderIfAbsent(
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.Builder putCompactionsBuilderIfAbsent(
         java.lang.String key) {
-      java.util.Map builderMap = internalGetMutableCompactions().ensureBuilderMap();
-      org.apache.accumulo.core.compaction.protobuf.PExternalCompactionOrBuilder entry = builderMap.get(key);
+      java.util.Map builderMap = internalGetMutableCompactions().ensureBuilderMap();
+      org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionOrBuilder entry = builderMap.get(key);
       if (entry == null) {
-        entry = org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.newBuilder();
+        entry = org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.newBuilder();
         builderMap.put(key, entry);
       }
-      if (entry instanceof org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) {
-        entry = ((org.apache.accumulo.core.compaction.protobuf.PExternalCompaction) entry).toBuilder();
+      if (entry instanceof org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction) {
+        entry = ((org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction) entry).toBuilder();
         builderMap.put(key, entry);
       }
-      return (org.apache.accumulo.core.compaction.protobuf.PExternalCompaction.Builder) entry;
+      return (org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction.Builder) entry;
     }
     @java.lang.Override
     public final Builder setUnknownFields(
@@ -681,12 +681,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:compaction_coordinator.PExternalCompactionList)
-  private static final org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -722,7 +722,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionListOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionListOrBuilder.java
similarity index 85%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionListOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionListOrBuilder.java
index bb33906395d..d806142828e 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionListOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionListOrBuilder.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface PExternalCompactionListOrBuilder extends
     // @@protoc_insertion_point(interface_extends:compaction_coordinator.PExternalCompactionList)
@@ -39,24 +39,24 @@ boolean containsCompactions(
    * Use {@link #getCompactionsMap()} instead.
    */
   @java.lang.Deprecated
-  java.util.Map
+  java.util.Map
   getCompactions();
   /**
    * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
    */
-  java.util.Map
+  java.util.Map
   getCompactionsMap();
   /**
    * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
    */
   /* nullable */
-org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getCompactionsOrDefault(
+org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction getCompactionsOrDefault(
       java.lang.String key,
       /* nullable */
-org.apache.accumulo.core.compaction.protobuf.PExternalCompaction defaultValue);
+org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction defaultValue);
   /**
    * map<string, .compaction_coordinator.PExternalCompaction> compactions = 1;
    */
-  org.apache.accumulo.core.compaction.protobuf.PExternalCompaction getCompactionsOrThrow(
+  org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction getCompactionsOrThrow(
       java.lang.String key);
 }
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionOrBuilder.java
similarity index 85%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionOrBuilder.java
index 6df25a86aeb..445cfef6259 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PExternalCompactionOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PExternalCompactionOrBuilder.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface PExternalCompactionOrBuilder extends
     // @@protoc_insertion_point(interface_extends:compaction_coordinator.PExternalCompaction)
@@ -63,25 +63,25 @@ boolean containsUpdates(
    * Use {@link #getUpdatesMap()} instead.
    */
   @java.lang.Deprecated
-  java.util.Map
+  java.util.Map
   getUpdates();
   /**
    * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
    */
-  java.util.Map
+  java.util.Map
   getUpdatesMap();
   /**
    * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
    */
   /* nullable */
-org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrDefault(
+org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrDefault(
       long key,
       /* nullable */
-org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate defaultValue);
+org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate defaultValue);
   /**
    * map<int64, .compaction_coordinator.PCompactionStatusUpdate> updates = 3;
    */
-  org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrThrow(
+  org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate getUpdatesOrThrow(
       long key);
 
   /**
@@ -93,9 +93,9 @@ org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getUpdatesO
    * .tabletserver.PExternalCompactionJob job = 4;
    * @return The job.
    */
-  org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob();
+  org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob getJob();
   /**
    * .tabletserver.PExternalCompactionJob job = 4;
    */
-  org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder();
 }
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PFateId.java
similarity index 84%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PFateId.java
index 9afa2d524de..e24f32b3204 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateId.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PFateId.java
@@ -20,7 +20,7 @@
 // source: manager.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code manager.PFateId}
@@ -48,15 +48,15 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.PFateId.class, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.PFateId.class, org.apache.accumulo.grpc.compaction.protobuf.PFateId.Builder.class);
   }
 
   public static final int TYPE_FIELD_NUMBER = 1;
@@ -72,9 +72,9 @@ protected java.lang.Object newInstance(
    * .manager.PFateInstanceType type = 1;
    * @return The type.
    */
-  @java.lang.Override public org.apache.accumulo.core.compaction.protobuf.PFateInstanceType getType() {
-    org.apache.accumulo.core.compaction.protobuf.PFateInstanceType result = org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.forNumber(type_);
-    return result == null ? org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.UNRECOGNIZED : result;
+  @java.lang.Override public org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType getType() {
+    org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType result = org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType.forNumber(type_);
+    return result == null ? org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType.UNRECOGNIZED : result;
   }
 
   public static final int TXUUIDSTR_FIELD_NUMBER = 2;
@@ -130,7 +130,7 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (type_ != org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.UNKNOWN.getNumber()) {
+    if (type_ != org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType.UNKNOWN.getNumber()) {
       output.writeEnum(1, type_);
     }
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(txUUIDStr_)) {
@@ -145,7 +145,7 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (type_ != org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.UNKNOWN.getNumber()) {
+    if (type_ != org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType.UNKNOWN.getNumber()) {
       size += com.google.protobuf.CodedOutputStream
         .computeEnumSize(1, type_);
     }
@@ -162,10 +162,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PFateId)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PFateId)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.PFateId other = (org.apache.accumulo.core.compaction.protobuf.PFateId) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.PFateId other = (org.apache.accumulo.grpc.compaction.protobuf.PFateId) obj;
 
     if (type_ != other.type_) return false;
     if (!getTxUUIDStr()
@@ -190,44 +190,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -235,26 +235,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -267,7 +267,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PFateId parseFrom(
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PFateId prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PFateId prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -288,21 +288,21 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:manager.PFateId)
-      org.apache.accumulo.core.compaction.protobuf.PFateIdOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.PFateIdOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.PFateId.class, org.apache.accumulo.core.compaction.protobuf.PFateId.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.PFateId.class, org.apache.accumulo.grpc.compaction.protobuf.PFateId.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.PFateId.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.PFateId.newBuilder()
     private Builder() {
 
     }
@@ -324,17 +324,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.ManagerProto.internal_static_manager_PFateId_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PFateId getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.PFateId getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.PFateId.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PFateId build() {
-      org.apache.accumulo.core.compaction.protobuf.PFateId result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.PFateId build() {
+      org.apache.accumulo.grpc.compaction.protobuf.PFateId result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -342,14 +342,14 @@ public org.apache.accumulo.core.compaction.protobuf.PFateId build() {
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PFateId buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.PFateId result = new org.apache.accumulo.core.compaction.protobuf.PFateId(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.PFateId buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.PFateId result = new org.apache.accumulo.grpc.compaction.protobuf.PFateId(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PFateId result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PFateId result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.type_ = type_;
@@ -393,16 +393,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PFateId) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PFateId)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PFateId) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PFateId)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PFateId other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.PFateId.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PFateId other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.PFateId.getDefaultInstance()) return this;
       if (other.type_ != 0) {
         setTypeValue(other.getTypeValue());
       }
@@ -488,16 +488,16 @@ public Builder setTypeValue(int value) {
      * @return The type.
      */
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PFateInstanceType getType() {
-      org.apache.accumulo.core.compaction.protobuf.PFateInstanceType result = org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.forNumber(type_);
-      return result == null ? org.apache.accumulo.core.compaction.protobuf.PFateInstanceType.UNRECOGNIZED : result;
+    public org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType getType() {
+      org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType result = org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType.forNumber(type_);
+      return result == null ? org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType.UNRECOGNIZED : result;
     }
     /**
      * .manager.PFateInstanceType type = 1;
      * @param value The type to set.
      * @return This builder for chaining.
      */
-    public Builder setType(org.apache.accumulo.core.compaction.protobuf.PFateInstanceType value) {
+    public Builder setType(org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType value) {
       if (value == null) {
         throw new NullPointerException();
       }
@@ -605,12 +605,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:manager.PFateId)
-  private static final org.apache.accumulo.core.compaction.protobuf.PFateId DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.PFateId DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PFateId();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PFateId();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PFateId getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.PFateId getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -646,7 +646,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PFateId getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.PFateId getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PFateIdOrBuilder.java
similarity index 93%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PFateIdOrBuilder.java
index 4b7ab2322a9..728fd610068 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateIdOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PFateIdOrBuilder.java
@@ -20,7 +20,7 @@
 // source: manager.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface PFateIdOrBuilder extends
     // @@protoc_insertion_point(interface_extends:manager.PFateId)
@@ -35,7 +35,7 @@ public interface PFateIdOrBuilder extends
    * .manager.PFateInstanceType type = 1;
    * @return The type.
    */
-  org.apache.accumulo.core.compaction.protobuf.PFateInstanceType getType();
+  org.apache.accumulo.grpc.compaction.protobuf.PFateInstanceType getType();
 
   /**
    * string txUUIDStr = 2;
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PFateInstanceType.java
similarity index 97%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PFateInstanceType.java
index 8e296d7c03d..2b825e42259 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PFateInstanceType.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PFateInstanceType.java
@@ -20,7 +20,7 @@
 // source: manager.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf enum {@code manager.PFateInstanceType}
@@ -113,7 +113,7 @@ public PFateInstanceType findValueByNumber(int number) {
   }
   public static final com.google.protobuf.Descriptors.EnumDescriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.ManagerProto.getDescriptor().getEnumTypes().get(0);
+    return org.apache.accumulo.grpc.compaction.protobuf.ManagerProto.getDescriptor().getEnumTypes().get(0);
   }
 
   private static final PFateInstanceType[] VALUES = values();
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PInputFile.java
similarity index 89%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PInputFile.java
index f9e404ec540..5e432c632bc 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFile.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PInputFile.java
@@ -20,7 +20,7 @@
 // source: tabletserver.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code tabletserver.PInputFile}
@@ -47,15 +47,15 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.PInputFile.class, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.PInputFile.class, org.apache.accumulo.grpc.compaction.protobuf.PInputFile.Builder.class);
   }
 
   public static final int METADATAFILEENTRY_FIELD_NUMBER = 1;
@@ -200,10 +200,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PInputFile)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PInputFile)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.PInputFile other = (org.apache.accumulo.core.compaction.protobuf.PInputFile) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.PInputFile other = (org.apache.accumulo.grpc.compaction.protobuf.PInputFile) obj;
 
     if (!getMetadataFileEntry()
         .equals(other.getMetadataFileEntry())) return false;
@@ -240,44 +240,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -285,26 +285,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -317,7 +317,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PInputFile parseFrom(
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PInputFile prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PInputFile prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -338,21 +338,21 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:tabletserver.PInputFile)
-      org.apache.accumulo.core.compaction.protobuf.PInputFileOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.PInputFileOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.PInputFile.class, org.apache.accumulo.core.compaction.protobuf.PInputFile.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.PInputFile.class, org.apache.accumulo.grpc.compaction.protobuf.PInputFile.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.PInputFile.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.PInputFile.newBuilder()
     private Builder() {
 
     }
@@ -376,17 +376,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PInputFile_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PInputFile getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.PInputFile getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.PInputFile.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PInputFile build() {
-      org.apache.accumulo.core.compaction.protobuf.PInputFile result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.PInputFile build() {
+      org.apache.accumulo.grpc.compaction.protobuf.PInputFile result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -394,14 +394,14 @@ public org.apache.accumulo.core.compaction.protobuf.PInputFile build() {
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PInputFile buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.PInputFile result = new org.apache.accumulo.core.compaction.protobuf.PInputFile(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.PInputFile buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.PInputFile result = new org.apache.accumulo.grpc.compaction.protobuf.PInputFile(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PInputFile result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PInputFile result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.metadataFileEntry_ = metadataFileEntry_;
@@ -451,16 +451,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PInputFile) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PInputFile)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PInputFile) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PInputFile)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PInputFile other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.PInputFile.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PInputFile other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.PInputFile.getDefaultInstance()) return this;
       if (!other.getMetadataFileEntry().isEmpty()) {
         metadataFileEntry_ = other.metadataFileEntry_;
         bitField0_ |= 0x00000001;
@@ -747,12 +747,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:tabletserver.PInputFile)
-  private static final org.apache.accumulo.core.compaction.protobuf.PInputFile DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.PInputFile DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PInputFile();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PInputFile();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PInputFile getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.PInputFile getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -788,7 +788,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PInputFile getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.PInputFile getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PInputFileOrBuilder.java
similarity index 97%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PInputFileOrBuilder.java
index 796a255620e..75f9129462d 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PInputFileOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PInputFileOrBuilder.java
@@ -20,7 +20,7 @@
 // source: tabletserver.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface PInputFileOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tabletserver.PInputFile)
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorConfig.java
similarity index 82%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorConfig.java
index 7c55dfb48dd..fa4af3ad349 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfig.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorConfig.java
@@ -20,7 +20,7 @@
 // source: tabletserver.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code tabletserver.PIteratorConfig}
@@ -47,32 +47,32 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.class, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.class, org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.Builder.class);
   }
 
   public static final int ITERATORS_FIELD_NUMBER = 1;
   @SuppressWarnings("serial")
-  private java.util.List iterators_;
+  private java.util.List iterators_;
   /**
    * repeated .tabletserver.PIteratorSetting iterators = 1;
    */
   @java.lang.Override
-  public java.util.List getIteratorsList() {
+  public java.util.List getIteratorsList() {
     return iterators_;
   }
   /**
    * repeated .tabletserver.PIteratorSetting iterators = 1;
    */
   @java.lang.Override
-  public java.util.List 
+  public java.util.List 
       getIteratorsOrBuilderList() {
     return iterators_;
   }
@@ -87,14 +87,14 @@ public int getIteratorsCount() {
    * repeated .tabletserver.PIteratorSetting iterators = 1;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index) {
+  public org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting getIterators(int index) {
     return iterators_.get(index);
   }
   /**
    * repeated .tabletserver.PIteratorSetting iterators = 1;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder(
+  public org.apache.accumulo.grpc.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder(
       int index) {
     return iterators_.get(index);
   }
@@ -139,10 +139,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PIteratorConfig)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.PIteratorConfig other = (org.apache.accumulo.core.compaction.protobuf.PIteratorConfig) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig other = (org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig) obj;
 
     if (!getIteratorsList()
         .equals(other.getIteratorsList())) return false;
@@ -166,44 +166,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -211,26 +211,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -243,7 +243,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig parse
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -264,21 +264,21 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:tabletserver.PIteratorConfig)
-      org.apache.accumulo.core.compaction.protobuf.PIteratorConfigOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfigOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.class, org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.class, org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.newBuilder()
     private Builder() {
 
     }
@@ -305,17 +305,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorConfig_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig build() {
-      org.apache.accumulo.core.compaction.protobuf.PIteratorConfig result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig build() {
+      org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -323,15 +323,15 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig build() {
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.PIteratorConfig result = new org.apache.accumulo.core.compaction.protobuf.PIteratorConfig(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig result = new org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig(this);
       buildPartialRepeatedFields(result);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartialRepeatedFields(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig result) {
+    private void buildPartialRepeatedFields(org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig result) {
       if (iteratorsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
           iterators_ = java.util.Collections.unmodifiableList(iterators_);
@@ -343,7 +343,7 @@ private void buildPartialRepeatedFields(org.apache.accumulo.core.compaction.prot
       }
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig result) {
       int from_bitField0_ = bitField0_;
     }
 
@@ -381,16 +381,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PIteratorConfig) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PIteratorConfig)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PIteratorConfig other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.PIteratorConfig.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig.getDefaultInstance()) return this;
       if (iteratorsBuilder_ == null) {
         if (!other.iterators_.isEmpty()) {
           if (iterators_.isEmpty()) {
@@ -444,9 +444,9 @@ public Builder mergeFrom(
               done = true;
               break;
             case 10: {
-              org.apache.accumulo.core.compaction.protobuf.PIteratorSetting m =
+              org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting m =
                   input.readMessage(
-                      org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.parser(),
+                      org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.parser(),
                       extensionRegistry);
               if (iteratorsBuilder_ == null) {
                 ensureIteratorsIsMutable();
@@ -473,22 +473,22 @@ public Builder mergeFrom(
     }
     private int bitField0_;
 
-    private java.util.List iterators_ =
+    private java.util.List iterators_ =
       java.util.Collections.emptyList();
     private void ensureIteratorsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        iterators_ = new java.util.ArrayList(iterators_);
+        iterators_ = new java.util.ArrayList(iterators_);
         bitField0_ |= 0x00000001;
        }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PIteratorSetting, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder> iteratorsBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.Builder, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSettingOrBuilder> iteratorsBuilder_;
 
     /**
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
-    public java.util.List getIteratorsList() {
+    public java.util.List getIteratorsList() {
       if (iteratorsBuilder_ == null) {
         return java.util.Collections.unmodifiableList(iterators_);
       } else {
@@ -508,7 +508,7 @@ public int getIteratorsCount() {
     /**
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index) {
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting getIterators(int index) {
       if (iteratorsBuilder_ == null) {
         return iterators_.get(index);
       } else {
@@ -519,7 +519,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterator
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
     public Builder setIterators(
-        int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) {
+        int index, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting value) {
       if (iteratorsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -536,7 +536,7 @@ public Builder setIterators(
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
     public Builder setIterators(
-        int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) {
+        int index, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.Builder builderForValue) {
       if (iteratorsBuilder_ == null) {
         ensureIteratorsIsMutable();
         iterators_.set(index, builderForValue.build());
@@ -549,7 +549,7 @@ public Builder setIterators(
     /**
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
-    public Builder addIterators(org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) {
+    public Builder addIterators(org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting value) {
       if (iteratorsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -566,7 +566,7 @@ public Builder addIterators(org.apache.accumulo.core.compaction.protobuf.PIterat
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
     public Builder addIterators(
-        int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting value) {
+        int index, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting value) {
       if (iteratorsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -583,7 +583,7 @@ public Builder addIterators(
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
     public Builder addIterators(
-        org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.Builder builderForValue) {
       if (iteratorsBuilder_ == null) {
         ensureIteratorsIsMutable();
         iterators_.add(builderForValue.build());
@@ -597,7 +597,7 @@ public Builder addIterators(
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
     public Builder addIterators(
-        int index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder builderForValue) {
+        int index, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.Builder builderForValue) {
       if (iteratorsBuilder_ == null) {
         ensureIteratorsIsMutable();
         iterators_.add(index, builderForValue.build());
@@ -611,7 +611,7 @@ public Builder addIterators(
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
     public Builder addAllIterators(
-        java.lang.Iterable values) {
+        java.lang.Iterable values) {
       if (iteratorsBuilder_ == null) {
         ensureIteratorsIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -651,14 +651,14 @@ public Builder removeIterators(int index) {
     /**
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder getIteratorsBuilder(
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.Builder getIteratorsBuilder(
         int index) {
       return getIteratorsFieldBuilder().getBuilder(index);
     }
     /**
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder(
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder(
         int index) {
       if (iteratorsBuilder_ == null) {
         return iterators_.get(index);  } else {
@@ -668,7 +668,7 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder ge
     /**
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
-    public java.util.List 
+    public java.util.List 
          getIteratorsOrBuilderList() {
       if (iteratorsBuilder_ != null) {
         return iteratorsBuilder_.getMessageOrBuilderList();
@@ -679,31 +679,31 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder ge
     /**
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder addIteratorsBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.Builder addIteratorsBuilder() {
       return getIteratorsFieldBuilder().addBuilder(
-          org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance());
+          org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.getDefaultInstance());
     }
     /**
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder addIteratorsBuilder(
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.Builder addIteratorsBuilder(
         int index) {
       return getIteratorsFieldBuilder().addBuilder(
-          index, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance());
+          index, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.getDefaultInstance());
     }
     /**
      * repeated .tabletserver.PIteratorSetting iterators = 1;
      */
-    public java.util.List 
+    public java.util.List 
          getIteratorsBuilderList() {
       return getIteratorsFieldBuilder().getBuilderList();
     }
     private com.google.protobuf.RepeatedFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PIteratorSetting, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.Builder, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSettingOrBuilder> 
         getIteratorsFieldBuilder() {
       if (iteratorsBuilder_ == null) {
         iteratorsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PIteratorSetting, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder, org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.Builder, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSettingOrBuilder>(
                 iterators_,
                 ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
@@ -729,12 +729,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:tabletserver.PIteratorConfig)
-  private static final org.apache.accumulo.core.compaction.protobuf.PIteratorConfig DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PIteratorConfig();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -770,7 +770,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PIteratorConfig getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorConfigOrBuilder.java
similarity index 84%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorConfigOrBuilder.java
index ed0490419bd..63654e2b8bc 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorConfigOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorConfigOrBuilder.java
@@ -20,7 +20,7 @@
 // source: tabletserver.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface PIteratorConfigOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tabletserver.PIteratorConfig)
@@ -29,12 +29,12 @@ public interface PIteratorConfigOrBuilder extends
   /**
    * repeated .tabletserver.PIteratorSetting iterators = 1;
    */
-  java.util.List 
+  java.util.List 
       getIteratorsList();
   /**
    * repeated .tabletserver.PIteratorSetting iterators = 1;
    */
-  org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getIterators(int index);
+  org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting getIterators(int index);
   /**
    * repeated .tabletserver.PIteratorSetting iterators = 1;
    */
@@ -42,11 +42,11 @@ public interface PIteratorConfigOrBuilder extends
   /**
    * repeated .tabletserver.PIteratorSetting iterators = 1;
    */
-  java.util.List 
+  java.util.List 
       getIteratorsOrBuilderList();
   /**
    * repeated .tabletserver.PIteratorSetting iterators = 1;
    */
-  org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder(
+  org.apache.accumulo.grpc.compaction.protobuf.PIteratorSettingOrBuilder getIteratorsOrBuilder(
       int index);
 }
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorSetting.java
similarity index 92%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorSetting.java
index 2cbddc8bdbc..d9f6ddbb5d7 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSetting.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorSetting.java
@@ -20,7 +20,7 @@
 // source: tabletserver.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code tabletserver.PIteratorSetting}
@@ -48,7 +48,7 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
@@ -66,9 +66,9 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.class, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.class, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.Builder.class);
   }
 
   public static final int PRIORITY_FIELD_NUMBER = 1;
@@ -166,7 +166,7 @@ private static final class PropertiesDefaultEntryHolder {
         java.lang.String, java.lang.String> defaultEntry =
             com.google.protobuf.MapEntry
             .newDefaultInstance(
-                org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_PropertiesEntry_descriptor, 
+                org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_PropertiesEntry_descriptor, 
                 com.google.protobuf.WireFormat.FieldType.STRING,
                 "",
                 com.google.protobuf.WireFormat.FieldType.STRING,
@@ -307,10 +307,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PIteratorSetting)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.PIteratorSetting other = (org.apache.accumulo.core.compaction.protobuf.PIteratorSetting) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting other = (org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting) obj;
 
     if (getPriority()
         != other.getPriority()) return false;
@@ -346,44 +346,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -391,26 +391,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -423,7 +423,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting pars
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PIteratorSetting prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -444,10 +444,10 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:tabletserver.PIteratorSetting)
-      org.apache.accumulo.core.compaction.protobuf.PIteratorSettingOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.PIteratorSettingOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -475,12 +475,12 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.class, org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.class, org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.newBuilder()
     private Builder() {
 
     }
@@ -504,17 +504,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.TabletServerProto.internal_static_tabletserver_PIteratorSetting_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting build() {
-      org.apache.accumulo.core.compaction.protobuf.PIteratorSetting result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting build() {
+      org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -522,14 +522,14 @@ public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting build() {
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.PIteratorSetting result = new org.apache.accumulo.core.compaction.protobuf.PIteratorSetting(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting result = new org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PIteratorSetting result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.priority_ = priority_;
@@ -580,16 +580,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PIteratorSetting) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PIteratorSetting)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PIteratorSetting other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.PIteratorSetting.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting.getDefaultInstance()) return this;
       if (other.getPriority() != 0) {
         setPriority(other.getPriority());
       }
@@ -992,12 +992,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:tabletserver.PIteratorSetting)
-  private static final org.apache.accumulo.core.compaction.protobuf.PIteratorSetting DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PIteratorSetting();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -1033,7 +1033,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PIteratorSetting getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.PIteratorSetting getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorSettingOrBuilder.java
similarity index 97%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorSettingOrBuilder.java
index d91814cf2fb..3b0f568d7f7 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PIteratorSettingOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PIteratorSettingOrBuilder.java
@@ -20,7 +20,7 @@
 // source: tabletserver.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface PIteratorSettingOrBuilder extends
     // @@protoc_insertion_point(interface_extends:tabletserver.PIteratorSetting)
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtent.java
similarity index 88%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtent.java
index 82558ae4d58..bcf1cf28aba 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtent.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtent.java
@@ -20,7 +20,7 @@
 // source: data.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code data.PKeyExtent}
@@ -49,15 +49,15 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.PKeyExtent.class, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.class, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder.class);
   }
 
   private int bitField0_;
@@ -174,10 +174,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PKeyExtent)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.PKeyExtent other = (org.apache.accumulo.core.compaction.protobuf.PKeyExtent) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent other = (org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent) obj;
 
     if (!getTable()
         .equals(other.getTable())) return false;
@@ -217,44 +217,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -262,26 +262,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -294,7 +294,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent parseFrom(
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PKeyExtent prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -315,21 +315,21 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:data.PKeyExtent)
-      org.apache.accumulo.core.compaction.protobuf.PKeyExtentOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.PKeyExtentOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.PKeyExtent.class, org.apache.accumulo.core.compaction.protobuf.PKeyExtent.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.class, org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.PKeyExtent.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.newBuilder()
     private Builder() {
 
     }
@@ -352,17 +352,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.DataProto.internal_static_data_PKeyExtent_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PKeyExtent build() {
-      org.apache.accumulo.core.compaction.protobuf.PKeyExtent result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent build() {
+      org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -370,14 +370,14 @@ public org.apache.accumulo.core.compaction.protobuf.PKeyExtent build() {
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PKeyExtent buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.PKeyExtent result = new org.apache.accumulo.core.compaction.protobuf.PKeyExtent(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent result = new org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PKeyExtent result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.table_ = table_;
@@ -428,16 +428,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PKeyExtent) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PKeyExtent)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PKeyExtent other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.PKeyExtent.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance()) return this;
       if (other.getTable() != com.google.protobuf.ByteString.EMPTY) {
         setTable(other.getTable());
       }
@@ -653,12 +653,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:data.PKeyExtent)
-  private static final org.apache.accumulo.core.compaction.protobuf.PKeyExtent DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PKeyExtent();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PKeyExtent getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -694,7 +694,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PKeyExtent getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtentOrBuilder.java
similarity index 97%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtentOrBuilder.java
index 78057373aab..c85f2049e07 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PKeyExtentOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtentOrBuilder.java
@@ -20,7 +20,7 @@
 // source: data.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface PKeyExtentOrBuilder extends
     // @@protoc_insertion_point(interface_extends:data.PKeyExtent)
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PNextCompactionJob.java
similarity index 82%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PNextCompactionJob.java
index 1c4ab566478..586362f4534 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJob.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PNextCompactionJob.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code compaction_coordinator.PNextCompactionJob}
@@ -46,20 +46,20 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.class, org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob.class, org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob.Builder.class);
   }
 
   private int bitField0_;
   public static final int JOB_FIELD_NUMBER = 1;
-  private org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob job_;
+  private org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob job_;
   /**
    * .tabletserver.PExternalCompactionJob job = 1;
    * @return Whether the job field is set.
@@ -73,15 +73,15 @@ public boolean hasJob() {
    * @return The job.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob() {
-    return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob getJob() {
+    return job_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
   }
   /**
    * .tabletserver.PExternalCompactionJob job = 1;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
-    return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
+    return job_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
   }
 
   public static final int COMPACTORCOUNT_FIELD_NUMBER = 2;
@@ -142,10 +142,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob other = (org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob other = (org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob) obj;
 
     if (hasJob() != other.hasJob()) return false;
     if (hasJob()) {
@@ -176,44 +176,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -221,26 +221,26 @@ public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -253,7 +253,7 @@ public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob pa
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -274,21 +274,21 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:compaction_coordinator.PNextCompactionJob)
-      org.apache.accumulo.core.compaction.protobuf.PNextCompactionJobOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJobOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.class, org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob.class, org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -320,17 +320,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_PNextCompactionJob_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob build() {
-      org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob build() {
+      org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -338,14 +338,14 @@ public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob build() {
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob result = new org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob result = new org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob result) {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -394,16 +394,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob.getDefaultInstance()) return this;
       if (other.hasJob()) {
         mergeJob(other.getJob());
       }
@@ -465,9 +465,9 @@ public Builder mergeFrom(
     }
     private int bitField0_;
 
-    private org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob job_;
+    private org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob job_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder> jobBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder> jobBuilder_;
     /**
      * .tabletserver.PExternalCompactionJob job = 1;
      * @return Whether the job field is set.
@@ -479,9 +479,9 @@ public boolean hasJob() {
      * .tabletserver.PExternalCompactionJob job = 1;
      * @return The job.
      */
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob getJob() {
       if (jobBuilder_ == null) {
-        return job_ == null ? org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+        return job_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
       } else {
         return jobBuilder_.getMessage();
       }
@@ -489,7 +489,7 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJo
     /**
      * .tabletserver.PExternalCompactionJob job = 1;
      */
-    public Builder setJob(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob value) {
+    public Builder setJob(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob value) {
       if (jobBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -506,7 +506,7 @@ public Builder setJob(org.apache.accumulo.core.compaction.protobuf.PExternalComp
      * .tabletserver.PExternalCompactionJob job = 1;
      */
     public Builder setJob(
-        org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder builderForValue) {
       if (jobBuilder_ == null) {
         job_ = builderForValue.build();
       } else {
@@ -519,11 +519,11 @@ public Builder setJob(
     /**
      * .tabletserver.PExternalCompactionJob job = 1;
      */
-    public Builder mergeJob(org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob value) {
+    public Builder mergeJob(org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob value) {
       if (jobBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0) &&
           job_ != null &&
-          job_ != org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance()) {
+          job_ != org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance()) {
           getJobBuilder().mergeFrom(value);
         } else {
           job_ = value;
@@ -553,7 +553,7 @@ public Builder clearJob() {
     /**
      * .tabletserver.PExternalCompactionJob job = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder getJobBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder getJobBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
       return getJobFieldBuilder().getBuilder();
@@ -561,23 +561,23 @@ public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Build
     /**
      * .tabletserver.PExternalCompactionJob job = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder() {
       if (jobBuilder_ != null) {
         return jobBuilder_.getMessageOrBuilder();
       } else {
         return job_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
+            org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.getDefaultInstance() : job_;
       }
     }
     /**
      * .tabletserver.PExternalCompactionJob job = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder> 
         getJobFieldBuilder() {
       if (jobBuilder_ == null) {
         jobBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob.Builder, org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder>(
                 getJob(),
                 getParentForChildren(),
                 isClean());
@@ -634,12 +634,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:compaction_coordinator.PNextCompactionJob)
-  private static final org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -675,7 +675,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PNextCompactionJobOrBuilder.java
similarity index 89%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PNextCompactionJobOrBuilder.java
index 962f3959188..81c7e70b0b3 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/PNextCompactionJobOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PNextCompactionJobOrBuilder.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface PNextCompactionJobOrBuilder extends
     // @@protoc_insertion_point(interface_extends:compaction_coordinator.PNextCompactionJob)
@@ -35,11 +35,11 @@ public interface PNextCompactionJobOrBuilder extends
    * .tabletserver.PExternalCompactionJob job = 1;
    * @return The job.
    */
-  org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob getJob();
+  org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob getJob();
   /**
    * .tabletserver.PExternalCompactionJob job = 1;
    */
-  org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJobOrBuilder getJobOrBuilder();
 
   /**
    * int32 compactorCount = 2;
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfo.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ProtoTInfo.java
similarity index 88%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfo.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ProtoTInfo.java
index bb2256fe673..643b38240d9 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfo.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ProtoTInfo.java
@@ -20,7 +20,7 @@
 // source: client.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code client.ProtoTInfo}
@@ -46,7 +46,7 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
@@ -64,9 +64,9 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.class, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.class, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder.class);
   }
 
   public static final int HEADERS_FIELD_NUMBER = 1;
@@ -75,7 +75,7 @@ private static final class HeadersDefaultEntryHolder {
         java.lang.String, java.lang.String> defaultEntry =
             com.google.protobuf.MapEntry
             .newDefaultInstance(
-                org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_HeadersEntry_descriptor, 
+                org.apache.accumulo.grpc.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_HeadersEntry_descriptor, 
                 com.google.protobuf.WireFormat.FieldType.STRING,
                 "",
                 com.google.protobuf.WireFormat.FieldType.STRING,
@@ -197,10 +197,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.ProtoTInfo)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.ProtoTInfo other = (org.apache.accumulo.core.compaction.protobuf.ProtoTInfo) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo other = (org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo) obj;
 
     if (!internalGetHeaders().equals(
         other.internalGetHeaders())) return false;
@@ -224,44 +224,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -269,26 +269,26 @@ public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -301,7 +301,7 @@ public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo parseFrom(
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -322,10 +322,10 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:client.ProtoTInfo)
-      org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -353,12 +353,12 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFi
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.class, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.class, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.newBuilder()
     private Builder() {
 
     }
@@ -379,17 +379,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.ClientProto.internal_static_client_ProtoTInfo_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo build() {
-      org.apache.accumulo.core.compaction.protobuf.ProtoTInfo result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo build() {
+      org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -397,14 +397,14 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo build() {
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.ProtoTInfo result = new org.apache.accumulo.core.compaction.protobuf.ProtoTInfo(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo result = new org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo result) {
       int from_bitField0_ = bitField0_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
         result.headers_ = internalGetHeaders();
@@ -446,16 +446,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.ProtoTInfo) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.ProtoTInfo)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance()) return this;
       internalGetMutableHeaders().mergeFrom(
           other.internalGetHeaders());
       bitField0_ |= 0x00000001;
@@ -654,12 +654,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:client.ProtoTInfo)
-  private static final org.apache.accumulo.core.compaction.protobuf.ProtoTInfo DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.ProtoTInfo();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -695,7 +695,7 @@ public com.google.protobuf.Parser getParserForType() {
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfoOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ProtoTInfoOrBuilder.java
similarity index 97%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfoOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ProtoTInfoOrBuilder.java
index 6b445c45329..ec28993cdf5 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/ProtoTInfoOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/ProtoTInfoOrBuilder.java
@@ -20,7 +20,7 @@
 // source: client.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface ProtoTInfoOrBuilder extends
     // @@protoc_insertion_point(interface_extends:client.ProtoTInfo)
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/SecurityProto.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/SecurityProto.java
similarity index 96%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/SecurityProto.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/SecurityProto.java
index b74b844a45f..61332b08442 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/SecurityProto.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/SecurityProto.java
@@ -20,7 +20,7 @@
 // source: security.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public final class SecurityProto {
   private SecurityProto() {}
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "sName\030\002 \001(\tH\001\210\001\001\022\022\n\005token\030\003 \001(\014H\002\210\001\001\022\027\n\n" +
       "instanceId\030\004 \001(\tH\003\210\001\001B\014\n\n_principalB\021\n\017_" +
       "tokenClassNameB\010\n\006_tokenB\r\n\013_instanceIdB" +
-      "?\n,org.apache.accumulo.core.compaction.p" +
+      "?\n,org.apache.accumulo.grpc.compaction.p" +
       "rotobufB\rSecurityProtoP\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/TabletServerProto.java
similarity index 96%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/TabletServerProto.java
index 984f8112900..e6d7a160e0c 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/TabletServerProto.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/TabletServerProto.java
@@ -20,7 +20,7 @@
 // source: tabletserver.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public final class TabletServerProto {
   private TabletServerProto() {}
@@ -106,14 +106,14 @@ public static void registerAllExtensions(
       "(\003\022\026\n\016entriesWritten\030\002 \001(\003\022\020\n\010fileSize\030\003" +
       " \001(\003*4\n\017PCompactionKind\022\013\n\007UNKNOWN\020\000\022\n\n\006" +
       "SYSTEM\020\001\022\010\n\004USER\020\002BC\n,org.apache.accumul" +
-      "o.core.compaction.protobufB\021TabletServer" +
+      "o.grpc.compaction.protobufB\021TabletServer" +
       "ProtoP\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          org.apache.accumulo.core.compaction.protobuf.DataProto.getDescriptor(),
-          org.apache.accumulo.core.compaction.protobuf.ManagerProto.getDescriptor(),
+          org.apache.accumulo.grpc.compaction.protobuf.DataProto.getDescriptor(),
+          org.apache.accumulo.grpc.compaction.protobuf.ManagerProto.getDescriptor(),
         });
     internal_static_tabletserver_PExternalCompactionJob_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -157,8 +157,8 @@ public static void registerAllExtensions(
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tabletserver_PCompactionStats_descriptor,
         new java.lang.String[] { "EntriesRead", "EntriesWritten", "FileSize", });
-    org.apache.accumulo.core.compaction.protobuf.DataProto.getDescriptor();
-    org.apache.accumulo.core.compaction.protobuf.ManagerProto.getDescriptor();
+    org.apache.accumulo.grpc.compaction.protobuf.DataProto.getDescriptor();
+    org.apache.accumulo.grpc.compaction.protobuf.ManagerProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequest.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/UpdateCompactionStatusRequest.java
similarity index 83%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequest.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/UpdateCompactionStatusRequest.java
index edecb176f8f..9548791b780 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequest.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/UpdateCompactionStatusRequest.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 /**
  * Protobuf type {@code compaction_coordinator.UpdateCompactionStatusRequest}
@@ -47,20 +47,20 @@ protected java.lang.Object newInstance(
 
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor;
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_fieldAccessorTable
+    return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.class, org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.Builder.class);
+            org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest.class, org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest.Builder.class);
   }
 
   private int bitField0_;
   public static final int PTINFO_FIELD_NUMBER = 1;
-  private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_;
+  private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_;
   /**
    * .client.ProtoTInfo ptinfo = 1;
    * @return Whether the ptinfo field is set.
@@ -74,19 +74,19 @@ public boolean hasPtinfo() {
    * @return The ptinfo.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() {
-    return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+  public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() {
+    return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
   }
   /**
    * .client.ProtoTInfo ptinfo = 1;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
-    return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+  public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
+    return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
   }
 
   public static final int CREDENTIALS_FIELD_NUMBER = 2;
-  private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_;
+  private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_;
   /**
    * .security.PCredentials credentials = 2;
    * @return Whether the credentials field is set.
@@ -100,15 +100,15 @@ public boolean hasCredentials() {
    * @return The credentials.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() {
-    return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() {
+    return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
   }
   /**
    * .security.PCredentials credentials = 2;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
-    return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
+    return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
   }
 
   public static final int EXTERNALCOMPACTIONID_FIELD_NUMBER = 3;
@@ -151,7 +151,7 @@ public java.lang.String getExternalCompactionId() {
   }
 
   public static final int STATUS_FIELD_NUMBER = 4;
-  private org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate status_;
+  private org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate status_;
   /**
    * .compaction_coordinator.PCompactionStatusUpdate status = 4;
    * @return Whether the status field is set.
@@ -165,15 +165,15 @@ public boolean hasStatus() {
    * @return The status.
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getStatus() {
-    return status_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate getStatus() {
+    return status_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
   }
   /**
    * .compaction_coordinator.PCompactionStatusUpdate status = 4;
    */
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder getStatusOrBuilder() {
-    return status_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
+  public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdateOrBuilder getStatusOrBuilder() {
+    return status_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
   }
 
   public static final int TIMESTAMP_FIELD_NUMBER = 5;
@@ -254,10 +254,10 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest)) {
+    if (!(obj instanceof org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest)) {
       return super.equals(obj);
     }
-    org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest other = (org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest) obj;
+    org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest other = (org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest) obj;
 
     if (hasPtinfo() != other.hasPtinfo()) return false;
     if (hasPtinfo()) {
@@ -311,44 +311,44 @@ public int hashCode() {
     return hash;
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(byte[] data)
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -356,26 +356,26 @@ public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatu
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseDelimitedFrom(java.io.InputStream input)
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseDelimitedFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -388,7 +388,7 @@ public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatu
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest prototype) {
+  public static Builder newBuilder(org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   @java.lang.Override
@@ -409,21 +409,21 @@ protected Builder newBuilderForType(
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:compaction_coordinator.UpdateCompactionStatusRequest)
-      org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequestOrBuilder {
+      org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequestOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_fieldAccessorTable
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.class, org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.Builder.class);
+              org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest.class, org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest.Builder.class);
     }
 
-    // Construct using org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.newBuilder()
+    // Construct using org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -468,17 +468,17 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor;
+      return org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceProto.internal_static_compaction_coordinator_UpdateCompactionStatusRequest_descriptor;
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest getDefaultInstanceForType() {
-      return org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.getDefaultInstance();
+    public org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest getDefaultInstanceForType() {
+      return org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest.getDefaultInstance();
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest build() {
-      org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest result = buildPartial();
+    public org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest build() {
+      org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
@@ -486,14 +486,14 @@ public org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusReques
     }
 
     @java.lang.Override
-    public org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest buildPartial() {
-      org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest result = new org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest(this);
+    public org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest buildPartial() {
+      org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest result = new org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest result) {
+    private void buildPartial0(org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest result) {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -557,16 +557,16 @@ public Builder addRepeatedField(
     }
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest) {
-        return mergeFrom((org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest)other);
+      if (other instanceof org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest) {
+        return mergeFrom((org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest other) {
-      if (other == org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest other) {
+      if (other == org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest.getDefaultInstance()) return this;
       if (other.hasPtinfo()) {
         mergePtinfo(other.getPtinfo());
       }
@@ -658,9 +658,9 @@ public Builder mergeFrom(
     }
     private int bitField0_;
 
-    private org.apache.accumulo.core.compaction.protobuf.ProtoTInfo ptinfo_;
+    private org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo ptinfo_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> ptinfoBuilder_;
     /**
      * .client.ProtoTInfo ptinfo = 1;
      * @return Whether the ptinfo field is set.
@@ -672,9 +672,9 @@ public boolean hasPtinfo() {
      * .client.ProtoTInfo ptinfo = 1;
      * @return The ptinfo.
      */
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() {
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo() {
       if (ptinfoBuilder_ == null) {
-        return ptinfo_ == null ? org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+        return ptinfo_ == null ? org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
       } else {
         return ptinfoBuilder_.getMessage();
       }
@@ -682,7 +682,7 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo() {
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) {
+    public Builder setPtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) {
       if (ptinfoBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -699,7 +699,7 @@ public Builder setPtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo
      * .client.ProtoTInfo ptinfo = 1;
      */
     public Builder setPtinfo(
-        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder builderForValue) {
       if (ptinfoBuilder_ == null) {
         ptinfo_ = builderForValue.build();
       } else {
@@ -712,11 +712,11 @@ public Builder setPtinfo(
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public Builder mergePtinfo(org.apache.accumulo.core.compaction.protobuf.ProtoTInfo value) {
+    public Builder mergePtinfo(org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo value) {
       if (ptinfoBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0) &&
           ptinfo_ != null &&
-          ptinfo_ != org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance()) {
+          ptinfo_ != org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance()) {
           getPtinfoBuilder().mergeFrom(value);
         } else {
           ptinfo_ = value;
@@ -746,7 +746,7 @@ public Builder clearPtinfo() {
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder getPtinfoBuilder() {
       bitField0_ |= 0x00000001;
       onChanged();
       return getPtinfoFieldBuilder().getBuilder();
@@ -754,23 +754,23 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder getPtinfo
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
-    public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder() {
       if (ptinfoBuilder_ != null) {
         return ptinfoBuilder_.getMessageOrBuilder();
       } else {
         return ptinfo_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
+            org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.getDefaultInstance() : ptinfo_;
       }
     }
     /**
      * .client.ProtoTInfo ptinfo = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder> 
         getPtinfoFieldBuilder() {
       if (ptinfoBuilder_ == null) {
         ptinfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.ProtoTInfo, org.apache.accumulo.core.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo.Builder, org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder>(
                 getPtinfo(),
                 getParentForChildren(),
                 isClean());
@@ -779,9 +779,9 @@ public org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinf
       return ptinfoBuilder_;
     }
 
-    private org.apache.accumulo.core.compaction.protobuf.PCredentials credentials_;
+    private org.apache.accumulo.grpc.compaction.protobuf.PCredentials credentials_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> credentialsBuilder_;
     /**
      * .security.PCredentials credentials = 2;
      * @return Whether the credentials field is set.
@@ -793,9 +793,9 @@ public boolean hasCredentials() {
      * .security.PCredentials credentials = 2;
      * @return The credentials.
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials() {
       if (credentialsBuilder_ == null) {
-        return credentials_ == null ? org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+        return credentials_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
       } else {
         return credentialsBuilder_.getMessage();
       }
@@ -803,7 +803,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials(
     /**
      * .security.PCredentials credentials = 2;
      */
-    public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) {
+    public Builder setCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) {
       if (credentialsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -820,7 +820,7 @@ public Builder setCredentials(org.apache.accumulo.core.compaction.protobuf.PCred
      * .security.PCredentials credentials = 2;
      */
     public Builder setCredentials(
-        org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder builderForValue) {
       if (credentialsBuilder_ == null) {
         credentials_ = builderForValue.build();
       } else {
@@ -833,11 +833,11 @@ public Builder setCredentials(
     /**
      * .security.PCredentials credentials = 2;
      */
-    public Builder mergeCredentials(org.apache.accumulo.core.compaction.protobuf.PCredentials value) {
+    public Builder mergeCredentials(org.apache.accumulo.grpc.compaction.protobuf.PCredentials value) {
       if (credentialsBuilder_ == null) {
         if (((bitField0_ & 0x00000002) != 0) &&
           credentials_ != null &&
-          credentials_ != org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance()) {
+          credentials_ != org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance()) {
           getCredentialsBuilder().mergeFrom(value);
         } else {
           credentials_ = value;
@@ -867,7 +867,7 @@ public Builder clearCredentials() {
     /**
      * .security.PCredentials credentials = 2;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder getCredentialsBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
       return getCredentialsFieldBuilder().getBuilder();
@@ -875,23 +875,23 @@ public org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder getCred
     /**
      * .security.PCredentials credentials = 2;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder() {
       if (credentialsBuilder_ != null) {
         return credentialsBuilder_.getMessageOrBuilder();
       } else {
         return credentials_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
+            org.apache.accumulo.grpc.compaction.protobuf.PCredentials.getDefaultInstance() : credentials_;
       }
     }
     /**
      * .security.PCredentials credentials = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder> 
         getCredentialsFieldBuilder() {
       if (credentialsBuilder_ == null) {
         credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PCredentials, org.apache.accumulo.core.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PCredentials, org.apache.accumulo.grpc.compaction.protobuf.PCredentials.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder>(
                 getCredentials(),
                 getParentForChildren(),
                 isClean());
@@ -972,9 +972,9 @@ public Builder setExternalCompactionIdBytes(
       return this;
     }
 
-    private org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate status_;
+    private org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate status_;
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder> statusBuilder_;
+        org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdateOrBuilder> statusBuilder_;
     /**
      * .compaction_coordinator.PCompactionStatusUpdate status = 4;
      * @return Whether the status field is set.
@@ -986,9 +986,9 @@ public boolean hasStatus() {
      * .compaction_coordinator.PCompactionStatusUpdate status = 4;
      * @return The status.
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getStatus() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate getStatus() {
       if (statusBuilder_ == null) {
-        return status_ == null ? org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
+        return status_ == null ? org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
       } else {
         return statusBuilder_.getMessage();
       }
@@ -996,7 +996,7 @@ public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getS
     /**
      * .compaction_coordinator.PCompactionStatusUpdate status = 4;
      */
-    public Builder setStatus(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate value) {
+    public Builder setStatus(org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate value) {
       if (statusBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1013,7 +1013,7 @@ public Builder setStatus(org.apache.accumulo.core.compaction.protobuf.PCompactio
      * .compaction_coordinator.PCompactionStatusUpdate status = 4;
      */
     public Builder setStatus(
-        org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder builderForValue) {
+        org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.Builder builderForValue) {
       if (statusBuilder_ == null) {
         status_ = builderForValue.build();
       } else {
@@ -1026,11 +1026,11 @@ public Builder setStatus(
     /**
      * .compaction_coordinator.PCompactionStatusUpdate status = 4;
      */
-    public Builder mergeStatus(org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate value) {
+    public Builder mergeStatus(org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate value) {
       if (statusBuilder_ == null) {
         if (((bitField0_ & 0x00000008) != 0) &&
           status_ != null &&
-          status_ != org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance()) {
+          status_ != org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance()) {
           getStatusBuilder().mergeFrom(value);
         } else {
           status_ = value;
@@ -1060,7 +1060,7 @@ public Builder clearStatus() {
     /**
      * .compaction_coordinator.PCompactionStatusUpdate status = 4;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder getStatusBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.Builder getStatusBuilder() {
       bitField0_ |= 0x00000008;
       onChanged();
       return getStatusFieldBuilder().getBuilder();
@@ -1068,23 +1068,23 @@ public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Buil
     /**
      * .compaction_coordinator.PCompactionStatusUpdate status = 4;
      */
-    public org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder getStatusOrBuilder() {
+    public org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdateOrBuilder getStatusOrBuilder() {
       if (statusBuilder_ != null) {
         return statusBuilder_.getMessageOrBuilder();
       } else {
         return status_ == null ?
-            org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
+            org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.getDefaultInstance() : status_;
       }
     }
     /**
      * .compaction_coordinator.PCompactionStatusUpdate status = 4;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder> 
+        org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdateOrBuilder> 
         getStatusFieldBuilder() {
       if (statusBuilder_ == null) {
         statusBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate.Builder, org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder>(
+            org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate.Builder, org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdateOrBuilder>(
                 getStatus(),
                 getParentForChildren(),
                 isClean());
@@ -1141,12 +1141,12 @@ public final Builder mergeUnknownFields(
   }
 
   // @@protoc_insertion_point(class_scope:compaction_coordinator.UpdateCompactionStatusRequest)
-  private static final org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest DEFAULT_INSTANCE;
+  private static final org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest();
+    DEFAULT_INSTANCE = new org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest();
   }
 
-  public static org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest getDefaultInstance() {
+  public static org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
@@ -1182,7 +1182,7 @@ public com.google.protobuf.Parser getParserForTyp
   }
 
   @java.lang.Override
-  public org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest getDefaultInstanceForType() {
+  public org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequestOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/UpdateCompactionStatusRequestOrBuilder.java
similarity index 86%
rename from core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequestOrBuilder.java
rename to rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/UpdateCompactionStatusRequestOrBuilder.java
index 8cab7b569dd..02f50dbcd13 100644
--- a/core/src/main/protobuf-gen-java/org/apache/accumulo/core/compaction/protobuf/UpdateCompactionStatusRequestOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/UpdateCompactionStatusRequestOrBuilder.java
@@ -20,7 +20,7 @@
 // source: compaction-coordinator.proto
 
 // Protobuf Java Version: 3.25.3
-package org.apache.accumulo.core.compaction.protobuf;
+package org.apache.accumulo.grpc.compaction.protobuf;
 
 public interface UpdateCompactionStatusRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:compaction_coordinator.UpdateCompactionStatusRequest)
@@ -35,11 +35,11 @@ public interface UpdateCompactionStatusRequestOrBuilder extends
    * .client.ProtoTInfo ptinfo = 1;
    * @return The ptinfo.
    */
-  org.apache.accumulo.core.compaction.protobuf.ProtoTInfo getPtinfo();
+  org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo getPtinfo();
   /**
    * .client.ProtoTInfo ptinfo = 1;
    */
-  org.apache.accumulo.core.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfoOrBuilder getPtinfoOrBuilder();
 
   /**
    * .security.PCredentials credentials = 2;
@@ -50,11 +50,11 @@ public interface UpdateCompactionStatusRequestOrBuilder extends
    * .security.PCredentials credentials = 2;
    * @return The credentials.
    */
-  org.apache.accumulo.core.compaction.protobuf.PCredentials getCredentials();
+  org.apache.accumulo.grpc.compaction.protobuf.PCredentials getCredentials();
   /**
    * .security.PCredentials credentials = 2;
    */
-  org.apache.accumulo.core.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.PCredentialsOrBuilder getCredentialsOrBuilder();
 
   /**
    * string externalCompactionId = 3;
@@ -77,11 +77,11 @@ public interface UpdateCompactionStatusRequestOrBuilder extends
    * .compaction_coordinator.PCompactionStatusUpdate status = 4;
    * @return The status.
    */
-  org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate getStatus();
+  org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate getStatus();
   /**
    * .compaction_coordinator.PCompactionStatusUpdate status = 4;
    */
-  org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdateOrBuilder getStatusOrBuilder();
+  org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdateOrBuilder getStatusOrBuilder();
 
   /**
    * int64 timestamp = 5;
diff --git a/rpc/grpc/src/main/spotbugs/exclude-filter.xml b/rpc/grpc/src/main/spotbugs/exclude-filter.xml
new file mode 100644
index 00000000000..93fe2179bd8
--- /dev/null
+++ b/rpc/grpc/src/main/spotbugs/exclude-filter.xml
@@ -0,0 +1,37 @@
+
+
+  
+  
+    
+    
+      
+    
+  
+  
+    
+    
+  
+
diff --git a/server/base/pom.xml b/server/base/pom.xml
index 02ffad85f7b..84c0e69ac4d 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -76,6 +76,10 @@
       org.apache.accumulo
       accumulo-core
     
+    
+      org.apache.accumulo
+      accumulo-grpc
+    
     
       org.apache.accumulo
       accumulo-start
diff --git a/server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java b/server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java
index 44d07dd5284..ba72fa61219 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java
@@ -21,7 +21,7 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceGrpc;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml
index cc3ac7b6206..3a2597e548c 100644
--- a/server/compactor/pom.xml
+++ b/server/compactor/pom.xml
@@ -43,6 +43,14 @@
       com.google.guava
       guava
     
+    
+      com.google.protobuf
+      protobuf-java
+    
+    
+      io.grpc
+      grpc-api
+    
     
       io.micrometer
       micrometer-core
@@ -51,6 +59,10 @@
       org.apache.accumulo
       accumulo-core
     
+    
+      org.apache.accumulo
+      accumulo-grpc
+    
     
       org.apache.accumulo
       accumulo-server-base
diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java
index 25a151803d1..9d5605a7486 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/CompactionJobHolder.java
@@ -21,10 +21,10 @@
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.accumulo.core.compaction.protobuf.PCompactionStats;
-import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob;
 import org.apache.accumulo.server.compaction.FileCompactor;
 
 public class CompactionJobHolder {
diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index e5343017c60..576ce2954d5 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -51,18 +51,6 @@
 import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException;
-import org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest;
-import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc;
-import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceBlockingStub;
-import org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest;
-import org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest;
-import org.apache.accumulo.core.compaction.protobuf.PCompactionKind;
-import org.apache.accumulo.core.compaction.protobuf.PCompactionState;
-import org.apache.accumulo.core.compaction.protobuf.PCompactionStats;
-import org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate;
-import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob;
-import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob;
-import org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest;
 import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService;
 import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService.Client;
 import org.apache.accumulo.core.compaction.thrift.CompactorService;
@@ -109,6 +97,18 @@
 import org.apache.accumulo.core.util.threads.ThreadPools;
 import org.apache.accumulo.core.util.threads.Threads;
 import org.apache.accumulo.core.util.time.NanoTime;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceGrpc;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceBlockingStub;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionState;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob;
+import org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob;
+import org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest;
 import org.apache.accumulo.server.AbstractServer;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.client.ClientServiceHandler;
diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java
index 1228122453c..d246bd9077c 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java
@@ -20,7 +20,6 @@
 
 import static org.apache.accumulo.core.rpc.ThriftProtobufUtil.convert;
 
-import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.TableId;
@@ -29,6 +28,7 @@
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.spi.compaction.CompactionKind;
 import org.apache.accumulo.core.tabletserver.thrift.TCompactionReason;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.compaction.FileCompactor.CompactionEnv;
 import org.apache.accumulo.server.iterators.SystemIteratorEnvironment;
diff --git a/server/manager/pom.xml b/server/manager/pom.xml
index cb52ea5681f..ea3421f7fc6 100644
--- a/server/manager/pom.xml
+++ b/server/manager/pom.xml
@@ -48,10 +48,22 @@
       com.google.guava
       guava
     
+    
+      com.google.protobuf
+      protobuf-java
+    
     
       commons-io
       commons-io
     
+    
+      io.grpc
+      grpc-api
+    
+    
+      io.grpc
+      grpc-stub
+    
     
       io.micrometer
       micrometer-core
@@ -68,6 +80,10 @@
       org.apache.accumulo
       accumulo-core
     
+    
+      org.apache.accumulo
+      accumulo-grpc
+    
     
       org.apache.accumulo
       accumulo-server-base
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
index 893183febf9..0af726a2ae3 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -66,24 +66,6 @@
 import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException;
-import org.apache.accumulo.core.compaction.protobuf.CancelRequest;
-import org.apache.accumulo.core.compaction.protobuf.CompactionCompletedRequest;
-import org.apache.accumulo.core.compaction.protobuf.CompactionCoordinatorServiceGrpc;
-import org.apache.accumulo.core.compaction.protobuf.CompactionFailedRequest;
-import org.apache.accumulo.core.compaction.protobuf.CompactionJobRequest;
-import org.apache.accumulo.core.compaction.protobuf.GetCompletedCompactionsRequest;
-import org.apache.accumulo.core.compaction.protobuf.GetRunningCompactionsRequest;
-import org.apache.accumulo.core.compaction.protobuf.PCompactionKind;
-import org.apache.accumulo.core.compaction.protobuf.PCompactionState;
-import org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate;
-import org.apache.accumulo.core.compaction.protobuf.PCredentials;
-import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob;
-import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionList;
-import org.apache.accumulo.core.compaction.protobuf.PInputFile;
-import org.apache.accumulo.core.compaction.protobuf.PIteratorConfig;
-import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob;
-import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo;
-import org.apache.accumulo.core.compaction.protobuf.UpdateCompactionStatusRequest;
 import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService;
 import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate;
 import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
@@ -128,6 +110,24 @@
 import org.apache.accumulo.core.util.threads.Threads;
 import org.apache.accumulo.core.util.time.SteadyTime;
 import org.apache.accumulo.core.volume.Volume;
+import org.apache.accumulo.grpc.compaction.protobuf.CancelRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCompletedRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceGrpc;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionFailedRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionJobRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionKind;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionState;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate;
+import org.apache.accumulo.grpc.compaction.protobuf.PCredentials;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList;
+import org.apache.accumulo.grpc.compaction.protobuf.PInputFile;
+import org.apache.accumulo.grpc.compaction.protobuf.PIteratorConfig;
+import org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob;
+import org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo;
+import org.apache.accumulo.grpc.compaction.protobuf.UpdateCompactionStatusRequest;
 import org.apache.accumulo.manager.Manager;
 import org.apache.accumulo.manager.compaction.coordinator.commit.CommitCompaction;
 import org.apache.accumulo.manager.compaction.coordinator.commit.CompactionCommitData;
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java
index 83ae0b9245b..0e390078ec6 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java
@@ -31,7 +31,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.accumulo.core.compaction.protobuf.PCompactionStats;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.Repo;
@@ -47,6 +46,7 @@
 import org.apache.accumulo.core.metadata.schema.TabletMetadata;
 import org.apache.accumulo.core.spi.compaction.CompactionKind;
 import org.apache.accumulo.core.util.Retry;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats;
 import org.apache.accumulo.manager.Manager;
 import org.apache.accumulo.manager.tableOps.ManagerRepo;
 import org.apache.accumulo.server.ServerContext;
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java
index 25887a910e2..a57c15cabd4 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java
@@ -23,7 +23,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.accumulo.core.compaction.protobuf.PCompactionStats;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent;
@@ -31,6 +30,7 @@
 import org.apache.accumulo.core.metadata.schema.CompactionMetadata;
 import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
 import org.apache.accumulo.core.spi.compaction.CompactionKind;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionStats;
 
 public class CompactionCommitData implements Serializable {
   private static final long serialVersionUID = 1L;
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
index 4c93cd5a128..8ca7deb8283 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
@@ -51,10 +51,6 @@
 import org.apache.accumulo.core.client.admin.CompactionConfig;
 import org.apache.accumulo.core.clientImpl.thrift.TInfo;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
-import org.apache.accumulo.core.compaction.protobuf.PCredentials;
-import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob;
-import org.apache.accumulo.core.compaction.protobuf.PNextCompactionJob;
-import org.apache.accumulo.core.compaction.protobuf.ProtoTInfo;
 import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.Property;
@@ -88,6 +84,10 @@
 import org.apache.accumulo.core.util.compaction.CompactionJobImpl;
 import org.apache.accumulo.core.util.compaction.RunningCompaction;
 import org.apache.accumulo.core.util.time.SteadyTime;
+import org.apache.accumulo.grpc.compaction.protobuf.PCredentials;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob;
+import org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob;
+import org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo;
 import org.apache.accumulo.manager.Manager;
 import org.apache.accumulo.manager.compaction.coordinator.CompactionCoordinator;
 import org.apache.accumulo.manager.compaction.queue.CompactionJobPriorityQueue;
diff --git a/test/pom.xml b/test/pom.xml
index 709dbe2975b..c6fd2364ac4 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -90,6 +90,10 @@
       org.apache.accumulo
       accumulo-gc
     
+    
+      org.apache.accumulo
+      accumulo-grpc
+    
     
       org.apache.accumulo
       accumulo-manager
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java
index 54fa0d5fe0a..50ec26d2f54 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java
@@ -28,9 +28,6 @@
 
 import org.apache.accumulo.compactor.Compactor;
 import org.apache.accumulo.core.cli.ConfigOpts;
-import org.apache.accumulo.core.compaction.protobuf.PCompactionState;
-import org.apache.accumulo.core.compaction.protobuf.PCompactionStatusUpdate;
-import org.apache.accumulo.core.compaction.protobuf.PExternalCompactionJob;
 import org.apache.accumulo.core.compaction.thrift.CompactorService.Iface;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.metadata.ReferencedTabletFile;
@@ -38,6 +35,9 @@
 import org.apache.accumulo.core.metadata.schema.TabletMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
 import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionState;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob;
 import org.apache.accumulo.server.compaction.FileCompactor;
 import org.apache.accumulo.server.compaction.FileCompactor.CompactionCanceledException;
 import org.apache.accumulo.server.compaction.RetryableRpcCall.RetriesExceededException;

From 80e5cb23666d108318f7de5c769d1c8048a1b50c Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Fri, 19 Jul 2024 10:53:44 -0400
Subject: [PATCH 15/25] fix build with relative path in pom

---
 rpc/grpc/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rpc/grpc/pom.xml b/rpc/grpc/pom.xml
index 059c3fc4449..81a70c8b23f 100644
--- a/rpc/grpc/pom.xml
+++ b/rpc/grpc/pom.xml
@@ -25,6 +25,7 @@
     org.apache.accumulo
     accumulo-project
     4.0.0-SNAPSHOT
+    ../../pom.xml
   
   accumulo-grpc
   Apache Accumulo gRPC

From 3efd1e9d334875a2402ce8fe8b27ac7da8707deb Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Fri, 19 Jul 2024 10:55:36 -0400
Subject: [PATCH 16/25] update .gitattributes after moving grpc

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index c133cc1db32..5e0ba737530 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18,4 +18,4 @@
 #
 
 core/src/main/thrift-gen-java/** linguist-generated=true
-core/src/main/protobuf-gen-java/** linguist-generated=true
+rpc/grpc/src/main/protobuf-gen-java/** linguist-generated=true

From d57af852c7a0492cfdd791bca36016cb400d27d5 Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Fri, 19 Jul 2024 11:35:32 -0400
Subject: [PATCH 17/25] address comments

---
 .../java/org/apache/accumulo/compactor/Compactor.java     | 8 ++------
 .../compaction/coordinator/CompactionCoordinator.java     | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index 576ce2954d5..fd234ee6016 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -515,17 +515,13 @@ protected PNextCompactionJob getNextJob(Supplier uuid) throws RetriesExcee
             ExternalCompactionId eci = ExternalCompactionId.generate(uuid.get());
             LOG.trace("Attempting to get next job, eci = {}", eci);
             currentCompactionId.set(eci);
-            /*
-             * gRPC is now used to make the compaction job request. We keep using the Thrift objects
-             * and convert to/from the equivalent protocol buffer objects for now to keep the
-             * changes isolated from the rest of the code.
-             */
+
+            // gRPC is now used to make the compaction job request.
             var request = CompactionJobRequest.newBuilder().setPtinfo(TraceUtil.protoTraceInfo())
                 .setCredentials(getContext().gRpcCreds()).setGroupName(this.getResourceGroup())
                 .setCompactor(
                     ExternalCompactionUtil.getHostPortString(compactorAddress.getAddress()))
                 .setExternalCompactionId(eci.toString()).build();
-
             return grpcClient.getCompactionJob(request);
           } catch (Exception e) {
             currentCompactionId.set(null);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
index 0af726a2ae3..15a5905659b 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -440,8 +440,8 @@ public CompletableFuture getAsyncCompactionJob(ProtoTInfo pt
             metaJob.getJob());
         LOG.info("Found job {}", result.getExternalCompactionId());
       } else {
-        LOG.debug("Unable to reserve compaction job for {}, returning empty job to compactor {}",
-            metaJob.getTabletMetadata().getExtent(), compactorAddress);
+        LOG.debug("Unable to reserve compaction job for {} {}, returning empty job to compactor {}",
+            groupName, metaJob.getTabletMetadata().getExtent(), compactorAddress);
         result = PExternalCompactionJob.newBuilder().build();
       }
 

From c7b7e8f95f9baae9c814d9228f20c491f66ecb8f Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Fri, 19 Jul 2024 13:25:36 -0400
Subject: [PATCH 18/25] Improve rpc creds in ClientContext and switch to string
 for PKeyExtent table

---
 .../core/clientImpl/ClientContext.java        |  47 ++++--
 .../accumulo/core/dataImpl/KeyExtent.java     |   5 +-
 .../accumulo/core/rpc/ThriftProtobufUtil.java |   5 +-
 rpc/grpc/src/main/proto/data.proto            |   5 +-
 .../grpc/compaction/protobuf/DataProto.java   |   2 +-
 .../grpc/compaction/protobuf/PKeyExtent.java  | 155 ++++++++++++++----
 .../protobuf/PKeyExtentOrBuilder.java         |  22 ++-
 7 files changed, 183 insertions(+), 58 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index a4bb1c707c5..2572df97213 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -140,8 +140,7 @@ public class ClientContext implements AccumuloClient {
   private final Supplier saslSupplier;
   private final Supplier sslSupplier;
   private final Supplier scanServerSelectorSupplier;
-  private TCredentials rpcCreds;
-  private PCredentials gRpcCreds;
+  private RpcCredentialsHolder rpcCreds;
   private ThriftTransportPool thriftTransportPool;
 
   private volatile boolean closed = false;
@@ -321,7 +320,6 @@ public synchronized void setCredentials(Credentials newCredentials) {
     checkArgument(newCredentials != null, "newCredentials is null");
     creds = newCredentials;
     rpcCreds = null;
-    gRpcCreds = null;
   }
 
   /**
@@ -461,29 +459,25 @@ public synchronized ConditionalWriterConfig getConditionalWriterConfig() {
    * Serialize the credentials just before initiating the RPC call
    */
   public synchronized TCredentials rpcCreds() {
-    ensureOpen();
-    if (getCredentials().getToken().isDestroyed()) {
-      rpcCreds = null;
-    }
-
-    if (rpcCreds == null) {
-      rpcCreds = getCredentials().toThrift(getInstanceID());
-    }
-
-    return rpcCreds;
+    return getRpcCreds().thrift();
   }
 
   public synchronized PCredentials gRpcCreds() {
+    return getRpcCreds().protobuf();
+  }
+
+  private synchronized RpcCredentialsHolder getRpcCreds() {
     ensureOpen();
     if (getCredentials().getToken().isDestroyed()) {
-      gRpcCreds = null;
+      rpcCreds = null;
     }
 
-    if (gRpcCreds == null) {
-      gRpcCreds = getCredentials().toProtobuf(getInstanceID());
+    if (rpcCreds == null) {
+      rpcCreds = new RpcCredentialsHolder(() -> getCredentials().toThrift(getInstanceID()),
+          () -> getCredentials().toProtobuf(getInstanceID()));
     }
 
-    return gRpcCreds;
+    return rpcCreds;
   }
 
   /**
@@ -1110,4 +1104,23 @@ && getConfiguration().getBoolean(Property.GENERAL_MICROMETER_CACHE_METRICS_ENABL
     return caches;
   }
 
+  private static class RpcCredentialsHolder {
+
+    private final com.google.common.base.Supplier tCreds;
+    private final com.google.common.base.Supplier pCreds;
+
+    RpcCredentialsHolder(com.google.common.base.Supplier tCreds,
+        com.google.common.base.Supplier pCreds) {
+      this.tCreds = Suppliers.memoize(tCreds);
+      this.pCreds = Suppliers.memoize(pCreds);
+    }
+
+    TCredentials thrift() {
+      return tCreds.get();
+    }
+
+    PCredentials protobuf() {
+      return pCreds.get();
+    }
+  }
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java
index 7c74e7e6106..43cb4f0fcbd 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/KeyExtent.java
@@ -135,8 +135,7 @@ public TKeyExtent toThrift() {
    * Convert to Protobuf form.
    */
   public PKeyExtent toProtobuf() {
-    PKeyExtent.Builder builder = PKeyExtent.newBuilder()
-        .setTable(ByteString.copyFrom(tableId().canonical().getBytes(UTF_8)));
+    PKeyExtent.Builder builder = PKeyExtent.newBuilder().setTable(tableId().canonical());
     if (endRow() != null) {
       builder.setEndRow(ByteString.copyFrom(endRow().getBytes()));
     }
@@ -152,7 +151,7 @@ public PKeyExtent toProtobuf() {
    * @param pke the KeyExtent in its Protobuf object form
    */
   public static KeyExtent fromProtobuf(PKeyExtent pke) {
-    TableId tableId = TableId.of(new String(pke.getTable().toByteArray(), UTF_8));
+    TableId tableId = TableId.of(pke.getTable());
     Text endRow = !pke.hasEndRow() ? null : new Text(pke.getEndRow().toByteArray());
     Text prevEndRow = !pke.hasPrevEndRow() ? null : new Text(pke.getPrevEndRow().toByteArray());
     return new KeyExtent(tableId, endRow, prevEndRow);
diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java
index 9dae2c0aa57..047c5947500 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java
@@ -18,6 +18,7 @@
  */
 package org.apache.accumulo.core.rpc;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.toList;
 
 import java.util.Optional;
@@ -119,7 +120,7 @@ public static TCredentials convert(PCredentials credentials) {
 
   public static TKeyExtent convert(PKeyExtent extent) {
     TKeyExtent tExtent = new TKeyExtent();
-    tExtent.setTable(extent.getTable().asReadOnlyByteBuffer());
+    tExtent.setTable(extent.getTable().getBytes(UTF_8));
     if (extent.hasPrevEndRow()) {
       tExtent.setPrevEndRow(extent.getPrevEndRow().asReadOnlyByteBuffer());
     }
@@ -130,7 +131,7 @@ public static TKeyExtent convert(PKeyExtent extent) {
   }
 
   public static PKeyExtent convert(TKeyExtent extent) {
-    var builder = PKeyExtent.newBuilder().setTable(ByteString.copyFrom(extent.getTable()));
+    var builder = PKeyExtent.newBuilder().setTable(new String(extent.getTable(), UTF_8));
     Optional.ofNullable(extent.getPrevEndRow())
         .ifPresent(prevEndRow -> builder.setPrevEndRow(ByteString.copyFrom(prevEndRow)));
     Optional.ofNullable(extent.getEndRow())
diff --git a/rpc/grpc/src/main/proto/data.proto b/rpc/grpc/src/main/proto/data.proto
index 3dc89e10009..9ca7efb6625 100644
--- a/rpc/grpc/src/main/proto/data.proto
+++ b/rpc/grpc/src/main/proto/data.proto
@@ -27,8 +27,9 @@ package data;
 
 
 message PKeyExtent {
-  bytes table = 1;
-  // optional to generate hasEndRow() and hasPrevEndRow() becuase
+  // Use a string to simplify things (thrift uses a byte array)
+  string table = 1;
+  // optional to generate hasEndRow() and hasPrevEndRow() because
   // of no nulls in protobuf
   optional bytes endRow = 2;
   optional bytes prevEndRow = 3;
diff --git a/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/DataProto.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/DataProto.java
index fd4a34f3ddc..cc867bce374 100644
--- a/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/DataProto.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/DataProto.java
@@ -48,7 +48,7 @@ public static void registerAllExtensions(
   static {
     java.lang.String[] descriptorData = {
       "\n\ndata.proto\022\004data\"c\n\nPKeyExtent\022\r\n\005tabl" +
-      "e\030\001 \001(\014\022\023\n\006endRow\030\002 \001(\014H\000\210\001\001\022\027\n\nprevEndR" +
+      "e\030\001 \001(\t\022\023\n\006endRow\030\002 \001(\014H\000\210\001\001\022\027\n\nprevEndR" +
       "ow\030\003 \001(\014H\001\210\001\001B\t\n\007_endRowB\r\n\013_prevEndRowB" +
       ";\n,org.apache.accumulo.grpc.compaction.p" +
       "rotobufB\tDataProtoP\001b\006proto3"
diff --git a/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtent.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtent.java
index bcf1cf28aba..7e9aa4e6d39 100644
--- a/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtent.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtent.java
@@ -35,7 +35,7 @@ private PKeyExtent(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
   private PKeyExtent() {
-    table_ = com.google.protobuf.ByteString.EMPTY;
+    table_ = "";
     endRow_ = com.google.protobuf.ByteString.EMPTY;
     prevEndRow_ = com.google.protobuf.ByteString.EMPTY;
   }
@@ -62,21 +62,57 @@ protected java.lang.Object newInstance(
 
   private int bitField0_;
   public static final int TABLE_FIELD_NUMBER = 1;
-  private com.google.protobuf.ByteString table_ = com.google.protobuf.ByteString.EMPTY;
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object table_ = "";
   /**
-   * bytes table = 1;
+   * 
+   * Use a string to simplify things (thrift uses a byte array)
+   * 

+   *
+   * string table = 1;
    * @return The table.
    */
   @java.lang.Override
-  public com.google.protobuf.ByteString getTable() {
-    return table_;
+  public java.lang.String getTable() {
+    java.lang.Object ref = table_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      table_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Use a string to simplify things (thrift uses a byte array)
+   * 

+   *
+   * string table = 1;
+   * @return The bytes for table.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString
+      getTableBytes() {
+    java.lang.Object ref = table_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      table_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
   }
 
   public static final int ENDROW_FIELD_NUMBER = 2;
   private com.google.protobuf.ByteString endRow_ = com.google.protobuf.ByteString.EMPTY;
   /**
    * 
-   * optional to generate hasEndRow() and hasPrevEndRow() becuase
+   * optional to generate hasEndRow() and hasPrevEndRow() because
    * of no nulls in protobuf
    * 

    *
@@ -89,7 +125,7 @@ public boolean hasEndRow() {
   }
   /**
    * 
-   * optional to generate hasEndRow() and hasPrevEndRow() becuase
+   * optional to generate hasEndRow() and hasPrevEndRow() because
    * of no nulls in protobuf
    * 

    *
@@ -134,8 +170,8 @@ public final boolean isInitialized() {
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (!table_.isEmpty()) {
-      output.writeBytes(1, table_);
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(table_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, table_);
     }
     if (((bitField0_ & 0x00000001) != 0)) {
       output.writeBytes(2, endRow_);
@@ -152,9 +188,8 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!table_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(1, table_);
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(table_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, table_);
     }
     if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
@@ -343,7 +378,7 @@ private Builder(
     public Builder clear() {
       super.clear();
       bitField0_ = 0;
-      table_ = com.google.protobuf.ByteString.EMPTY;
+      table_ = "";
       endRow_ = com.google.protobuf.ByteString.EMPTY;
       prevEndRow_ = com.google.protobuf.ByteString.EMPTY;
       return this;
@@ -438,8 +473,10 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent other) {
       if (other == org.apache.accumulo.grpc.compaction.protobuf.PKeyExtent.getDefaultInstance()) return this;
-      if (other.getTable() != com.google.protobuf.ByteString.EMPTY) {
-        setTable(other.getTable());
+      if (!other.getTable().isEmpty()) {
+        table_ = other.table_;
+        bitField0_ |= 0x00000001;
+        onChanged();
       }
       if (other.hasEndRow()) {
         setEndRow(other.getEndRow());
@@ -474,7 +511,7 @@ public Builder mergeFrom(
               done = true;
               break;
             case 10: {
-              table_ = input.readBytes();
+              table_ = input.readStringRequireUtf8();
               bitField0_ |= 0x00000001;
               break;
             } // case 10
@@ -505,21 +542,59 @@ public Builder mergeFrom(
     }
     private int bitField0_;
 
-    private com.google.protobuf.ByteString table_ = com.google.protobuf.ByteString.EMPTY;
+    private java.lang.Object table_ = "";
     /**
-     * bytes table = 1;
+     * 
+     * Use a string to simplify things (thrift uses a byte array)
+     * 

+     *
+     * string table = 1;
      * @return The table.
      */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getTable() {
-      return table_;
+    public java.lang.String getTable() {
+      java.lang.Object ref = table_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        table_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Use a string to simplify things (thrift uses a byte array)
+     * 

+     *
+     * string table = 1;
+     * @return The bytes for table.
+     */
+    public com.google.protobuf.ByteString
+        getTableBytes() {
+      java.lang.Object ref = table_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        table_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
     /**
-     * bytes table = 1;
+     * 
+     * Use a string to simplify things (thrift uses a byte array)
+     * 

+     *
+     * string table = 1;
      * @param value The table to set.
      * @return This builder for chaining.
      */
-    public Builder setTable(com.google.protobuf.ByteString value) {
+    public Builder setTable(
+        java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       table_ = value;
       bitField0_ |= 0x00000001;
@@ -527,12 +602,34 @@ public Builder setTable(com.google.protobuf.ByteString value) {
       return this;
     }
     /**
-     * bytes table = 1;
+     * 
+     * Use a string to simplify things (thrift uses a byte array)
+     * 

+     *
+     * string table = 1;
      * @return This builder for chaining.
      */
     public Builder clearTable() {
-      bitField0_ = (bitField0_ & ~0x00000001);
       table_ = getDefaultInstance().getTable();
+      bitField0_ = (bitField0_ & ~0x00000001);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Use a string to simplify things (thrift uses a byte array)
+     * 

+     *
+     * string table = 1;
+     * @param value The bytes for table to set.
+     * @return This builder for chaining.
+     */
+    public Builder setTableBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) { throw new NullPointerException(); }
+      checkByteStringIsUtf8(value);
+      table_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -540,7 +637,7 @@ public Builder clearTable() {
     private com.google.protobuf.ByteString endRow_ = com.google.protobuf.ByteString.EMPTY;
     /**
      * 
-     * optional to generate hasEndRow() and hasPrevEndRow() becuase
+     * optional to generate hasEndRow() and hasPrevEndRow() because
      * of no nulls in protobuf
      * 

      *
@@ -553,7 +650,7 @@ public boolean hasEndRow() {
     }
     /**
      * 
-     * optional to generate hasEndRow() and hasPrevEndRow() becuase
+     * optional to generate hasEndRow() and hasPrevEndRow() because
      * of no nulls in protobuf
      * 

      *
@@ -566,7 +663,7 @@ public com.google.protobuf.ByteString getEndRow() {
     }
     /**
      * 
-     * optional to generate hasEndRow() and hasPrevEndRow() becuase
+     * optional to generate hasEndRow() and hasPrevEndRow() because
      * of no nulls in protobuf
      * 

      *
@@ -583,7 +680,7 @@ public Builder setEndRow(com.google.protobuf.ByteString value) {
     }
     /**
      * 
-     * optional to generate hasEndRow() and hasPrevEndRow() becuase
+     * optional to generate hasEndRow() and hasPrevEndRow() because
      * of no nulls in protobuf
      * 

      *
diff --git a/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtentOrBuilder.java b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtentOrBuilder.java
index c85f2049e07..f997b835f9a 100644
--- a/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtentOrBuilder.java
+++ b/rpc/grpc/src/main/protobuf-gen-java/org/apache/accumulo/grpc/compaction/protobuf/PKeyExtentOrBuilder.java
@@ -27,14 +27,28 @@ public interface PKeyExtentOrBuilder extends
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * bytes table = 1;
+   * 
+   * Use a string to simplify things (thrift uses a byte array)
+   * 

+   *
+   * string table = 1;
    * @return The table.
    */
-  com.google.protobuf.ByteString getTable();
+  java.lang.String getTable();
+  /**
+   * 
+   * Use a string to simplify things (thrift uses a byte array)
+   * 

+   *
+   * string table = 1;
+   * @return The bytes for table.
+   */
+  com.google.protobuf.ByteString
+      getTableBytes();
 
   /**
    * 
-   * optional to generate hasEndRow() and hasPrevEndRow() becuase
+   * optional to generate hasEndRow() and hasPrevEndRow() because
    * of no nulls in protobuf
    * 

    *
@@ -44,7 +58,7 @@ public interface PKeyExtentOrBuilder extends
   boolean hasEndRow();
   /**
    * 
-   * optional to generate hasEndRow() and hasPrevEndRow() becuase
+   * optional to generate hasEndRow() and hasPrevEndRow() because
    * of no nulls in protobuf
    * 

    *

From 3fc6be03a2360a21b10a84b267f83187063f9018 Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Fri, 19 Jul 2024 17:20:24 -0400
Subject: [PATCH 19/25] add a property for grpc port

---
 .../apache/accumulo/core/conf/Property.java   |  6 ++++--
 rpc/grpc/pom.xml                              | 19 +++++++++++++++++++
 .../apache/accumulo/compactor/Compactor.java  |  8 ++++++--
 .../org/apache/accumulo/manager/Manager.java  |  9 ++++++---
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 89d9694a4f4..8b322fbaec4 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -360,6 +360,8 @@ public enum Property {
       "Properties in this category affect the behavior of the manager server.", "2.1.0"),
   MANAGER_CLIENTPORT("manager.port.client", "9999", PropertyType.PORT,
       "The port used for handling client connections on the manager.", "1.3.5"),
+  MANAGER_GRPC_CLIENTPORT("manager.port.grpc.client", "8999", PropertyType.PORT,
+      "The port used for handling gRPC client connections on the manager.", "1.3.5"),
   MANAGER_TABLET_BALANCER("manager.tablet.balancer",
       "org.apache.accumulo.core.spi.balancer.TableLoadBalancer", PropertyType.CLASSNAME,
       "The balancer class that accumulo will use to make tablet assignment and "
@@ -1431,8 +1433,8 @@ public static boolean isValidTablePropertyKey(String key) {
 
   public static final EnumSet fixedProperties = EnumSet.of(
       // port options
-      GC_PORT, MANAGER_CLIENTPORT, TSERV_CLIENTPORT, SSERV_CLIENTPORT, SSERV_PORTSEARCH,
-      COMPACTOR_PORTSEARCH, TSERV_PORTSEARCH,
+      GC_PORT, MANAGER_CLIENTPORT, MANAGER_GRPC_CLIENTPORT, TSERV_CLIENTPORT, SSERV_CLIENTPORT,
+      SSERV_PORTSEARCH, COMPACTOR_PORTSEARCH, TSERV_PORTSEARCH,
 
       // max message options
       SSERV_MAX_MESSAGE_SIZE, TSERV_MAX_MESSAGE_SIZE, COMPACTOR_MAX_MESSAGE_SIZE,
diff --git a/rpc/grpc/pom.xml b/rpc/grpc/pom.xml
index 81a70c8b23f..2ac8dd46163 100644
--- a/rpc/grpc/pom.xml
+++ b/rpc/grpc/pom.xml
@@ -58,6 +58,25 @@
     
   
   
+    
+      
+        
+          org.apache.maven.plugins
+          maven-surefire-plugin
+          
+            1
+            false
+          
+        
+        
+          org.apache.maven.plugins
+          maven-failsafe-plugin
+          
+            true
+          
+        
+      
+    
     
       
         kr.motd.maven
diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index fd234ee6016..ab71b8b911e 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -195,8 +195,12 @@ protected Compactor(ConfigOpts opts, String[] args) {
             value.shutdownNow();
           }
         })
-        // TODO: replace hardcoded port
-        .build(host -> ManagedChannelBuilder.forAddress(host, 8980)
+        // TODO: instead of property we need to switch to looking from from ZK
+        // This requires modifying ServiceDescriptor
+        .build(host -> ManagedChannelBuilder
+            .forAddress(host,
+                getConfiguration().getPortStream(Property.MANAGER_GRPC_CLIENTPORT).findFirst()
+                    .orElseThrow())
             .idleTimeout(getContext().getClientTimeoutInMillis(), TimeUnit.MILLISECONDS)
             .usePlaintext().build());
   }
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index 31650ce51c1..db9e97f153f 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@ -57,6 +57,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.cli.ConfigOpts;
@@ -1069,9 +1070,11 @@ public void run() {
     final CompactionCoordinatorServiceServer grpcService;
     try {
       // Start up the grpc compaction service
-      // TODO: The port is just hardcoded for now and will need to be configurable
-      grpcService =
-          new CompactionCoordinatorServiceServer(compactionCoordinator.getGrpcService(), 8980);
+      // TODO determine property name and default port to use for this, for now just using to
+      // manager.port.grpc.client
+      final IntStream port = getConfiguration().getPortStream(Property.MANAGER_GRPC_CLIENTPORT);
+      grpcService = new CompactionCoordinatorServiceServer(compactionCoordinator.getGrpcService(),
+          port.findFirst().orElseThrow());
       grpcService.start();
     } catch (IOException e) {
       throw new IllegalStateException("Unable to start grpc server on host " + getHostname(), e);

From 9da244a6ba9e1e5ac5c119b6157cd1c1094787ef Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Sat, 20 Jul 2024 13:17:34 -0400
Subject: [PATCH 20/25] Move rest of compaction coordinator service to gRPC and
 update Monitor

---
 .../accumulo/core/rpc/grpc/GrpcUtil.java      |  60 ++++++
 .../rpc/{ => grpc}/ThriftProtobufUtil.java    |   2 +-
 .../compaction/ExternalCompactionUtil.java    |  17 +-
 .../util/compaction/RunningCompaction.java    |  20 +-
 .../compaction/RunningCompactionInfo.java     |  20 +-
 .../apache/accumulo/server/util/ECAdmin.java  |  45 ++--
 .../apache/accumulo/compactor/Compactor.java  | 180 ++++++++--------
 .../apache/accumulo/compactor/ExtCEnv.java    |   2 +-
 .../coordinator/CompactionCoordinator.java    | 195 +++++++-----------
 .../compaction/CompactionCoordinatorTest.java |  16 +-
 .../org/apache/accumulo/monitor/Monitor.java  |  39 ++--
 .../external/RunningCompactions.java          |   4 +-
 .../external/RunningCompactorDetails.java     |  16 +-
 .../accumulo/monitor/resources/js/ec.js       |   2 +-
 .../apache/accumulo/monitor/templates/ec.ftl  |   2 +-
 .../ExternalCompactionProgressIT.java         |   8 +-
 .../ExternalCompactionTestUtils.java          |  83 ++++----
 .../compaction/ExternalCompaction_2_IT.java   |  14 +-
 .../compaction/ExternalCompaction_3_IT.java   |  28 ++-
 .../test/compaction/SplitCancelsMajCIT.java   |   4 +-
 .../apache/accumulo/test/util/SlowOps.java    |   2 +-
 21 files changed, 401 insertions(+), 358 deletions(-)
 create mode 100644 core/src/main/java/org/apache/accumulo/core/rpc/grpc/GrpcUtil.java
 rename core/src/main/java/org/apache/accumulo/core/rpc/{ => grpc}/ThriftProtobufUtil.java (99%)

diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/grpc/GrpcUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/grpc/GrpcUtil.java
new file mode 100644
index 00000000000..6688090c661
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/grpc/GrpcUtil.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.core.rpc.grpc;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.conf.Property;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.RemovalListener;
+import com.google.common.net.HostAndPort;
+
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+
+public class GrpcUtil {
+
+  // TODO: We are just sharing a single ManagedChannel for all RPC requests to the same server
+  // We need to look into pooling to see if that is necessary with gRPC or if ManagedChannel can
+  // handle multiple connections using ManagedChannelBuilder or NettyChannelBuilder
+  private static final Cache grpcChannels = Caffeine.newBuilder()
+      // TODO: When to expire?
+      .expireAfterAccess(60_000, TimeUnit.MILLISECONDS)
+      .removalListener((RemovalListener) (key, value, cause) -> {
+        if (value != null) {
+          value.shutdownNow();
+        }
+      }).build();
+
+  public static ManagedChannel getChannel(HostAndPort hostAndPort, ClientContext context) {
+    // TODO: we are just using the config for now for the Port as we need to update ZK to
+    // store the new gRPC port for the service as currently this is just the Thrift port
+    return grpcChannels.get(hostAndPort,
+        hp -> ManagedChannelBuilder
+            .forAddress(hp.getHost(),
+                context.getConfiguration().getPortStream(Property.MANAGER_GRPC_CLIENTPORT)
+                    .findFirst().orElseThrow())
+            .idleTimeout(context.getClientTimeoutInMillis(), TimeUnit.MILLISECONDS).usePlaintext()
+            .build());
+  }
+
+}
diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/grpc/ThriftProtobufUtil.java
similarity index 99%
rename from core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java
rename to core/src/main/java/org/apache/accumulo/core/rpc/grpc/ThriftProtobufUtil.java
index 047c5947500..a359cccbfbf 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftProtobufUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/grpc/ThriftProtobufUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.accumulo.core.rpc;
+package org.apache.accumulo.core.rpc.grpc;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.toList;
diff --git a/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java b/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
index b52ed9f867c..43590ecd7e6 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
@@ -18,6 +18,8 @@
  */
 package org.apache.accumulo.core.util.compaction;
 
+import static org.apache.accumulo.core.rpc.grpc.ThriftProtobufUtil.convert;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -46,6 +48,7 @@
 import org.apache.accumulo.core.trace.TraceUtil;
 import org.apache.accumulo.core.util.threads.ThreadPools;
 import org.apache.accumulo.core.util.time.NanoTime;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob;
 import org.apache.thrift.TException;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NoNodeException;
@@ -59,10 +62,10 @@ public class ExternalCompactionUtil {
   private static class RunningCompactionFuture {
     private final String group;
     private final HostAndPort compactor;
-    private final Future future;
+    private final Future future;
 
     public RunningCompactionFuture(String group, HostAndPort compactor,
-        Future future) {
+        Future future) {
       this.group = group;
       this.compactor = compactor;
       this.future = future;
@@ -76,7 +79,7 @@ public HostAndPort getCompactor() {
       return compactor;
     }
 
-    public Future getFuture() {
+    public Future getFuture() {
       return future;
     }
   }
@@ -173,7 +176,7 @@ public static List getActiveCompaction(HostAndPort compactor,
    * @param context context
    * @return external compaction job or null if none running
    */
-  public static TExternalCompactionJob getRunningCompaction(HostAndPort compactorAddr,
+  public static PExternalCompactionJob getRunningCompaction(HostAndPort compactorAddr,
       ClientContext context) {
 
     CompactorService.Client client = null;
@@ -183,7 +186,7 @@ public static TExternalCompactionJob getRunningCompaction(HostAndPort compactorA
           client.getRunningCompaction(TraceUtil.traceInfo(), context.rpcCreds());
       if (job.getExternalCompactionId() != null) {
         LOG.debug("Compactor {} is running {}", compactorAddr, job.getExternalCompactionId());
-        return job;
+        return convert(job);
       }
     } catch (TException e) {
       LOG.debug("Failed to contact compactor {}", compactorAddr, e);
@@ -234,8 +237,8 @@ public static List getCompactionsRunningOnCompactors(ClientCo
     final List results = new ArrayList<>();
     rcFutures.forEach(rcf -> {
       try {
-        TExternalCompactionJob job = rcf.getFuture().get();
-        if (null != job && null != job.getExternalCompactionId()) {
+        PExternalCompactionJob job = rcf.getFuture().get();
+        if (null != job && job.hasExternalCompactionId()) {
           var compactorAddress = getHostPortString(rcf.getCompactor());
           results.add(new RunningCompaction(job, compactorAddress, rcf.getGroup()));
         }
diff --git a/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompaction.java b/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompaction.java
index f2aab6b04a1..bc6e01a5a5b 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompaction.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompaction.java
@@ -21,40 +21,40 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
-import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob;
 
 public class RunningCompaction {
 
-  private final TExternalCompactionJob job;
+  private final PExternalCompactionJob job;
   private final String compactorAddress;
   private final String groupName;
-  private final Map updates = new TreeMap<>();
+  private final Map updates = new TreeMap<>();
 
-  public RunningCompaction(TExternalCompactionJob job, String compactorAddress, String groupName) {
+  public RunningCompaction(PExternalCompactionJob job, String compactorAddress, String groupName) {
     this.job = job;
     this.compactorAddress = compactorAddress;
     this.groupName = groupName;
   }
 
-  public RunningCompaction(TExternalCompaction tEC) {
+  public RunningCompaction(PExternalCompaction tEC) {
     this(tEC.getJob(), tEC.getCompactor(), tEC.getGroupName());
   }
 
-  public Map getUpdates() {
+  public Map getUpdates() {
     synchronized (updates) {
       return new TreeMap<>(updates);
     }
   }
 
-  public void addUpdate(Long timestamp, TCompactionStatusUpdate update) {
+  public void addUpdate(Long timestamp, PCompactionStatusUpdate update) {
     synchronized (updates) {
       this.updates.put(timestamp, update);
     }
   }
 
-  public TExternalCompactionJob getJob() {
+  public PExternalCompactionJob getJob() {
     return job;
   }
 
diff --git a/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java b/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java
index 6b7bed87c03..5ffbf1f5084 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java
@@ -24,9 +24,9 @@
 
 import java.util.TreeMap;
 
-import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,26 +49,26 @@ public class RunningCompactionInfo {
    * Info parsed about the external running compaction. Calculate the progress, which is defined as
    * the percentage of bytesRead / bytesToBeCompacted of the last update.
    */
-  public RunningCompactionInfo(TExternalCompaction ec) {
-    requireNonNull(ec, "Thrift external compaction is null.");
-    var updates = requireNonNull(ec.getUpdates(), "Missing Thrift external compaction updates");
+  public RunningCompactionInfo(PExternalCompaction ec) {
+    requireNonNull(ec, "Protobuf external compaction is null.");
+    var updates = requireNonNull(ec.getUpdatesMap(), "Missing Thrift external compaction updates");
     var job = requireNonNull(ec.getJob(), "Thrift external compaction job is null");
 
     server = ec.getCompactor();
     queueName = ec.getGroupName();
     ecid = job.getExternalCompactionId();
     kind = job.getKind().name();
-    tableId = KeyExtent.fromThrift(job.getExtent()).tableId().canonical();
-    numFiles = job.getFiles().size();
+    tableId = KeyExtent.fromProtobuf(job.getExtent()).tableId().canonical();
+    numFiles = job.getFilesList().size();
 
     // parse the updates map
     long nowMillis = System.currentTimeMillis();
     float percent = 0f;
     long updateMillis;
-    TCompactionStatusUpdate last;
+    PCompactionStatusUpdate last;
 
     // sort updates by key, which is a timestamp
-    TreeMap sorted = new TreeMap<>(updates);
+    TreeMap sorted = new TreeMap<>(updates);
     var lastEntry = sorted.lastEntry();
 
     // last entry is all we care about so bail if null
@@ -103,7 +103,7 @@ public RunningCompactionInfo(TExternalCompaction ec) {
     if (updates.isEmpty()) {
       status = "na";
     } else {
-      status = last.state.name();
+      status = last.getState().name();
     }
     log.debug("Parsed running compaction {} for {} with progress = {}%", status, ecid, progress);
     if (sinceLastUpdateSeconds > 30) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ECAdmin.java b/server/base/src/main/java/org/apache/accumulo/server/util/ECAdmin.java
index 416bbf39a2f..24fb24282c2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ECAdmin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ECAdmin.java
@@ -18,18 +18,20 @@
  */
 package org.apache.accumulo.server.util;
 
-import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompactionList;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
-import org.apache.accumulo.core.rpc.ThriftUtil;
-import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
+import org.apache.accumulo.core.rpc.grpc.GrpcUtil;
 import org.apache.accumulo.core.singletons.SingletonManager;
 import org.apache.accumulo.core.singletons.SingletonManager.Mode;
 import org.apache.accumulo.core.trace.TraceUtil;
 import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
 import org.apache.accumulo.core.util.compaction.RunningCompaction;
 import org.apache.accumulo.core.util.compaction.RunningCompactionInfo;
+import org.apache.accumulo.grpc.compaction.protobuf.CancelRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceGrpc;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceBlockingStub;
+import org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.cli.ServerUtilOpts;
 import org.apache.accumulo.start.spi.KeywordExecutable;
@@ -131,16 +133,19 @@ public void execute(final String[] args) {
   }
 
   private void cancelCompaction(ServerContext context, String ecid) {
-    CompactionCoordinatorService.Client coordinatorClient = null;
+    CompactionCoordinatorServiceBlockingStub coordinatorClient = null;
     ecid = ExternalCompactionId.from(ecid).canonical();
     try {
       coordinatorClient = getCoordinatorClient(context);
-      coordinatorClient.cancel(TraceUtil.traceInfo(), context.rpcCreds(), ecid);
+      var ignored =
+          coordinatorClient.cancel(CancelRequest.newBuilder().setPtinfo(TraceUtil.protoTraceInfo())
+              .setCredentials(context.gRpcCreds()).setExternalCompactionId(ecid).build());
       System.out.println("Cancel sent to coordinator for " + ecid);
     } catch (Exception e) {
       throw new IllegalStateException("Exception calling cancel compaction for " + ecid, e);
     } finally {
-      ThriftUtil.returnClient(coordinatorClient, context);
+      // TODO: cleanup if using grpc pooling in future
+      // ThriftUtil.returnClient(coordinatorClient, context);
     }
   }
 
@@ -154,16 +159,17 @@ private void listCompactorsByQueue(ServerContext context) {
   }
 
   private void runningCompactions(ServerContext context, boolean details) {
-    CompactionCoordinatorService.Client coordinatorClient = null;
-    TExternalCompactionList running;
+    CompactionCoordinatorServiceBlockingStub coordinatorClient = null;
+    PExternalCompactionList running;
     try {
       coordinatorClient = getCoordinatorClient(context);
-      running = coordinatorClient.getRunningCompactions(TraceUtil.traceInfo(), context.rpcCreds());
+      running = coordinatorClient.getRunningCompactions(GetRunningCompactionsRequest.newBuilder()
+          .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(context.gRpcCreds()).build());
       if (running == null) {
         System.out.println("No running compactions found.");
         return;
       }
-      var ecidMap = running.getCompactions();
+      var ecidMap = running.getCompactionsMap();
       if (ecidMap == null) {
         System.out.println("No running compactions found.");
         return;
@@ -172,9 +178,9 @@ private void runningCompactions(ServerContext context, boolean details) {
         if (ec != null) {
           var runningCompaction = new RunningCompaction(ec);
           var addr = runningCompaction.getCompactorAddress();
-          var kind = runningCompaction.getJob().kind;
+          var kind = runningCompaction.getJob().getKind();
           var group = runningCompaction.getGroupName();
-          var ke = KeyExtent.fromThrift(runningCompaction.getJob().extent);
+          var ke = KeyExtent.fromProtobuf(runningCompaction.getJob().getExtent());
           System.out.format("%s %s %s %s TableId: %s\n", ecid, addr, kind, group, ke.tableId());
           if (details) {
             var runningCompactionInfo = new RunningCompactionInfo(ec);
@@ -191,19 +197,24 @@ private void runningCompactions(ServerContext context, boolean details) {
     } catch (Exception e) {
       throw new IllegalStateException("Unable to get running compactions.", e);
     } finally {
-      ThriftUtil.returnClient(coordinatorClient, context);
+      // TODO: clean up if we use pooling with grpc
+      // ThriftUtil.returnClient(coordinatorClient, context);
     }
   }
 
-  private CompactionCoordinatorService.Client getCoordinatorClient(ServerContext context) {
+  private CompactionCoordinatorServiceBlockingStub getCoordinatorClient(ServerContext context) {
     var coordinatorHost = ExternalCompactionUtil.findCompactionCoordinator(context);
     if (coordinatorHost.isEmpty()) {
       throw new IllegalStateException("Unable to find coordinator. Check that it is running.");
     }
     HostAndPort address = coordinatorHost.orElseThrow();
-    CompactionCoordinatorService.Client coordinatorClient;
+    CompactionCoordinatorServiceBlockingStub coordinatorClient;
     try {
-      coordinatorClient = ThriftUtil.getClient(ThriftClientTypes.COORDINATOR, address, context);
+      // TODO: coordinatorHost contains the Thrift port so right now only host is used.
+      // we eventually need the gRPC port and will need to store than in Zk.
+      // GrpcUtil for now just uses the property in the context for the port
+      coordinatorClient = CompactionCoordinatorServiceGrpc
+          .newBlockingStub(GrpcUtil.getChannel(coordinatorHost.orElseThrow(), context));
     } catch (Exception e) {
       throw new IllegalStateException("Unable to get Compaction coordinator at " + address, e);
     }
diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index ab71b8b911e..aaf59fe3dbd 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -19,7 +19,7 @@
 package org.apache.accumulo.compactor;
 
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
-import static org.apache.accumulo.core.rpc.ThriftProtobufUtil.convert;
+import static org.apache.accumulo.core.rpc.grpc.ThriftProtobufUtil.convert;
 import static org.apache.accumulo.core.util.LazySingletons.RANDOM;
 
 import java.io.IOException;
@@ -51,8 +51,6 @@
 import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException;
-import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService;
-import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService.Client;
 import org.apache.accumulo.core.compaction.thrift.CompactorService;
 import org.apache.accumulo.core.compaction.thrift.UnknownCompactionIdException;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
@@ -84,8 +82,7 @@
 import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
 import org.apache.accumulo.core.metrics.MetricsInfo;
 import org.apache.accumulo.core.metrics.MetricsProducer;
-import org.apache.accumulo.core.rpc.ThriftUtil;
-import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
+import org.apache.accumulo.core.rpc.grpc.GrpcUtil;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
 import org.apache.accumulo.core.spi.crypto.CryptoService;
 import org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction;
@@ -133,14 +130,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
-import com.github.benmanes.caffeine.cache.RemovalListener;
 import com.google.common.base.Preconditions;
 import com.google.common.net.HostAndPort;
 
-import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
 import io.micrometer.core.instrument.FunctionCounter;
 import io.micrometer.core.instrument.LongTaskTimer;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -178,31 +172,8 @@ public interface FileCompactorRunnable extends Runnable {
 
   private final AtomicBoolean compactionRunning = new AtomicBoolean(false);
 
-  private final LoadingCache grpcChannel;
-
   protected Compactor(ConfigOpts opts, String[] args) {
     super("compactor", opts, ServerContext::new, args);
-
-    // TODO: We are just sharing a single ManagedChannel for all RPC requests to the same
-    // coordinator
-    // We need to look into pooling to see if that is necessary with gRPC or if ManagedChannel can
-    // handle
-    // multiple connections using ManagedChannelBuilder or NettyChannelBuilder
-    this.grpcChannel = Caffeine.newBuilder()
-        .expireAfterAccess(getContext().getClientTimeoutInMillis(), TimeUnit.MILLISECONDS)
-        .removalListener((RemovalListener) (key, value, cause) -> {
-          if (value != null) {
-            value.shutdownNow();
-          }
-        })
-        // TODO: instead of property we need to switch to looking from from ZK
-        // This requires modifying ServiceDescriptor
-        .build(host -> ManagedChannelBuilder
-            .forAddress(host,
-                getConfiguration().getPortStream(Property.MANAGER_GRPC_CLIENTPORT).findFirst()
-                    .orElseThrow())
-            .idleTimeout(getContext().getClientTimeoutInMillis(), TimeUnit.MILLISECONDS)
-            .usePlaintext().build());
   }
 
   @Override
@@ -224,8 +195,8 @@ public void registerMetrics(MeterRegistry registry) {
     FunctionCounter.builder(METRICS_COMPACTOR_ENTRIES_READ, this, Compactor::getTotalEntriesRead)
         .description("Number of entries read by all compactions that have run on this compactor")
         .register(registry);
-    FunctionCounter
-        .builder(METRICS_COMPACTOR_ENTRIES_WRITTEN, this, Compactor::getTotalEntriesWritten)
+    FunctionCounter.builder(METRICS_COMPACTOR_ENTRIES_WRITTEN, this,
+            Compactor::getTotalEntriesWritten)
         .description("Number of entries written by all compactions that have run on this compactor")
         .register(registry);
     LongTaskTimer timer = LongTaskTimer.builder(METRICS_COMPACTOR_MAJC_STUCK)
@@ -235,8 +206,9 @@ public void registerMetrics(MeterRegistry registry) {
 
   protected void startCancelChecker(ScheduledThreadPoolExecutor schedExecutor,
       long timeBetweenChecks) {
-    ThreadPools.watchCriticalScheduledTask(schedExecutor.scheduleWithFixedDelay(
-        this::checkIfCanceled, 0, timeBetweenChecks, TimeUnit.MILLISECONDS));
+    ThreadPools.watchCriticalScheduledTask(
+        schedExecutor.scheduleWithFixedDelay(this::checkIfCanceled, 0, timeBetweenChecks,
+            TimeUnit.MILLISECONDS));
   }
 
   protected void checkIfCanceled() {
@@ -314,8 +286,9 @@ protected void announceExistence(HostAndPort clientAddress)
       throw e;
     }
 
-    compactorLock = new ServiceLock(getContext().getZooReaderWriter().getZooKeeper(),
-        ServiceLock.path(zPath), compactorId);
+    compactorLock =
+        new ServiceLock(getContext().getZooReaderWriter().getZooKeeper(), ServiceLock.path(zPath),
+            compactorId);
     LockWatcher lw = new LockWatcher() {
       @Override
       public void lostLock(final LockLossReason reason) {
@@ -375,12 +348,13 @@ protected ServerAddress startCompactorClientService() throws UnknownHostExceptio
         getCompactorThriftHandlerInterface(), getContext());
     Property maxMessageSizeProperty =
         (getConfiguration().get(Property.COMPACTOR_MAX_MESSAGE_SIZE) != null
-            ? Property.COMPACTOR_MAX_MESSAGE_SIZE : Property.GENERAL_MAX_MESSAGE_SIZE);
-    ServerAddress sp = TServerUtils.startServer(getContext(), getHostname(),
-        Property.COMPACTOR_CLIENTPORT, processor, this.getClass().getSimpleName(),
-        "Thrift Client Server", Property.COMPACTOR_PORTSEARCH, Property.COMPACTOR_MINTHREADS,
-        Property.COMPACTOR_MINTHREADS_TIMEOUT, Property.COMPACTOR_THREADCHECK,
-        maxMessageSizeProperty);
+         ? Property.COMPACTOR_MAX_MESSAGE_SIZE : Property.GENERAL_MAX_MESSAGE_SIZE);
+    ServerAddress sp =
+        TServerUtils.startServer(getContext(), getHostname(), Property.COMPACTOR_CLIENTPORT,
+            processor, this.getClass().getSimpleName(), "Thrift Client Server",
+            Property.COMPACTOR_PORTSEARCH, Property.COMPACTOR_MINTHREADS,
+            Property.COMPACTOR_MINTHREADS_TIMEOUT, Property.COMPACTOR_THREADCHECK,
+            maxMessageSizeProperty);
     LOG.info("address = {}", sp.address);
     return sp;
   }
@@ -390,7 +364,7 @@ protected ServerAddress startCompactorClientService() throws UnknownHostExceptio
    *
    * @param externalCompactionId compaction id
    * @throws UnknownCompactionIdException if the externalCompactionId does not match the currently
-   *         executing compaction
+   * executing compaction
    * @throws TException thrift error
    */
   private void cancel(String externalCompactionId) throws TException {
@@ -430,22 +404,30 @@ protected void updateCompactionState(PExternalCompactionJob job, PCompactionStat
       throws RetriesExceededException {
     RetryableRpcCall thriftCall =
         new RetryableRpcCall<>(1000, RetryableRpcCall.MAX_WAIT_TIME, 25, () -> {
-          var coordinatorClient = getGrpcCoordinatorClient();
+          var coordinatorClient = getCoordinatorClient();
           try {
-            var ignored =
-                coordinatorClient.updateCompactionStatus(UpdateCompactionStatusRequest.newBuilder()
-                    .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(getContext().gRpcCreds())
-                    .setExternalCompactionId(job.getExternalCompactionId()).setStatus(update)
-                    .setTimestamp(System.currentTimeMillis()).build());
+            var u = UpdateCompactionStatusRequest.newBuilder().setPtinfo(TraceUtil.protoTraceInfo())
+                .setCredentials(getContext().gRpcCreds())
+                .setExternalCompactionId(job.getExternalCompactionId()).setStatus(update)
+                .setTimestamp(System.currentTimeMillis()).build();
+            LOG.debug("Compactor status update, id: {}, timestamp: {}, update: {}",
+                u.getExternalCompactionId(), u.getTimestamp(), u.getStatus());
+            var ignored = coordinatorClient.updateCompactionStatus(u);
             return "";
-          } catch (Exception e) {
+          } catch (StatusRuntimeException e) {
+            // TODO: Do we need to handle this any better?
             LOG.debug(e.getMessage());
-            return "";
+            throw e;
           } finally {
             // TODO: Channel is currently cached and shared, look into using pooling
           }
         });
-    thriftCall.run();
+    try {
+      thriftCall.run();
+    } catch (Exception e) {
+      LOG.error("thriftRun error: {}", e.getMessage());
+    }
+
   }
 
   /**
@@ -458,13 +440,18 @@ protected void updateCompactionFailed(PExternalCompactionJob job)
       throws RetriesExceededException {
     RetryableRpcCall thriftCall =
         new RetryableRpcCall<>(1000, RetryableRpcCall.MAX_WAIT_TIME, 25, () -> {
-          var coordinatorClient = getGrpcCoordinatorClient();
+          var coordinatorClient = getCoordinatorClient();
           try {
-            var ignored = coordinatorClient.compactionFailed(CompactionFailedRequest.newBuilder()
-                .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(getContext().gRpcCreds())
-                .setExternalCompactionId(job.getExternalCompactionId()).setExtent(job.getExtent())
-                .build());
+            var ignored = coordinatorClient.compactionFailed(
+                CompactionFailedRequest.newBuilder().setPtinfo(TraceUtil.protoTraceInfo())
+                    .setCredentials(getContext().gRpcCreds())
+                    .setExternalCompactionId(job.getExternalCompactionId())
+                    .setExtent(job.getExtent()).build());
             return "";
+          } catch (StatusRuntimeException e) {
+            // TODO: Do we need to handle this any better?
+            LOG.debug(e.getMessage());
+            throw e;
           } finally {
             // TODO: Channel is currently cached and shared, look into using pooling
           }
@@ -483,15 +470,19 @@ protected void updateCompactionCompleted(PExternalCompactionJob job, PCompaction
       throws RetriesExceededException {
     RetryableRpcCall rpcCall =
         new RetryableRpcCall<>(1000, RetryableRpcCall.MAX_WAIT_TIME, 25, () -> {
-          var coordinatorClient = getGrpcCoordinatorClient();
+          var coordinatorClient = getCoordinatorClient();
           try {
             LOG.info("Job: {}", job.getExtent());
-            var ignored =
-                coordinatorClient.compactionCompleted(CompactionCompletedRequest.newBuilder()
-                    .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(getContext().gRpcCreds())
+            var ignored = coordinatorClient.compactionCompleted(
+                CompactionCompletedRequest.newBuilder().setPtinfo(TraceUtil.protoTraceInfo())
+                    .setCredentials(getContext().gRpcCreds())
                     .setExternalCompactionId(job.getExternalCompactionId())
                     .setExtent(job.getExtent()).setStats(stats).build());
             return "";
+          } catch (StatusRuntimeException e) {
+            // TODO: Do we need to handle this any better?
+            LOG.debug(e.getMessage());
+            throw e;
           } finally {
             // TODO: Channel is currently cached and shared, look into using pooling
           }
@@ -514,7 +505,7 @@ protected PNextCompactionJob getNextJob(Supplier uuid) throws RetriesExcee
 
     RetryableRpcCall nextJobRpcCall =
         new RetryableRpcCall<>(startingWaitTime, maxWaitTime, 0, () -> {
-          var grpcClient = getGrpcCoordinatorClient();
+          var grpcClient = getCoordinatorClient();
           try {
             ExternalCompactionId eci = ExternalCompactionId.generate(uuid.get());
             LOG.trace("Attempting to get next job, eci = {}", eci);
@@ -541,26 +532,18 @@ protected PNextCompactionJob getNextJob(Supplier uuid) throws RetriesExcee
    * Get the client to the CompactionCoordinator
    *
    * @return compaction coordinator client
-   * @throws TTransportException when unable to get client
    */
-  protected CompactionCoordinatorService.Client getCoordinatorClient() throws TTransportException {
-    var coordinatorHost = ExternalCompactionUtil.findCompactionCoordinator(getContext());
-    if (coordinatorHost.isEmpty()) {
-      throw new TTransportException("Unable to get CompactionCoordinator address from ZooKeeper");
-    }
-    LOG.trace("CompactionCoordinator address is: {}", coordinatorHost.orElseThrow());
-    return ThriftUtil.getClient(ThriftClientTypes.COORDINATOR, coordinatorHost.orElseThrow(),
-        getContext());
-  }
-
-  protected CompactionCoordinatorServiceBlockingStub getGrpcCoordinatorClient()
+  protected CompactionCoordinatorServiceBlockingStub getCoordinatorClient()
       throws TTransportException {
     var coordinatorHost = ExternalCompactionUtil.findCompactionCoordinator(getContext());
     if (coordinatorHost.isEmpty()) {
       throw new TTransportException("Unable to get CompactionCoordinator address from ZooKeeper");
     }
-    return CompactionCoordinatorServiceGrpc
-        .newBlockingStub(grpcChannel.get(coordinatorHost.orElseThrow().getHost()));
+    // TODO: coordinatorHost contains the Thrift port so right now only host is used.
+    // we eventually need the gRPC port and will need to store than in Zk.
+    // GrpcUtil for now just uses the property in the context for the port
+    return CompactionCoordinatorServiceGrpc.newBlockingStub(
+        GrpcUtil.getChannel(coordinatorHost.orElseThrow(), getContext()));
   }
 
   /**
@@ -574,7 +557,7 @@ protected CompactionCoordinatorServiceBlockingStub getGrpcCoordinatorClient()
    * @param err reference to error
    * @return Runnable compaction job
    */
-  protected FileCompactorRunnable createCompactionJob(final PExternalCompactionJob job,
+  protected Compactor.FileCompactorRunnable createCompactionJob(final PExternalCompactionJob job,
       final LongAdder totalInputEntries, final LongAdder totalInputBytes,
       final CountDownLatch started, final CountDownLatch stopped,
       final AtomicReference err) {
@@ -658,10 +641,11 @@ public void run() {
 
           LOG.info("Compaction completed successfully {} ", job.getExternalCompactionId());
           // Update state when completed
-          PCompactionStatusUpdate update2 = PCompactionStatusUpdate.newBuilder()
-              .setState(PCompactionState.SUCCEEDED).setMessage("Compaction completed successfully")
-              .setEntriesToBeCompacted(-1).setEntriesRead(-1).setEntriesWritten(-1)
-              .setCompactionAgeNanos(this.getCompactionAge().toNanos()).build();
+          PCompactionStatusUpdate update2 =
+              PCompactionStatusUpdate.newBuilder().setState(PCompactionState.SUCCEEDED)
+                  .setMessage("Compaction completed successfully").setEntriesToBeCompacted(-1)
+                  .setEntriesRead(-1).setEntriesWritten(-1)
+                  .setCompactionAgeNanos(this.getCompactionAge().toNanos()).build();
 
           updateCompactionState(job, update2);
         } catch (FileCompactor.CompactionCanceledException cce) {
@@ -703,9 +687,9 @@ private long estimateOverlappingEntries(KeyExtent extent, StoredTabletFile file,
     FileOperations fileFactory = FileOperations.getInstance();
     FileSystem fs = getContext().getVolumeManager().getFileSystemByPath(file.getPath());
 
-    try (FileSKVIterator reader =
-        fileFactory.newReaderBuilder().forFile(file, fs, fs.getConf(), cryptoService)
-            .withTableConfiguration(tableConf).dropCachesBehind().build()) {
+    try (FileSKVIterator reader = fileFactory.newReaderBuilder()
+        .forFile(file, fs, fs.getConf(), cryptoService).withTableConfiguration(tableConf)
+        .dropCachesBehind().build()) {
       return reader.estimateOverlappingEntries(extent);
     } catch (IOException ioe) {
       throw new UncheckedIOException(ioe);
@@ -784,10 +768,8 @@ public void run() {
         idleProcessCheck(() -> {
           return timeSinceLastCompletion.get() == 0
               /* Never started a compaction */ || (timeSinceLastCompletion.get() > 0
-                  && (System.nanoTime() - timeSinceLastCompletion.get())
-                      > idleReportingPeriodNanos);
+              && (System.nanoTime() - timeSinceLastCompletion.get()) > idleReportingPeriodNanos);
         });
-
         currentCompactionId.set(null);
         err.set(null);
         JOB_HOLDER.reset();
@@ -810,8 +792,9 @@ public void run() {
             continue;
           }
           if (!job.getExternalCompactionId().equals(currentCompactionId.get().toString())) {
-            throw new IllegalStateException("Returned eci " + job.getExternalCompactionId()
-                + " does not match supplied eci " + currentCompactionId.get());
+            throw new IllegalStateException(
+                "Returned eci " + job.getExternalCompactionId() + " does not match supplied eci "
+                    + currentCompactionId.get());
           }
         } catch (RetriesExceededException e2) {
           LOG.warn("Retries exceeded getting next job. Retrying...");
@@ -890,14 +873,15 @@ public void run() {
             checkIfCanceled();
           }
 
-          if (compactionThread.isInterrupted() || JOB_HOLDER.isCancelled()
-              || (err.get() != null && err.get().getClass().equals(InterruptedException.class))) {
+          if (compactionThread.isInterrupted() || JOB_HOLDER.isCancelled() || (err.get() != null
+              && err.get().getClass().equals(InterruptedException.class))) {
             LOG.warn("Compaction thread was interrupted, sending CANCELLED state");
             try {
-              PCompactionStatusUpdate update = PCompactionStatusUpdate.newBuilder()
-                  .setState(PCompactionState.CANCELLED).setMessage("Compaction cancelled")
-                  .setEntriesToBeCompacted(-1).setEntriesRead(-1).setEntriesWritten(-1)
-                  .setCompactionAgeNanos(fcr.getCompactionAge().toNanos()).build();
+              PCompactionStatusUpdate update =
+                  PCompactionStatusUpdate.newBuilder().setState(PCompactionState.CANCELLED)
+                      .setMessage("Compaction cancelled").setEntriesToBeCompacted(-1)
+                      .setEntriesRead(-1).setEntriesWritten(-1)
+                      .setCompactionAgeNanos(fcr.getCompactionAge().toNanos()).build();
 
               updateCompactionState(job, update);
               updateCompactionFailed(job);
diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java
index d246bd9077c..f08f6f5aa21 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/ExtCEnv.java
@@ -18,7 +18,7 @@
  */
 package org.apache.accumulo.compactor;
 
-import static org.apache.accumulo.core.rpc.ThriftProtobufUtil.convert;
+import static org.apache.accumulo.core.rpc.grpc.ThriftProtobufUtil.convert;
 
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.data.Key;
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
index 15a5905659b..102a436229a 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -27,7 +27,7 @@
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOCATION;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.OPID;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.SELECTED;
-import static org.apache.accumulo.core.rpc.ThriftProtobufUtil.convert;
+import static org.apache.accumulo.core.rpc.grpc.ThriftProtobufUtil.convert;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -121,6 +121,7 @@
 import org.apache.accumulo.grpc.compaction.protobuf.PCompactionState;
 import org.apache.accumulo.grpc.compaction.protobuf.PCompactionStatusUpdate;
 import org.apache.accumulo.grpc.compaction.protobuf.PCredentials;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction;
 import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob;
 import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList;
 import org.apache.accumulo.grpc.compaction.protobuf.PInputFile;
@@ -325,7 +326,7 @@ public void run() {
         PCompactionStatusUpdate update =
             PCompactionStatusUpdate.newBuilder().setState(PCompactionState.IN_PROGRESS)
                 .setMessage("Coordinator restarted, compaction found in progress").build();
-        rc.addUpdate(System.currentTimeMillis(), convert(update));
+        rc.addUpdate(System.currentTimeMillis(), update);
         RUNNING_CACHE.put(ExternalCompactionId.of(rc.getJob().getExternalCompactionId()), rc);
       });
     }
@@ -388,8 +389,8 @@ public long getNumRunningCompactions() {
    *
    * @param groupName group
    * @param compactorAddress compactor address
-   * @throws ThriftSecurityException when permission error
    * @return compaction job
+   * @throws ThriftSecurityException when permission error
    */
   @Override
   public TNextCompactionJob getCompactionJob(TInfo tinfo, TCredentials credentials,
@@ -435,7 +436,7 @@ public CompletableFuture getAsyncCompactionJob(ProtoTInfo pt
         // It is possible that by the time this added that the the compactor that made this request
         // is dead. In this cases the compaction is not actually running.
         RUNNING_CACHE.put(ExternalCompactionId.of(result.getExternalCompactionId()),
-            new RunningCompaction(convert(result), compactorAddress, groupName));
+            new RunningCompaction(result, compactorAddress, groupName));
         TabletLogger.compacting(metaJob.getTabletMetadata(), cid, compactorAddress,
             metaJob.getJob());
         LOG.info("Found job {}", result.getExternalCompactionId());
@@ -937,22 +938,7 @@ public void cleanUpRunning() {
   @Override
   public TExternalCompactionList getRunningCompactions(TInfo tinfo, TCredentials credentials)
       throws ThriftSecurityException {
-    // do not expect users to call this directly, expect other tservers to call this method
-    if (!security.canPerformSystemActions(credentials)) {
-      throw new AccumuloSecurityException(credentials.getPrincipal(),
-          SecurityErrorCode.PERMISSION_DENIED).asThriftException();
-    }
-
-    final TExternalCompactionList result = new TExternalCompactionList();
-    RUNNING_CACHE.forEach((ecid, rc) -> {
-      TExternalCompaction trc = new TExternalCompaction();
-      trc.setGroupName(rc.getGroupName());
-      trc.setCompactor(rc.getCompactorAddress());
-      trc.setUpdates(rc.getUpdates());
-      trc.setJob(rc.getJob());
-      result.putToCompactions(ecid.canonical(), trc);
-    });
-    return result;
+    throw new UnsupportedOperationException();
   }
 
   /**
@@ -966,40 +952,13 @@ public TExternalCompactionList getRunningCompactions(TInfo tinfo, TCredentials c
   @Override
   public TExternalCompactionList getCompletedCompactions(TInfo tinfo, TCredentials credentials)
       throws ThriftSecurityException {
-    // do not expect users to call this directly, expect other tservers to call this method
-    if (!security.canPerformSystemActions(credentials)) {
-      throw new AccumuloSecurityException(credentials.getPrincipal(),
-          SecurityErrorCode.PERMISSION_DENIED).asThriftException();
-    }
-    final TExternalCompactionList result = new TExternalCompactionList();
-    completed.asMap().forEach((ecid, rc) -> {
-      TExternalCompaction trc = new TExternalCompaction();
-      trc.setGroupName(rc.getGroupName());
-      trc.setCompactor(rc.getCompactorAddress());
-      trc.setJob(rc.getJob());
-      trc.setUpdates(rc.getUpdates());
-      result.putToCompactions(ecid.canonical(), trc);
-    });
-    return result;
+    throw new UnsupportedOperationException();
   }
 
   @Override
   public void cancel(TInfo tinfo, TCredentials credentials, String externalCompactionId)
       throws TException {
-    var runningCompaction = RUNNING_CACHE.get(ExternalCompactionId.of(externalCompactionId));
-    var extent = KeyExtent.fromThrift(runningCompaction.getJob().getExtent());
-    try {
-      NamespaceId nsId = this.ctx.getNamespaceId(extent.tableId());
-      if (!security.canCompact(credentials, extent.tableId(), nsId)) {
-        throw new AccumuloSecurityException(credentials.getPrincipal(),
-            SecurityErrorCode.PERMISSION_DENIED).asThriftException();
-      }
-    } catch (TableNotFoundException e) {
-      throw new ThriftTableOperationException(extent.tableId().canonical(), null,
-          TableOperation.COMPACT_CANCEL, TableOperationExceptionType.NOTFOUND, e.getMessage());
-    }
-
-    cancelCompactionOnCompactor(runningCompaction.getCompactorAddress(), externalCompactionId);
+    throw new UnsupportedOperationException();
   }
 
   /* Method exists to be called from test */
@@ -1218,6 +1177,7 @@ public void compactionCompleted(CompactionCompletedRequest request,
         txid.ifPresentOrElse(fateId -> LOG.debug("initiated compaction commit {} {}", ecid, fateId),
             () -> LOG.debug("compaction commit already initiated for {}", ecid));
 
+        responseObserver.onNext(Empty.getDefaultInstance());
         responseObserver.onCompleted();
       } catch (ThriftSecurityException e) {
         responseObserver.onError(e);
@@ -1249,8 +1209,9 @@ public void updateCompactionStatus(UpdateCompactionStatusRequest request,
         final RunningCompaction rc =
             RUNNING_CACHE.get(ExternalCompactionId.of(request.getExternalCompactionId()));
         if (null != rc) {
-          rc.addUpdate(request.getTimestamp(), convert(request.getStatus()));
+          rc.addUpdate(request.getTimestamp(), request.getStatus());
         }
+        responseObserver.onNext(Empty.getDefaultInstance());
         responseObserver.onCompleted();
       } catch (ThriftSecurityException e) {
         responseObserver.onError(e);
@@ -1282,6 +1243,9 @@ public void compactionFailed(CompactionFailedRequest request,
             extent);
         final var ecid = ExternalCompactionId.of(request.getExternalCompactionId());
         compactionsFailed(Map.of(ecid, extent));
+
+        responseObserver.onNext(Empty.getDefaultInstance());
+        responseObserver.onCompleted();
       } catch (ThriftSecurityException e) {
         responseObserver.onError(e);
         throw new RuntimeException(e);
@@ -1296,76 +1260,76 @@ public void compactionFailed(CompactionFailedRequest request,
     public void getRunningCompactions(GetRunningCompactionsRequest request,
         StreamObserver responseObserver) {
 
-      // TODO
-      super.getRunningCompactions(request, responseObserver);
-
-      // // TODO: Do we want to offload this processing to a new thread like we plan to do with
-      // // getCompactionJob() ?
-      //
-      // var credentials = convert(request.getCredentials());
-      //
-      // try {
-      // // do not expect users to call this directly, expect other tservers to call this method
-      // if (!security.canPerformSystemActions(credentials)) {
-      // throw new AccumuloSecurityException(credentials.getPrincipal(),
-      // SecurityErrorCode.PERMISSION_DENIED).asThriftException();
-      // }
-      //
-      // final PExternalCompactionList.Builder resultBuilder = PExternalCompactionList.newBuilder();
-      // RUNNING_CACHE.forEach((ecid, rc) -> {
-      // PExternalCompaction prc = PExternalCompaction.newBuilder().setGroupName(rc.getGroupName())
-      // .setCompactor(rc.getCompactorAddress()).setJob(convert(rc.getJob()))
-      // .putAllUpdates(rc.getUpdates()).build();
-      // resultBuilder.putCompactions(ecid.canonical(), prc);
-      // });
-      // responseObserver.onNext(resultBuilder.build());
-      // responseObserver.onCompleted();
-      // } catch (ThriftSecurityException e) {
-      // responseObserver.onError(e);
-      // throw new RuntimeException(e);
-      // } catch (Exception e) {
-      // responseObserver.onError(e);
-      // LOG.error(e.getMessage(), e);
-      // throw e;
-      // }
+      // TODO: Do we want to offload this processing to a new thread like we plan to do with
+      // getCompactionJob() ?
+
+      var credentials = convert(request.getCredentials());
+
+      try {
+        // do not expect users to call this directly, expect other tservers to call this method
+        if (!security.canPerformSystemActions(credentials)) {
+          throw new AccumuloSecurityException(credentials.getPrincipal(),
+              SecurityErrorCode.PERMISSION_DENIED).asThriftException();
+        }
+
+        final PExternalCompactionList.Builder resultBuilder = PExternalCompactionList.newBuilder();
+        RUNNING_CACHE.forEach((ecid, rc) -> {
+          PExternalCompaction prc = PExternalCompaction.newBuilder().setGroupName(rc.getGroupName())
+              .setCompactor(rc.getCompactorAddress()).setJob(rc.getJob())
+              .putAllUpdates(rc.getUpdates()).build();
+
+          LOG.info("Running compaction: {}", prc);
+          resultBuilder.putCompactions(ecid.canonical(), prc);
+        });
+        responseObserver.onNext(resultBuilder.build());
+        responseObserver.onCompleted();
+      } catch (ThriftSecurityException e) {
+        responseObserver.onError(e);
+        throw new RuntimeException(e);
+      } catch (Exception e) {
+        responseObserver.onError(e);
+        LOG.error(e.getMessage(), e);
+        throw e;
+      }
     }
 
+    /**
+     * Return information about recently completed compactions
+     *
+     */
     @Override
     public void getCompletedCompactions(GetCompletedCompactionsRequest request,
         StreamObserver responseObserver) {
 
-      // TODO
-      super.getCompletedCompactions(request, responseObserver);
-
-      // // TODO: Do we want to offload this processing to a new thread like we plan to do with
-      // // getCompactionJob() ?
-      //
-      // var credentials = convert(request.getCredentials());
-      //
-      // try {
-      // // do not expect users to call this directly, expect other tservers to call this method
-      // if (!security.canPerformSystemActions(credentials)) {
-      // throw new AccumuloSecurityException(credentials.getPrincipal(),
-      // SecurityErrorCode.PERMISSION_DENIED).asThriftException();
-      // }
-      // final PExternalCompactionList.Builder resultBuilder = PExternalCompactionList.newBuilder();
-      //
-      // completed.asMap().forEach((ecid, rc) -> {
-      // PExternalCompaction prc = PExternalCompaction.newBuilder().setGroupName(rc.getGroupName())
-      // .setCompactor(rc.getCompactorAddress()).setJob(convert(rc.getJob()))
-      // .putAllUpdates(rc.getUpdates()).build();
-      // resultBuilder.putCompactions(ecid.canonical(), prc);
-      // });
-      // responseObserver.onNext(resultBuilder.build());
-      // responseObserver.onCompleted();
-      // } catch (ThriftSecurityException e) {
-      // responseObserver.onError(e);
-      // throw new RuntimeException(e);
-      // } catch (Exception e) {
-      // responseObserver.onError(e);
-      // LOG.error(e.getMessage(), e);
-      // throw e;
-      // }
+      // TODO: Do we want to offload this processing to a new thread like we plan to do with
+      // getCompactionJob() ?
+
+      var credentials = convert(request.getCredentials());
+
+      try {
+        // do not expect users to call this directly, expect other tservers to call this method
+        if (!security.canPerformSystemActions(credentials)) {
+          throw new AccumuloSecurityException(credentials.getPrincipal(),
+              SecurityErrorCode.PERMISSION_DENIED).asThriftException();
+        }
+        final PExternalCompactionList.Builder resultBuilder = PExternalCompactionList.newBuilder();
+
+        completed.asMap().forEach((ecid, rc) -> {
+          PExternalCompaction prc = PExternalCompaction.newBuilder().setGroupName(rc.getGroupName())
+              .setCompactor(rc.getCompactorAddress()).setJob(rc.getJob())
+              .putAllUpdates(rc.getUpdates()).build();
+          resultBuilder.putCompactions(ecid.canonical(), prc);
+        });
+        responseObserver.onNext(resultBuilder.build());
+        responseObserver.onCompleted();
+      } catch (ThriftSecurityException e) {
+        responseObserver.onError(e);
+        throw new RuntimeException(e);
+      } catch (Exception e) {
+        responseObserver.onError(e);
+        LOG.error(e.getMessage(), e);
+        throw e;
+      }
     }
 
     @Override
@@ -1378,7 +1342,7 @@ public void cancel(CancelRequest request, StreamObserver responseObserver
       try {
         var runningCompaction =
             RUNNING_CACHE.get(ExternalCompactionId.of(request.getExternalCompactionId()));
-        var extent = KeyExtent.fromThrift(runningCompaction.getJob().getExtent());
+        var extent = KeyExtent.fromProtobuf(runningCompaction.getJob().getExtent());
         try {
           NamespaceId nsId = CompactionCoordinator.this.ctx.getNamespaceId(extent.tableId());
           if (!security.canCompact(credentials, extent.tableId(), nsId)) {
@@ -1393,6 +1357,7 @@ public void cancel(CancelRequest request, StreamObserver responseObserver
         cancelCompactionOnCompactor(runningCompaction.getCompactorAddress(),
             request.getExternalCompactionId());
 
+        responseObserver.onNext(Empty.getDefaultInstance());
         responseObserver.onCompleted();
       } catch (ThriftSecurityException | ThriftTableOperationException e) {
         responseObserver.onError(e);
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
index 8ca7deb8283..75bb700585c 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
@@ -22,7 +22,7 @@
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.OPID;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.SELECTED;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.USER_COMPACTION_REQUESTED;
-import static org.apache.accumulo.core.rpc.ThriftProtobufUtil.convert;
+import static org.apache.accumulo.core.rpc.grpc.ThriftProtobufUtil.convert;
 import static org.apache.accumulo.manager.compaction.coordinator.CompactionCoordinator.canReserveCompaction;
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.createMock;
@@ -51,7 +51,6 @@
 import org.apache.accumulo.core.client.admin.CompactionConfig;
 import org.apache.accumulo.core.clientImpl.thrift.TInfo;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.TableId;
@@ -78,13 +77,13 @@
 import org.apache.accumulo.core.spi.compaction.CompactionKind;
 import org.apache.accumulo.core.spi.compaction.CompactorGroupId;
 import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats;
-import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob;
 import org.apache.accumulo.core.trace.TraceUtil;
 import org.apache.accumulo.core.util.cache.Caches;
 import org.apache.accumulo.core.util.compaction.CompactionJobImpl;
 import org.apache.accumulo.core.util.compaction.RunningCompaction;
 import org.apache.accumulo.core.util.time.SteadyTime;
 import org.apache.accumulo.grpc.compaction.protobuf.PCredentials;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction;
 import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionJob;
 import org.apache.accumulo.grpc.compaction.protobuf.PNextCompactionJob;
 import org.apache.accumulo.grpc.compaction.protobuf.ProtoTInfo;
@@ -281,7 +280,7 @@ public void testCoordinatorRestartOneRunningCompaction() throws Exception {
 
     List runningCompactions = new ArrayList<>();
     ExternalCompactionId eci = ExternalCompactionId.generate(UUID.randomUUID());
-    TExternalCompactionJob job = EasyMock.createNiceMock(TExternalCompactionJob.class);
+    PExternalCompactionJob job = EasyMock.createNiceMock(PExternalCompactionJob.class);
     expect(job.getExternalCompactionId()).andReturn(eci.toString()).anyTimes();
     TKeyExtent extent = new TKeyExtent();
     extent.setTable("1".getBytes());
@@ -439,9 +438,12 @@ public void testCleanUpRunning() throws Exception {
     var ecid2 = ExternalCompactionId.generate(UUID.randomUUID());
     var ecid3 = ExternalCompactionId.generate(UUID.randomUUID());
 
-    coordinator.getRunning().put(ecid1, new RunningCompaction(new TExternalCompaction()));
-    coordinator.getRunning().put(ecid2, new RunningCompaction(new TExternalCompaction()));
-    coordinator.getRunning().put(ecid3, new RunningCompaction(new TExternalCompaction()));
+    coordinator.getRunning().put(ecid1,
+        new RunningCompaction(PExternalCompaction.newBuilder().build()));
+    coordinator.getRunning().put(ecid2,
+        new RunningCompaction(PExternalCompaction.newBuilder().build()));
+    coordinator.getRunning().put(ecid3,
+        new RunningCompaction(PExternalCompaction.newBuilder().build()));
 
     coordinator.cleanUpRunning();
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 39ac86c96c1..b8f48fc94d3 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -47,9 +47,6 @@
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.cli.ConfigOpts;
-import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompactionList;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
@@ -68,6 +65,7 @@
 import org.apache.accumulo.core.metrics.MetricsInfo;
 import org.apache.accumulo.core.rpc.ThriftUtil;
 import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
+import org.apache.accumulo.core.rpc.grpc.GrpcUtil;
 import org.apache.accumulo.core.tabletscan.thrift.ActiveScan;
 import org.apache.accumulo.core.tabletscan.thrift.TabletScanClientService;
 import org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction;
@@ -77,6 +75,11 @@
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
 import org.apache.accumulo.core.util.threads.Threads;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceGrpc;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceBlockingStub;
+import org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList;
 import org.apache.accumulo.monitor.rest.compactions.external.ExternalCompactionInfo;
 import org.apache.accumulo.monitor.util.logging.RecentLogs;
 import org.apache.accumulo.server.AbstractServer;
@@ -175,7 +178,7 @@ public boolean add(Pair obj) {
   private GCStatus gcStatus;
   private Optional coordinatorHost = Optional.empty();
   private long coordinatorCheckNanos = 0L;
-  private CompactionCoordinatorService.Client coordinatorClient;
+  private CompactionCoordinatorServiceBlockingStub coordinatorClient;
   private final String coordinatorMissingMsg =
       "Error getting the compaction coordinator. Check that it is running. It is not "
           + "started automatically with other cluster processes so must be started by running "
@@ -393,7 +396,9 @@ public void fetchData() {
 
     } finally {
       if (coordinatorClient != null) {
-        ThriftUtil.returnClient(coordinatorClient, context);
+        // TODO: we may need to return the client here depending on how pooling works
+        // with gRPC
+        // ThriftUtil.returnClient(coordinatorClient, context);
         coordinatorClient = null;
       }
       lastRecalc.set(currentTime);
@@ -610,7 +615,7 @@ public static class CompactionStats {
   private final Map allCompactions = new HashMap<>();
   private final RecentLogs recentLogs = new RecentLogs();
   private final ExternalCompactionInfo ecInfo = new ExternalCompactionInfo();
-  private final Map ecRunningMap = new ConcurrentHashMap<>();
+  private final Map ecRunningMap = new ConcurrentHashMap<>();
   private long scansFetchedNanos = 0L;
   private long compactsFetchedNanos = 0L;
   private long ecInfoFetchedNanos = 0L;
@@ -670,37 +675,41 @@ public synchronized ExternalCompactionInfo getCompactorsInfo() {
    * user fetches since RPC calls are going to the coordinator. This allows for fine grain updates
    * of external compaction progress.
    */
-  public synchronized Map fetchRunningInfo() {
+  public synchronized Map fetchRunningInfo() {
     if (coordinatorHost.isEmpty()) {
       throw new IllegalStateException(coordinatorMissingMsg);
     }
     var ccHost = coordinatorHost.orElseThrow();
     log.info("User initiated fetch of running External Compactions from " + ccHost);
     var client = getCoordinator(ccHost);
-    TExternalCompactionList running;
+    PExternalCompactionList running;
     try {
-      running = client.getRunningCompactions(TraceUtil.traceInfo(), getContext().rpcCreds());
+      running = client.getRunningCompactions(GetRunningCompactionsRequest.newBuilder()
+          .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(getContext().gRpcCreds()).build());
     } catch (Exception e) {
       throw new IllegalStateException("Unable to get running compactions from " + ccHost, e);
     }
 
     ecRunningMap.clear();
-    if (running.getCompactions() != null) {
-      ecRunningMap.putAll(running.getCompactions());
+    if (!running.getCompactionsMap().isEmpty()) {
+      ecRunningMap.putAll(running.getCompactionsMap());
     }
 
     return ecRunningMap;
   }
 
-  public Map getEcRunningMap() {
+  public Map getEcRunningMap() {
     return ecRunningMap;
   }
 
-  private CompactionCoordinatorService.Client getCoordinator(HostAndPort address) {
+  private CompactionCoordinatorServiceBlockingStub getCoordinator(HostAndPort address) {
     if (coordinatorClient == null) {
       try {
-        coordinatorClient =
-            ThriftUtil.getClient(ThriftClientTypes.COORDINATOR, address, getContext());
+        // TODO: coordinatorHost contains the Thrift port so right now only host is used.
+        // we eventually need the gRPC port and will need to store than in Zk.
+        // GrpcUtil for now just uses the property in the context for the port
+        coordinatorClient = CompactionCoordinatorServiceGrpc
+            .newBlockingStub(GrpcUtil.getChannel(coordinatorHost.orElseThrow(), getContext()));
       } catch (Exception e) {
         log.error("Unable to get Compaction coordinator at {}", address);
         throw new IllegalStateException(coordinatorMissingMsg, e);
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/RunningCompactions.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/RunningCompactions.java
index 513c60328b5..b3965d856bb 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/RunningCompactions.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/RunningCompactions.java
@@ -22,14 +22,14 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
 import org.apache.accumulo.core.util.compaction.RunningCompactionInfo;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction;
 
 public class RunningCompactions {
 
   public final List running = new ArrayList<>();
 
-  public RunningCompactions(Map rMap) {
+  public RunningCompactions(Map rMap) {
     if (rMap != null) {
       for (var entry : rMap.entrySet()) {
         running.add(new RunningCompactionInfo(entry.getValue()));
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/RunningCompactorDetails.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/RunningCompactorDetails.java
index 415061ece9e..a824eaf405d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/RunningCompactorDetails.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/RunningCompactorDetails.java
@@ -21,26 +21,26 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
-import org.apache.accumulo.core.tabletserver.thrift.InputFile;
 import org.apache.accumulo.core.util.compaction.RunningCompactionInfo;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction;
+import org.apache.accumulo.grpc.compaction.protobuf.PInputFile;
 
 public class RunningCompactorDetails extends RunningCompactionInfo {
   // Variable names become JSON keys
   public final List inputFiles;
   public final String outputFile;
 
-  public RunningCompactorDetails(TExternalCompaction ec) {
+  public RunningCompactorDetails(PExternalCompaction ec) {
     super(ec);
     var job = ec.getJob();
-    inputFiles = convertInputFiles(job.files);
-    outputFile = job.outputFile;
+    inputFiles = convertInputFiles(job.getFilesList());
+    outputFile = job.getOutputFile();
   }
 
-  private List convertInputFiles(List files) {
+  private List convertInputFiles(List files) {
     List list = new ArrayList<>();
-    files.forEach(f -> list
-        .add(new CompactionInputFile(f.metadataFileEntry, f.size, f.entries, f.timestamp)));
+    files.forEach(f -> list.add(new CompactionInputFile(f.getMetadataFileEntry(), f.getSize(),
+        f.getEntries(), f.getTimestamp())));
     // sorted largest to smallest
     list.sort((o1, o2) -> Long.compare(o2.size, o1.size));
     return list;
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
index 545c2559dff..cf034a81230 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
@@ -61,7 +61,7 @@ $(document).ready(function () {
         "data": "server"
       },
       {
-        "data": "queueName"
+        "data": "groupName"
       },
       {
         "data": "lastContact"
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/ec.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/ec.ftl
index b69b6ef0170..37ac8b4d51a 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/ec.ftl
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/ec.ftl
@@ -49,7 +49,7 @@
               
                 
                   Server
-                  Queue
+                  Group
                   Last Contact
                 
               
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java
index 515c67ec575..06f88e228bb 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java
@@ -45,8 +45,6 @@
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.admin.CompactionConfig;
 import org.apache.accumulo.core.compaction.thrift.TCompactionState;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompactionList;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.iterators.IteratorUtil;
@@ -56,6 +54,8 @@
 import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
 import org.apache.accumulo.core.util.compaction.RunningCompactionInfo;
 import org.apache.accumulo.core.util.threads.Threads;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList;
 import org.apache.accumulo.harness.AccumuloClusterHarness;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
 import org.apache.accumulo.server.ServerContext;
@@ -328,8 +328,8 @@ private void checkRunning() throws TException {
       throw new TTransportException("Unable to get CompactionCoordinator address from ZooKeeper");
     }
 
-    TExternalCompactionList ecList = getRunningCompactions(ctx, coordinatorHost);
-    Map ecMap = ecList.getCompactions();
+    PExternalCompactionList ecList = getRunningCompactions(ctx, coordinatorHost);
+    Map ecMap = ecList.getCompactionsMap();
     if (ecMap != null) {
       ecMap.forEach((ecid, ec) -> {
         // returns null if it's a new mapping
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
index 20e6efc499b..0581f5f5feb 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
@@ -46,10 +46,6 @@
 import org.apache.accumulo.core.client.admin.CompactionConfig;
 import org.apache.accumulo.core.client.admin.NewTableConfiguration;
 import org.apache.accumulo.core.clientImpl.ClientContext;
-import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService;
-import org.apache.accumulo.core.compaction.thrift.TCompactionState;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompactionList;
 import org.apache.accumulo.core.conf.ClientProperty;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Key;
@@ -60,13 +56,19 @@
 import org.apache.accumulo.core.metadata.schema.TabletMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
 import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
-import org.apache.accumulo.core.rpc.ThriftUtil;
-import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
+import org.apache.accumulo.core.rpc.grpc.GrpcUtil;
 import org.apache.accumulo.core.spi.compaction.RatioBasedCompactionPlanner;
 import org.apache.accumulo.core.spi.compaction.SimpleCompactionDispatcher;
 import org.apache.accumulo.core.trace.TraceUtil;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceGrpc;
+import org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceBlockingStub;
+import org.apache.accumulo.grpc.compaction.protobuf.GetCompletedCompactionsRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.GetRunningCompactionsRequest;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionState;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.test.compaction.ExternalCompaction_1_IT.TestFilter;
@@ -74,7 +76,6 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.RawLocalFileSystem;
 import org.apache.hadoop.io.Text;
-import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
 
 import com.beust.jcommander.internal.Maps;
@@ -241,37 +242,47 @@ public static void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuratio
     coreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
   }
 
-  public static TExternalCompactionList getRunningCompactions(ClientContext context,
-      Optional coordinatorHost) throws TException {
-    CompactionCoordinatorService.Client client =
-        ThriftUtil.getClient(ThriftClientTypes.COORDINATOR, coordinatorHost.orElseThrow(), context);
+  public static PExternalCompactionList getRunningCompactions(ClientContext context,
+      Optional coordinatorHost) {
+    // TODO: coordinatorHost contains the Thrift port so right now only host is used.
+    // we eventually need the gRPC port and will need to store than in Zk.
+    // GrpcUtil for now just uses the property in the context for the port
+    CompactionCoordinatorServiceBlockingStub client = CompactionCoordinatorServiceGrpc
+        .newBlockingStub(GrpcUtil.getChannel(coordinatorHost.orElseThrow(), context));
     try {
-      TExternalCompactionList running =
-          client.getRunningCompactions(TraceUtil.traceInfo(), context.rpcCreds());
+      PExternalCompactionList running =
+          client.getRunningCompactions(GetRunningCompactionsRequest.newBuilder()
+              .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(context.gRpcCreds()).build());
       return running;
     } finally {
-      ThriftUtil.returnClient(client, context);
+      // TODO return gRpc client if needed
+      // ThriftUtil.returnClient(client, context);
     }
   }
 
-  private static TExternalCompactionList getCompletedCompactions(ClientContext context,
-      Optional coordinatorHost) throws Exception {
-    CompactionCoordinatorService.Client client =
-        ThriftUtil.getClient(ThriftClientTypes.COORDINATOR, coordinatorHost.orElseThrow(), context);
+  private static PExternalCompactionList getCompletedCompactions(ClientContext context,
+      Optional coordinatorHost) {
+    // TODO: coordinatorHost contains the Thrift port so right now only host is used.
+    // we eventually need the gRPC port and will need to store than in Zk.
+    // GrpcUtil for now just uses the property in the context for the port
+    CompactionCoordinatorServiceBlockingStub client = CompactionCoordinatorServiceGrpc
+        .newBlockingStub(GrpcUtil.getChannel(coordinatorHost.orElseThrow(), context));
     try {
-      TExternalCompactionList completed =
-          client.getCompletedCompactions(TraceUtil.traceInfo(), context.rpcCreds());
+      PExternalCompactionList completed =
+          client.getCompletedCompactions(GetCompletedCompactionsRequest.newBuilder()
+              .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(context.gRpcCreds()).build());
       return completed;
     } finally {
-      ThriftUtil.returnClient(client, context);
+      // TODO return gRpc client if needed
+      // ThriftUtil.returnClient(client, context);
     }
   }
 
-  public static TCompactionState getLastState(TExternalCompaction status) {
-    ArrayList timestamps = new ArrayList<>(status.getUpdates().size());
-    status.getUpdates().keySet().forEach(k -> timestamps.add(k));
+  public static PCompactionState getLastState(PExternalCompaction status) {
+    ArrayList timestamps = new ArrayList<>(status.getUpdatesMap().size());
+    status.getUpdatesMap().keySet().forEach(k -> timestamps.add(k));
     Collections.sort(timestamps);
-    return status.getUpdates().get(timestamps.get(timestamps.size() - 1)).getState();
+    return status.getUpdatesMap().get(timestamps.get(timestamps.size() - 1)).getState();
   }
 
   public static Set waitForCompactionStartAndReturnEcids(ServerContext ctx,
@@ -320,14 +331,14 @@ public static int confirmCompactionRunning(ServerContext ctx, Set ecids,
-      TCompactionState expectedState) throws Exception {
+      PCompactionState expectedState) throws Exception {
     Optional coordinatorHost = ExternalCompactionUtil.findCompactionCoordinator(ctx);
     if (coordinatorHost.isEmpty()) {
       throw new TTransportException("Unable to get CompactionCoordinator address from ZooKeeper");
     }
 
     // The running compaction should be removed
-    TExternalCompactionList running =
+    PExternalCompactionList running =
         ExternalCompactionTestUtils.getRunningCompactions(ctx, coordinatorHost);
-    while (running.getCompactions() != null && running.getCompactions().keySet().stream()
+    while (running.getCompactionsMap().keySet().stream()
         .anyMatch((e) -> ecids.contains(ExternalCompactionId.of(e)))) {
       running = ExternalCompactionTestUtils.getRunningCompactions(ctx, coordinatorHost);
     }
     // The compaction should be in the completed list with the expected state
-    TExternalCompactionList completed =
+    PExternalCompactionList completed =
         ExternalCompactionTestUtils.getCompletedCompactions(ctx, coordinatorHost);
-    while (completed.getCompactions() == null) {
+    while (completed.getCompactionsMap().isEmpty()) {
       UtilWaitThread.sleep(50);
       completed = ExternalCompactionTestUtils.getCompletedCompactions(ctx, coordinatorHost);
     }
     for (ExternalCompactionId e : ecids) {
-      TExternalCompaction tec = completed.getCompactions().get(e.canonical());
+      PExternalCompaction tec = completed.getCompactionsMap().get(e.canonical());
       assertNotNull(tec);
       assertEquals(expectedState, ExternalCompactionTestUtils.getLastState(tec));
     }
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_2_IT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_2_IT.java
index 4ca3794ca9c..46769e0d929 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_2_IT.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_2_IT.java
@@ -49,7 +49,6 @@
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.clientImpl.TableOperationsImpl;
-import org.apache.accumulo.core.compaction.thrift.TCompactionState;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.metadata.AccumuloTable;
@@ -57,6 +56,7 @@
 import org.apache.accumulo.core.metadata.schema.MetadataSchema;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
 import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionState;
 import org.apache.accumulo.harness.MiniClusterConfigurationCallback;
 import org.apache.accumulo.harness.SharedMiniClusterBase;
 import org.apache.accumulo.minicluster.ServerType;
@@ -122,7 +122,7 @@ public void testSplitCancelsExternalCompaction() throws Exception {
       client.tableOperations().addSplits(table1, splits);
 
       confirmCompactionCompleted(getCluster().getServerContext(), ecids,
-          TCompactionState.CANCELLED);
+          PCompactionState.CANCELLED);
 
       // ensure compaction ids were deleted by split operation from metadata table
       try (TabletsMetadata tm = getCluster().getServerContext().getAmple().readTablets()
@@ -139,7 +139,7 @@ public void testSplitCancelsExternalCompaction() throws Exception {
 
       // Verify that the tmp file are cleaned up
       Wait.waitFor(() -> FindCompactionTmpFiles
-          .findTempFiles(getCluster().getServerContext(), tid.canonical()).size() == 0, 60_000);
+          .findTempFiles(getCluster().getServerContext(), tid.canonical()).isEmpty(), 60_000);
     }
   }
 
@@ -192,7 +192,7 @@ public void testUserCompactionCancellation() throws Exception {
       assertEquals(TableOperationsImpl.COMPACTION_CANCELED_MSG, e.getMessage());
 
       confirmCompactionCompleted(getCluster().getServerContext(), ecids,
-          TCompactionState.CANCELLED);
+          PCompactionState.CANCELLED);
 
       // ensure the canceled compaction deletes any tablet metadata related to the compaction
       while (countTablets(getCluster().getServerContext(), table1,
@@ -202,7 +202,7 @@ public void testUserCompactionCancellation() throws Exception {
 
       // Verify that the tmp file are cleaned up
       Wait.waitFor(() -> FindCompactionTmpFiles
-          .findTempFiles(getCluster().getServerContext(), tid.canonical()).size() == 0);
+          .findTempFiles(getCluster().getServerContext(), tid.canonical()).isEmpty());
     }
   }
 
@@ -236,7 +236,7 @@ public void testDeleteTableCancelsUserExternalCompaction() throws Exception {
       client.tableOperations().delete(table1);
 
       confirmCompactionCompleted(getCluster().getServerContext(), ecids,
-          TCompactionState.CANCELLED);
+          PCompactionState.CANCELLED);
 
       // Ensure compaction did not write anything to metadata table after delete table
       try (var scanner = client.createScanner(AccumuloTable.METADATA.tableName())) {
@@ -292,7 +292,7 @@ public void testDeleteTableCancelsExternalCompaction() throws Exception {
 
       LoggerFactory.getLogger(getClass()).debug("Table deleted.");
 
-      confirmCompactionCompleted(ctx, ecids, TCompactionState.CANCELLED);
+      confirmCompactionCompleted(ctx, ecids, PCompactionState.CANCELLED);
 
       LoggerFactory.getLogger(getClass()).debug("Confirmed compaction cancelled.");
 
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java
index b1d7128b595..93f475323e6 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java
@@ -37,9 +37,6 @@
 
 import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.compaction.thrift.TCompactionState;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompactionList;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
@@ -48,6 +45,9 @@
 import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionState;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompaction;
+import org.apache.accumulo.grpc.compaction.protobuf.PExternalCompactionList;
 import org.apache.accumulo.harness.MiniClusterConfigurationCallback;
 import org.apache.accumulo.harness.SharedMiniClusterBase;
 import org.apache.accumulo.minicluster.ServerType;
@@ -57,8 +57,6 @@
 import org.apache.accumulo.test.util.Wait;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransportException;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -107,7 +105,7 @@ public void testMergeCancelsExternalCompaction() throws Exception {
       var md = new ArrayList();
       try (TabletsMetadata tm = getCluster().getServerContext().getAmple().readTablets()
           .forTable(tid).fetch(ColumnType.PREV_ROW).build()) {
-        tm.forEach(t -> md.add(t));
+        tm.forEach(md::add);
         assertEquals(2, md.size());
       }
 
@@ -121,7 +119,7 @@ public void testMergeCancelsExternalCompaction() throws Exception {
       client.tableOperations().merge(table1, start, end);
 
       confirmCompactionCompleted(getCluster().getServerContext(), ecids,
-          TCompactionState.CANCELLED);
+          PCompactionState.CANCELLED);
 
       // ensure compaction ids were deleted by merge operation from metadata table
       try (TabletsMetadata tm = getCluster().getServerContext().getAmple().readTablets()
@@ -142,7 +140,7 @@ public void testMergeCancelsExternalCompaction() throws Exception {
 
       // Verify that the tmp file are cleaned up
       Wait.waitFor(() -> FindCompactionTmpFiles
-          .findTempFiles(getCluster().getServerContext(), tid.canonical()).size() == 0);
+          .findTempFiles(getCluster().getServerContext(), tid.canonical()).isEmpty());
     }
   }
 
@@ -174,27 +172,27 @@ public void testCoordinatorRestartsDuringCompaction() throws Exception {
       // Confirm compaction is still running
       int matches = 0;
       while (matches == 0) {
-        TExternalCompactionList running = null;
+        PExternalCompactionList running = null;
         while (running == null) {
           try {
             Optional coordinatorHost =
                 ExternalCompactionUtil.findCompactionCoordinator(ctx);
             if (coordinatorHost.isEmpty()) {
-              throw new TTransportException(
+              throw new IllegalStateException(
                   "Unable to get CompactionCoordinator address from ZooKeeper");
             }
             running = getRunningCompactions(ctx, coordinatorHost);
-          } catch (TException t) {
+          } catch (RuntimeException t) {
             running = null;
             Thread.sleep(2000);
           }
         }
-        if (running.getCompactions() != null) {
+        if (!running.getCompactionsMap().isEmpty()) {
           for (ExternalCompactionId ecid : ecids) {
-            TExternalCompaction tec = running.getCompactions().get(ecid.canonical());
-            if (tec != null && tec.getUpdates() != null && !tec.getUpdates().isEmpty()) {
+            PExternalCompaction tec = running.getCompactionsMap().get(ecid.canonical());
+            if (tec != null && !tec.getUpdatesMap().isEmpty()) {
               matches++;
-              assertEquals(TCompactionState.IN_PROGRESS, getLastState(tec));
+              assertEquals(PCompactionState.IN_PROGRESS, getLastState(tec));
             }
           }
         }
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java
index e7ee6a19bbe..4fdff9235e1 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java
@@ -34,13 +34,13 @@
 import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.compaction.thrift.TCompactionState;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
+import org.apache.accumulo.grpc.compaction.protobuf.PCompactionState;
 import org.apache.accumulo.harness.MiniClusterConfigurationCallback;
 import org.apache.accumulo.harness.SharedMiniClusterBase;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
@@ -120,7 +120,7 @@ public void test() throws Exception {
       c.tableOperations().addSplits(tableName, partitionKeys);
 
       ExternalCompactionTestUtils.confirmCompactionCompleted(getCluster().getServerContext(),
-          compactionIds, TCompactionState.CANCELLED);
+          compactionIds, PCompactionState.CANCELLED);
 
       thread.join();
       // wait for the restarted compaction
diff --git a/test/src/main/java/org/apache/accumulo/test/util/SlowOps.java b/test/src/main/java/org/apache/accumulo/test/util/SlowOps.java
index fb48e21fe32..7e0e969aee1 100644
--- a/test/src/main/java/org/apache/accumulo/test/util/SlowOps.java
+++ b/test/src/main/java/org/apache/accumulo/test/util/SlowOps.java
@@ -226,7 +226,7 @@ private boolean blockUntilCompactionRunning() {
     do {
       boolean tableFound =
           ExternalCompactionUtil.getCompactionsRunningOnCompactors((ClientContext) client).stream()
-              .map(rc -> KeyExtent.fromThrift(rc.getJob().getExtent()).tableId())
+              .map(rc -> KeyExtent.fromProtobuf(rc.getJob().getExtent()).tableId())
               .anyMatch(tableId::equals);
 
       if (tableFound) {

From f000c46d6906f8a73fe167cfdda98b3af4bb2649 Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Sat, 20 Jul 2024 15:33:58 -0400
Subject: [PATCH 21/25] Remove no longer needed Thrift compaction coordinator
 service from CompactionCoordinator

---
 core/pom.xml                                  |   4 +
 .../server/rpc/ThriftProcessorTypes.java      |   4 -
 .../org/apache/accumulo/manager/Manager.java  |   2 +-
 .../coordinator/CompactionCoordinator.java    | 119 +-----------------
 .../compaction/CompactionCoordinatorTest.java |   9 --
 5 files changed, 6 insertions(+), 132 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index c953660e78e..84139089125 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -73,6 +73,10 @@
       commons-logging
       commons-logging
     
+    
+      io.grpc
+      grpc-api
+    
     
       io.micrometer
       micrometer-core
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/ThriftProcessorTypes.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/ThriftProcessorTypes.java
index 6f0a6086eba..733acf9c59e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/ThriftProcessorTypes.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/ThriftProcessorTypes.java
@@ -114,14 +114,10 @@ public static TMultiplexedProcessor getGcTProcessor(GCMonitorService.Iface servi
   }
 
   public static TMultiplexedProcessor getManagerTProcessor(FateService.Iface fateServiceHandler,
-      CompactionCoordinatorService.Iface coordinatorServiceHandler,
       ManagerClientService.Iface managerServiceHandler, ServerContext context) {
     TMultiplexedProcessor muxProcessor = new TMultiplexedProcessor();
     muxProcessor.registerProcessor(FATE.getServiceName(), FATE.getTProcessor(
         FateService.Processor.class, FateService.Iface.class, fateServiceHandler, context));
-    muxProcessor.registerProcessor(COORDINATOR.getServiceName(),
-        COORDINATOR.getTProcessor(CompactionCoordinatorService.Processor.class,
-            CompactionCoordinatorService.Iface.class, coordinatorServiceHandler, context));
     muxProcessor.registerProcessor(MANAGER.getServiceName(),
         MANAGER.getTProcessor(ManagerClientService.Processor.class,
             ManagerClientService.Iface.class, managerServiceHandler, context));
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index db9e97f153f..df1ba36808b 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@ -1054,7 +1054,7 @@ public void run() {
 
     ServerAddress sa;
     var processor = ThriftProcessorTypes.getManagerTProcessor(fateServiceHandler,
-        compactionCoordinator.getThriftService(), haProxy, getContext());
+         haProxy, getContext());
 
     try {
       sa = TServerUtils.startServer(context, getHostname(), Property.MANAGER_CLIENTPORT, processor,
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
index 102a436229a..ab3509c77d9 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -163,8 +163,7 @@
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;
 
-public class CompactionCoordinator
-    implements CompactionCoordinatorService.Iface, Runnable, MetricsProducer {
+public class CompactionCoordinator implements Runnable, MetricsProducer {
 
   private static final Logger LOG = LoggerFactory.getLogger(CompactionCoordinator.class);
 
@@ -384,21 +383,6 @@ public long getNumRunningCompactions() {
     return RUNNING_CACHE.size();
   }
 
-  /**
-   * Return the next compaction job from the queue to a Compactor
-   *
-   * @param groupName group
-   * @param compactorAddress compactor address
-   * @return compaction job
-   * @throws ThriftSecurityException when permission error
-   */
-  @Override
-  public TNextCompactionJob getCompactionJob(TInfo tinfo, TCredentials credentials,
-      String groupName, String compactorAddress, String externalCompactionId)
-      throws ThriftSecurityException {
-    throw new UnsupportedOperationException();
-  }
-
   public CompletableFuture getAsyncCompactionJob(ProtoTInfo ptinfo,
       PCredentials credentials, String groupName, String compactorAddress,
       String externalCompactionId) throws ThriftSecurityException {
@@ -709,10 +693,6 @@ public void addJobs(TabletMetadata tabletMetadata, Collection job
     jobQueues.add(tabletMetadata, jobs);
   }
 
-  public CompactionCoordinatorService.Iface getThriftService() {
-    return this;
-  }
-
   private Optional getCompactionConfig(CompactionJobQueues.MetaJob metaJob) {
     if (metaJob.getJob().getKind() == CompactionKind.USER
         && metaJob.getTabletMetadata().getSelectedFiles() != null) {
@@ -723,52 +703,6 @@ private Optional getCompactionConfig(CompactionJobQueues.MetaJ
     return Optional.empty();
   }
 
-  /**
-   * Compactors calls this method when they have finished a compaction. This method does the
-   * following.
-   *
-   * 
    
-   * 
  1. Reads the tablets metadata and determines if the compaction can commit. Its possible that
-   * things changed while the compaction was running and it can no longer commit.
    2. 
-   * 
  2. Commit the compaction using a conditional mutation. If the tablets files or location
-   * changed since reading the tablets metadata, then conditional mutation will fail. When this
-   * happens it will reread the metadata and go back to step 1 conceptually. When committing a
-   * compaction the compacted files are removed and scan entries are added to the tablet in case the
-   * files are in use, this prevents GC from deleting the files between updating tablet metadata and
-   * refreshing the tablet. The scan entries are only added when a tablet has a location.
    3. 
-   * 
  3. After successful commit a refresh request is sent to the tablet if it has a location. This
-   * will cause the tablet to start using the newly compacted files for future scans. Also the
-   * tablet can delete the scan entries if there are no active scans using them.
    4. 
-   * 

-   *
-   * 

-   * User compactions will be refreshed as part of the fate operation. The user compaction fate
-   * operation will see the compaction was committed after this code updates the tablet metadata,
-   * however if it were to rely on this code to do the refresh it would not be able to know when the
-   * refresh was actually done. Therefore, user compactions will refresh as part of the fate
-   * operation so that it's known to be done before the fate operation returns. Since the fate
-   * operation will do it, there is no need to do it here for user compactions.
-   *
-   * @param tinfo trace info
-   * @param credentials tcredentials object
-   * @param externalCompactionId compaction id
-   * @param textent tablet extent
-   * @param stats compaction stats
-   * @throws ThriftSecurityException when permission error
-   */
-  @Override
-  public void compactionCompleted(TInfo tinfo, TCredentials credentials,
-      String externalCompactionId, TKeyExtent textent, TCompactionStats stats)
-      throws ThriftSecurityException {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void compactionFailed(TInfo tinfo, TCredentials credentials, String externalCompactionId,
-      TKeyExtent extent) throws ThriftSecurityException {
-    throw new UnsupportedOperationException();
-  }
-
   void compactionsFailed(Map compactions) {
     // Need to process each level by itself because the conditional tablet mutator does not support
     // mutating multiple data levels at the same time
@@ -870,23 +804,6 @@ public boolean test(TabletMetadata tabletMetadata) {
     compactions.forEach((k, v) -> recordCompletion(k));
   }
 
-  /**
-   * Compactor calls to update the status of the assigned compaction
-   *
-   * @param tinfo trace info
-   * @param credentials tcredentials object
-   * @param externalCompactionId compaction id
-   * @param update compaction status update
-   * @param timestamp timestamp of the message
-   * @throws ThriftSecurityException when permission error
-   */
-  @Override
-  public void updateCompactionStatus(TInfo tinfo, TCredentials credentials,
-      String externalCompactionId, TCompactionStatusUpdate update, long timestamp)
-      throws ThriftSecurityException {
-    throw new UnsupportedOperationException();
-  }
-
   public void recordCompletion(ExternalCompactionId ecid) {
     var rc = RUNNING_CACHE.remove(ecid);
     if (rc != null) {
@@ -927,40 +844,6 @@ public void cleanUpRunning() {
     }
   }
 
-  /**
-   * Return information about running compactions
-   *
-   * @param tinfo trace info
-   * @param credentials tcredentials object
-   * @return map of ECID to TExternalCompaction objects
-   * @throws ThriftSecurityException permission error
-   */
-  @Override
-  public TExternalCompactionList getRunningCompactions(TInfo tinfo, TCredentials credentials)
-      throws ThriftSecurityException {
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * Return information about recently completed compactions
-   *
-   * @param tinfo trace info
-   * @param credentials tcredentials object
-   * @return map of ECID to TExternalCompaction objects
-   * @throws ThriftSecurityException permission error
-   */
-  @Override
-  public TExternalCompactionList getCompletedCompactions(TInfo tinfo, TCredentials credentials)
-      throws ThriftSecurityException {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void cancel(TInfo tinfo, TCredentials credentials, String externalCompactionId)
-      throws TException {
-    throw new UnsupportedOperationException();
-  }
-
   /* Method exists to be called from test */
   public CompactionJobQueues getJobQueues() {
     return jobQueues;
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
index 75bb700585c..1eaedbdfb24 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
@@ -162,15 +162,6 @@ protected void startIdleCompactionWatcher() {
       this.shutdown.countDown();
     }
 
-    @Override
-    public void compactionCompleted(TInfo tinfo, TCredentials credentials,
-        String externalCompactionId, TKeyExtent textent, TCompactionStats stats)
-        throws ThriftSecurityException {}
-
-    @Override
-    public void compactionFailed(TInfo tinfo, TCredentials credentials, String externalCompactionId,
-        TKeyExtent extent) throws ThriftSecurityException {}
-
     void setMetadataCompactionIds(Set mci) {
       metadataCompactionIds = mci;
     }

From 936edd162047c677c74b55b2c3d285981aa6d314 Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Sat, 20 Jul 2024 16:05:27 -0400
Subject: [PATCH 22/25] QA build fixes

---
 server/base/pom.xml                           |  4 +
 server/compactor/pom.xml                      |  4 -
 .../apache/accumulo/compactor/Compactor.java  | 85 +++++++++----------
 .../org/apache/accumulo/manager/Manager.java  |  4 +-
 .../coordinator/CompactionCoordinator.java    | 10 ---
 .../compaction/CompactionCoordinatorTest.java |  3 -
 server/monitor/pom.xml                        |  8 ++
 test/pom.xml                                  |  4 +
 8 files changed, 57 insertions(+), 65 deletions(-)

diff --git a/server/base/pom.xml b/server/base/pom.xml
index 84c0e69ac4d..eeeded9cbbb 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -52,6 +52,10 @@
       com.google.guava
       guava
     
+    
+      com.google.protobuf
+      protobuf-java
+    
     
       commons-codec
       commons-codec
diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml
index 3a2597e548c..b22a1a2f83c 100644
--- a/server/compactor/pom.xml
+++ b/server/compactor/pom.xml
@@ -30,10 +30,6 @@
   accumulo-compactor
   Apache Accumulo Compactor
   
-    
-      com.github.ben-manes.caffeine
-      caffeine
-    
     
       com.google.auto.service
       auto-service
diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index aaf59fe3dbd..e51e21f6983 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -133,7 +133,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.net.HostAndPort;
 
-import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import io.micrometer.core.instrument.FunctionCounter;
 import io.micrometer.core.instrument.LongTaskTimer;
@@ -195,8 +194,8 @@ public void registerMetrics(MeterRegistry registry) {
     FunctionCounter.builder(METRICS_COMPACTOR_ENTRIES_READ, this, Compactor::getTotalEntriesRead)
         .description("Number of entries read by all compactions that have run on this compactor")
         .register(registry);
-    FunctionCounter.builder(METRICS_COMPACTOR_ENTRIES_WRITTEN, this,
-            Compactor::getTotalEntriesWritten)
+    FunctionCounter
+        .builder(METRICS_COMPACTOR_ENTRIES_WRITTEN, this, Compactor::getTotalEntriesWritten)
         .description("Number of entries written by all compactions that have run on this compactor")
         .register(registry);
     LongTaskTimer timer = LongTaskTimer.builder(METRICS_COMPACTOR_MAJC_STUCK)
@@ -206,9 +205,8 @@ public void registerMetrics(MeterRegistry registry) {
 
   protected void startCancelChecker(ScheduledThreadPoolExecutor schedExecutor,
       long timeBetweenChecks) {
-    ThreadPools.watchCriticalScheduledTask(
-        schedExecutor.scheduleWithFixedDelay(this::checkIfCanceled, 0, timeBetweenChecks,
-            TimeUnit.MILLISECONDS));
+    ThreadPools.watchCriticalScheduledTask(schedExecutor.scheduleWithFixedDelay(
+        this::checkIfCanceled, 0, timeBetweenChecks, TimeUnit.MILLISECONDS));
   }
 
   protected void checkIfCanceled() {
@@ -286,9 +284,8 @@ protected void announceExistence(HostAndPort clientAddress)
       throw e;
     }
 
-    compactorLock =
-        new ServiceLock(getContext().getZooReaderWriter().getZooKeeper(), ServiceLock.path(zPath),
-            compactorId);
+    compactorLock = new ServiceLock(getContext().getZooReaderWriter().getZooKeeper(),
+        ServiceLock.path(zPath), compactorId);
     LockWatcher lw = new LockWatcher() {
       @Override
       public void lostLock(final LockLossReason reason) {
@@ -348,13 +345,12 @@ protected ServerAddress startCompactorClientService() throws UnknownHostExceptio
         getCompactorThriftHandlerInterface(), getContext());
     Property maxMessageSizeProperty =
         (getConfiguration().get(Property.COMPACTOR_MAX_MESSAGE_SIZE) != null
-         ? Property.COMPACTOR_MAX_MESSAGE_SIZE : Property.GENERAL_MAX_MESSAGE_SIZE);
-    ServerAddress sp =
-        TServerUtils.startServer(getContext(), getHostname(), Property.COMPACTOR_CLIENTPORT,
-            processor, this.getClass().getSimpleName(), "Thrift Client Server",
-            Property.COMPACTOR_PORTSEARCH, Property.COMPACTOR_MINTHREADS,
-            Property.COMPACTOR_MINTHREADS_TIMEOUT, Property.COMPACTOR_THREADCHECK,
-            maxMessageSizeProperty);
+            ? Property.COMPACTOR_MAX_MESSAGE_SIZE : Property.GENERAL_MAX_MESSAGE_SIZE);
+    ServerAddress sp = TServerUtils.startServer(getContext(), getHostname(),
+        Property.COMPACTOR_CLIENTPORT, processor, this.getClass().getSimpleName(),
+        "Thrift Client Server", Property.COMPACTOR_PORTSEARCH, Property.COMPACTOR_MINTHREADS,
+        Property.COMPACTOR_MINTHREADS_TIMEOUT, Property.COMPACTOR_THREADCHECK,
+        maxMessageSizeProperty);
     LOG.info("address = {}", sp.address);
     return sp;
   }
@@ -364,7 +360,7 @@ protected ServerAddress startCompactorClientService() throws UnknownHostExceptio
    *
    * @param externalCompactionId compaction id
    * @throws UnknownCompactionIdException if the externalCompactionId does not match the currently
-   * executing compaction
+   *         executing compaction
    * @throws TException thrift error
    */
   private void cancel(String externalCompactionId) throws TException {
@@ -442,11 +438,10 @@ protected void updateCompactionFailed(PExternalCompactionJob job)
         new RetryableRpcCall<>(1000, RetryableRpcCall.MAX_WAIT_TIME, 25, () -> {
           var coordinatorClient = getCoordinatorClient();
           try {
-            var ignored = coordinatorClient.compactionFailed(
-                CompactionFailedRequest.newBuilder().setPtinfo(TraceUtil.protoTraceInfo())
-                    .setCredentials(getContext().gRpcCreds())
-                    .setExternalCompactionId(job.getExternalCompactionId())
-                    .setExtent(job.getExtent()).build());
+            var ignored = coordinatorClient.compactionFailed(CompactionFailedRequest.newBuilder()
+                .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(getContext().gRpcCreds())
+                .setExternalCompactionId(job.getExternalCompactionId()).setExtent(job.getExtent())
+                .build());
             return "";
           } catch (StatusRuntimeException e) {
             // TODO: Do we need to handle this any better?
@@ -473,9 +468,9 @@ protected void updateCompactionCompleted(PExternalCompactionJob job, PCompaction
           var coordinatorClient = getCoordinatorClient();
           try {
             LOG.info("Job: {}", job.getExtent());
-            var ignored = coordinatorClient.compactionCompleted(
-                CompactionCompletedRequest.newBuilder().setPtinfo(TraceUtil.protoTraceInfo())
-                    .setCredentials(getContext().gRpcCreds())
+            var ignored =
+                coordinatorClient.compactionCompleted(CompactionCompletedRequest.newBuilder()
+                    .setPtinfo(TraceUtil.protoTraceInfo()).setCredentials(getContext().gRpcCreds())
                     .setExternalCompactionId(job.getExternalCompactionId())
                     .setExtent(job.getExtent()).setStats(stats).build());
             return "";
@@ -542,8 +537,8 @@ protected CompactionCoordinatorServiceBlockingStub getCoordinatorClient()
     // TODO: coordinatorHost contains the Thrift port so right now only host is used.
     // we eventually need the gRPC port and will need to store than in Zk.
     // GrpcUtil for now just uses the property in the context for the port
-    return CompactionCoordinatorServiceGrpc.newBlockingStub(
-        GrpcUtil.getChannel(coordinatorHost.orElseThrow(), getContext()));
+    return CompactionCoordinatorServiceGrpc
+        .newBlockingStub(GrpcUtil.getChannel(coordinatorHost.orElseThrow(), getContext()));
   }
 
   /**
@@ -641,11 +636,10 @@ public void run() {
 
           LOG.info("Compaction completed successfully {} ", job.getExternalCompactionId());
           // Update state when completed
-          PCompactionStatusUpdate update2 =
-              PCompactionStatusUpdate.newBuilder().setState(PCompactionState.SUCCEEDED)
-                  .setMessage("Compaction completed successfully").setEntriesToBeCompacted(-1)
-                  .setEntriesRead(-1).setEntriesWritten(-1)
-                  .setCompactionAgeNanos(this.getCompactionAge().toNanos()).build();
+          PCompactionStatusUpdate update2 = PCompactionStatusUpdate.newBuilder()
+              .setState(PCompactionState.SUCCEEDED).setMessage("Compaction completed successfully")
+              .setEntriesToBeCompacted(-1).setEntriesRead(-1).setEntriesWritten(-1)
+              .setCompactionAgeNanos(this.getCompactionAge().toNanos()).build();
 
           updateCompactionState(job, update2);
         } catch (FileCompactor.CompactionCanceledException cce) {
@@ -687,9 +681,9 @@ private long estimateOverlappingEntries(KeyExtent extent, StoredTabletFile file,
     FileOperations fileFactory = FileOperations.getInstance();
     FileSystem fs = getContext().getVolumeManager().getFileSystemByPath(file.getPath());
 
-    try (FileSKVIterator reader = fileFactory.newReaderBuilder()
-        .forFile(file, fs, fs.getConf(), cryptoService).withTableConfiguration(tableConf)
-        .dropCachesBehind().build()) {
+    try (FileSKVIterator reader =
+        fileFactory.newReaderBuilder().forFile(file, fs, fs.getConf(), cryptoService)
+            .withTableConfiguration(tableConf).dropCachesBehind().build()) {
       return reader.estimateOverlappingEntries(extent);
     } catch (IOException ioe) {
       throw new UncheckedIOException(ioe);
@@ -768,7 +762,8 @@ public void run() {
         idleProcessCheck(() -> {
           return timeSinceLastCompletion.get() == 0
               /* Never started a compaction */ || (timeSinceLastCompletion.get() > 0
-              && (System.nanoTime() - timeSinceLastCompletion.get()) > idleReportingPeriodNanos);
+                  && (System.nanoTime() - timeSinceLastCompletion.get())
+                      > idleReportingPeriodNanos);
         });
         currentCompactionId.set(null);
         err.set(null);
@@ -792,9 +787,8 @@ public void run() {
             continue;
           }
           if (!job.getExternalCompactionId().equals(currentCompactionId.get().toString())) {
-            throw new IllegalStateException(
-                "Returned eci " + job.getExternalCompactionId() + " does not match supplied eci "
-                    + currentCompactionId.get());
+            throw new IllegalStateException("Returned eci " + job.getExternalCompactionId()
+                + " does not match supplied eci " + currentCompactionId.get());
           }
         } catch (RetriesExceededException e2) {
           LOG.warn("Retries exceeded getting next job. Retrying...");
@@ -873,15 +867,14 @@ public void run() {
             checkIfCanceled();
           }
 
-          if (compactionThread.isInterrupted() || JOB_HOLDER.isCancelled() || (err.get() != null
-              && err.get().getClass().equals(InterruptedException.class))) {
+          if (compactionThread.isInterrupted() || JOB_HOLDER.isCancelled()
+              || (err.get() != null && err.get().getClass().equals(InterruptedException.class))) {
             LOG.warn("Compaction thread was interrupted, sending CANCELLED state");
             try {
-              PCompactionStatusUpdate update =
-                  PCompactionStatusUpdate.newBuilder().setState(PCompactionState.CANCELLED)
-                      .setMessage("Compaction cancelled").setEntriesToBeCompacted(-1)
-                      .setEntriesRead(-1).setEntriesWritten(-1)
-                      .setCompactionAgeNanos(fcr.getCompactionAge().toNanos()).build();
+              PCompactionStatusUpdate update = PCompactionStatusUpdate.newBuilder()
+                  .setState(PCompactionState.CANCELLED).setMessage("Compaction cancelled")
+                  .setEntriesToBeCompacted(-1).setEntriesRead(-1).setEntriesWritten(-1)
+                  .setCompactionAgeNanos(fcr.getCompactionAge().toNanos()).build();
 
               updateCompactionState(job, update);
               updateCompactionFailed(job);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index df1ba36808b..855e8771164 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@ -1053,8 +1053,8 @@ public void run() {
         HighlyAvailableServiceWrapper.service(managerClientHandler, this);
 
     ServerAddress sa;
-    var processor = ThriftProcessorTypes.getManagerTProcessor(fateServiceHandler,
-         haProxy, getContext());
+    var processor =
+        ThriftProcessorTypes.getManagerTProcessor(fateServiceHandler, haProxy, getContext());
 
     try {
       sa = TServerUtils.startServer(context, getHostname(), Property.MANAGER_CLIENTPORT, processor,
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
index ab3509c77d9..81bd4954eb6 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -61,20 +61,13 @@
 import org.apache.accumulo.core.client.admin.CompactionConfig;
 import org.apache.accumulo.core.client.admin.compaction.CompactableFile;
 import org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode;
-import org.apache.accumulo.core.clientImpl.thrift.TInfo;
 import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
 import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException;
-import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService;
-import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
-import org.apache.accumulo.core.compaction.thrift.TExternalCompactionList;
-import org.apache.accumulo.core.compaction.thrift.TNextCompactionJob;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.NamespaceId;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
-import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent;
 import org.apache.accumulo.core.fate.Fate;
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.FateInstanceType;
@@ -96,11 +89,9 @@
 import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
 import org.apache.accumulo.core.metadata.schema.filters.HasExternalCompactionsFilter;
 import org.apache.accumulo.core.metrics.MetricsProducer;
-import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
 import org.apache.accumulo.core.spi.compaction.CompactionJob;
 import org.apache.accumulo.core.spi.compaction.CompactionKind;
 import org.apache.accumulo.core.spi.compaction.CompactorGroupId;
-import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats;
 import org.apache.accumulo.core.util.Retry;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.util.cache.Caches.CacheName;
@@ -142,7 +133,6 @@
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.thrift.TException;
 import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
index 1eaedbdfb24..c2030a9e5b6 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
@@ -49,8 +49,6 @@
 import java.util.stream.Collectors;
 
 import org.apache.accumulo.core.client.admin.CompactionConfig;
-import org.apache.accumulo.core.clientImpl.thrift.TInfo;
-import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.TableId;
@@ -76,7 +74,6 @@
 import org.apache.accumulo.core.spi.compaction.CompactionJob;
 import org.apache.accumulo.core.spi.compaction.CompactionKind;
 import org.apache.accumulo.core.spi.compaction.CompactorGroupId;
-import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats;
 import org.apache.accumulo.core.trace.TraceUtil;
 import org.apache.accumulo.core.util.cache.Caches;
 import org.apache.accumulo.core.util.compaction.CompactionJobImpl;
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 46e3a1df356..078578e0b02 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -48,6 +48,10 @@
       com.google.guava
       guava
     
+    
+      io.grpc
+      grpc-api
+    
     
       jakarta.inject
       jakarta.inject-api
@@ -72,6 +76,10 @@
       org.apache.accumulo
       accumulo-core
     
+    
+      org.apache.accumulo
+      accumulo-grpc
+    
     
       org.apache.accumulo
       accumulo-server-base
diff --git a/test/pom.xml b/test/pom.xml
index c6fd2364ac4..f16a3ba5614 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -62,6 +62,10 @@
       commons-io
       commons-io
     
+    
+      io.grpc
+      grpc-api
+    
     
       io.micrometer
       micrometer-core

From fc8411fc9b84298126b33535dfb1d2a81ecf1dc3 Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Sun, 21 Jul 2024 11:17:51 -0400
Subject: [PATCH 23/25] fix test

---
 .../manager/compaction/CompactionCoordinatorTest.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
index c2030a9e5b6..484359898d7 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
@@ -268,8 +268,8 @@ public void testCoordinatorRestartOneRunningCompaction() throws Exception {
 
     List runningCompactions = new ArrayList<>();
     ExternalCompactionId eci = ExternalCompactionId.generate(UUID.randomUUID());
-    PExternalCompactionJob job = EasyMock.createNiceMock(PExternalCompactionJob.class);
-    expect(job.getExternalCompactionId()).andReturn(eci.toString()).anyTimes();
+    PExternalCompactionJob job =
+        PExternalCompactionJob.newBuilder().setExternalCompactionId(eci.canonical()).build();
     TKeyExtent extent = new TKeyExtent();
     extent.setTable("1".getBytes());
     runningCompactions.add(new RunningCompaction(job, tserverAddr.toString(), GROUP_ID.toString()));
@@ -280,7 +280,7 @@ public void testCoordinatorRestartOneRunningCompaction() throws Exception {
     expect(manager.getSteadyTime()).andReturn(SteadyTime.from(100000, TimeUnit.NANOSECONDS))
         .anyTimes();
 
-    EasyMock.replay(context, job, security, manager);
+    EasyMock.replay(context, security, manager);
 
     var coordinator = new TestCoordinator(context, security, runningCompactions, manager);
     coordinator.resetInternals();
@@ -298,7 +298,7 @@ public void testCoordinatorRestartOneRunningCompaction() throws Exception {
     assertEquals(GROUP_ID.toString(), rc.getGroupName());
     assertEquals(tserverAddr.toString(), rc.getCompactorAddress());
 
-    EasyMock.verify(context, job, security);
+    EasyMock.verify(context, security);
   }
 
   @Test

From 66cb2cf3e9dcd611ce9eaa2eba950be609959d5d Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Sat, 17 Aug 2024 13:22:53 -0400
Subject: [PATCH 24/25] Add initial support for TLS for server/client

---
 core/pom.xml                                  |  9 +--
 .../accumulo/core/rpc/grpc/GrpcUtil.java      | 77 +++++++++++++++++--
 server/base/pom.xml                           |  4 +
 .../CompactionCoordinatorServiceServer.java   | 17 +++-
 4 files changed, 95 insertions(+), 12 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 2490397c9aa..991c6b199f8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -77,6 +77,10 @@
       io.grpc
       grpc-api
     
+    
+      io.grpc
+      grpc-netty-shaded
+    
     
       io.micrometer
       micrometer-core
@@ -149,11 +153,6 @@
       org.yaml
       snakeyaml
     
-    
-      io.grpc
-      grpc-netty-shaded
-      runtime
-    
     
       org.apache.hadoop
       hadoop-client-runtime
diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/grpc/GrpcUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/grpc/GrpcUtil.java
index 6688090c661..527b5fa871e 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/grpc/GrpcUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/grpc/GrpcUtil.java
@@ -18,18 +18,35 @@
  */
 package org.apache.accumulo.core.rpc.grpc;
 
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManagerFactory;
+
 import org.apache.accumulo.core.clientImpl.ClientContext;
 import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.rpc.SslConnectionParams;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.RemovalListener;
+import com.google.common.base.Preconditions;
 import com.google.common.net.HostAndPort;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import io.grpc.ChannelCredentials;
+import io.grpc.Grpc;
+import io.grpc.InsecureChannelCredentials;
 import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
+import io.grpc.netty.shaded.io.grpc.netty.NettySslContextChannelCredentials;
+import io.grpc.netty.shaded.io.netty.handler.ssl.ClientAuth;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContextBuilder;
 
 public class GrpcUtil {
 
@@ -46,15 +63,63 @@ public class GrpcUtil {
       }).build();
 
   public static ManagedChannel getChannel(HostAndPort hostAndPort, ClientContext context) {
+    ChannelCredentials credentials =
+        Optional.ofNullable(SslConnectionParams.forClient(context.getConfiguration()))
+            .map(sslParams -> NettySslContextChannelCredentials
+                .create(GrpcUtil.buildSslContext(sslParams, false)))
+            .orElse(InsecureChannelCredentials.create());
+
     // TODO: we are just using the config for now for the Port as we need to update ZK to
     // store the new gRPC port for the service as currently this is just the Thrift port
     return grpcChannels.get(hostAndPort,
-        hp -> ManagedChannelBuilder
-            .forAddress(hp.getHost(),
+        hp -> Grpc
+            .newChannelBuilderForAddress(hp.getHost(),
                 context.getConfiguration().getPortStream(Property.MANAGER_GRPC_CLIENTPORT)
-                    .findFirst().orElseThrow())
-            .idleTimeout(context.getClientTimeoutInMillis(), TimeUnit.MILLISECONDS).usePlaintext()
-            .build());
+                    .findFirst().orElseThrow(),
+                credentials)
+            .idleTimeout(context.getClientTimeoutInMillis(), TimeUnit.MILLISECONDS).build());
   }
 
+  // TODO: This builds the SSL context but still needs to be tested that everything works
+  // for client and server
+  @SuppressFBWarnings(value = "PATH_TRAVERSAL_IN",
+      justification = "code runs in same security context as user who providing the keystore file")
+  public static SslContext buildSslContext(SslConnectionParams sslParams, boolean server) {
+    Preconditions.checkArgument(!server || sslParams.isKeyStoreSet(),
+        "KeyStore must be set on the server.");
+
+    try {
+      KeyManagerFactory kmf = null;
+      if (sslParams.isKeyStoreSet()) {
+        KeyStore keyStore = KeyStore.getInstance(sslParams.getKeyStoreType());
+        try (FileInputStream fis = new FileInputStream(sslParams.getKeyStorePath())) {
+          keyStore.load(fis, sslParams.getKeyStorePass().toCharArray());
+        }
+        kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+        kmf.init(keyStore, sslParams.getKeyStorePass().toCharArray());
+      }
+
+      final var sslContextBuilder =
+          server ? SslContextBuilder.forServer(kmf) : SslContextBuilder.forClient();
+      sslContextBuilder.protocols(sslParams.getServerProtocols());
+
+      if (sslParams.isTrustStoreSet()) {
+        KeyStore trustStore = KeyStore.getInstance(sslParams.getTrustStoreType());
+        try (FileInputStream fis = new FileInputStream(sslParams.getTrustStorePath())) {
+          trustStore.load(fis, sslParams.getTrustStorePass().toCharArray());
+        }
+        var tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        tmf.init(trustStore);
+        sslContextBuilder.trustManager(tmf);
+      }
+
+      if (sslParams.isClientAuth()) {
+        sslContextBuilder.clientAuth(ClientAuth.REQUIRE);
+      }
+
+      return sslContextBuilder.build();
+    } catch (GeneralSecurityException | IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
 }
diff --git a/server/base/pom.xml b/server/base/pom.xml
index eeeded9cbbb..2798962bdd0 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -44,6 +44,10 @@
       auto-service
       true
     
+    
+      io.grpc
+      grpc-netty-shaded
+    
     
       com.google.code.gson
       gson
diff --git a/server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java b/server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java
index ba72fa61219..e8ff1b95a93 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/grpc/CompactionCoordinatorServiceServer.java
@@ -19,9 +19,12 @@
 package org.apache.accumulo.server.grpc;
 
 import java.io.IOException;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.accumulo.core.rpc.grpc.GrpcUtil;
 import org.apache.accumulo.grpc.compaction.protobuf.CompactionCoordinatorServiceGrpc;
+import org.apache.accumulo.server.ServerContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,6 +32,7 @@
 import io.grpc.InsecureServerCredentials;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
+import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
 
 /**
  * Simple wrapper to start/stop the grpc server
@@ -50,7 +54,18 @@ public CompactionCoordinatorServiceServer(
   public CompactionCoordinatorServiceServer(ServerBuilder serverBuilder,
       CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceImplBase service, int port) {
     this.port = port;
-    server = serverBuilder.addService(service).build();
+    this.server = serverBuilder.addService(service).build();
+  }
+
+  public CompactionCoordinatorServiceServer(ServerContext context,
+      CompactionCoordinatorServiceGrpc.CompactionCoordinatorServiceImplBase service, int port) {
+    this.port = port;
+    var serverBuilder = NettyServerBuilder.forPort(port);
+
+    Optional.ofNullable(context.getServerSslParams()).ifPresent(
+        sslParams -> serverBuilder.sslContext(GrpcUtil.buildSslContext(sslParams, true)));
+
+    this.server = serverBuilder.addService(service).build();
   }
 
   public void start() throws IOException {

From fa3a8b6c58e290fe905bad54d1e0fe4b7b55e3e0 Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon" 
Date: Sat, 17 Aug 2024 13:50:21 -0400
Subject: [PATCH 25/25] fix formatting

---
 server/base/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/base/pom.xml b/server/base/pom.xml
index 2798962bdd0..9da948f333c 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -44,10 +44,6 @@
       auto-service
       true
     
-    
-      io.grpc
-      grpc-netty-shaded
-    
     
       com.google.code.gson
       gson
@@ -68,6 +64,10 @@
       io.grpc
       grpc-api
     
+    
+      io.grpc
+      grpc-netty-shaded
+    
     
       io.micrometer
       micrometer-core