honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert index and persistent actions/response to writeable (#44582) (#44601) 

This commit converts several more classes from streamable to writeable
in server, mostly within the o.e.index and o.e.persistent packages.

relates #34389
This commit is contained in:
Ryan Ernst 2019-07-18 18:32:09 -07:00 committed by GitHub
parent 03f5084ac7
commit 13f46aa801
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 122 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/NoopBulkAction.java
View File

@ -18,20 +18,15 @@
*/
package org.elasticsearch.plugin.noop.action.bulk;
import org.elasticsearch.action.StreamableResponseActionType;
import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.bulk.BulkResponse;
public class NoopBulkAction extends StreamableResponseActionType<BulkResponse> {
public class NoopBulkAction extends ActionType<BulkResponse> {
public static final String NAME = "mock:data/write/bulk";
public static final NoopBulkAction INSTANCE = new NoopBulkAction();
private NoopBulkAction() {
super(NAME);
}
@Override
public BulkResponse newResponse() {
return new BulkResponse(null, 0);
super(NAME, BulkResponse::new);
}
}

2
client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/TransportNoopBulkAction.java
View File

@ -38,7 +38,7 @@ public class TransportNoopBulkAction extends HandledTransportAction<BulkRequest,
@Inject
public TransportNoopBulkAction(TransportService transportService, ActionFilters actionFilters) {
super(NoopBulkAction.NAME, transportService, BulkRequest::new, actionFilters);
super(NoopBulkAction.NAME, transportService, actionFilters, BulkRequest::new);
}
@Override

4
client/rest-high-level/src/test/java/org/elasticsearch/client/BulkRequestWithGlobalParametersIT.java
View File

@ -170,7 +170,7 @@ public class BulkRequestWithGlobalParametersIT extends ESRestHighLevelClientTest
public void testGlobalRouting() throws IOException {
createIndexWithMultipleShards("index");
BulkRequest request = new BulkRequest(null);
BulkRequest request = new BulkRequest((String) null);
request.add(new IndexRequest("index").id("1")
.source(XContentType.JSON, "field", "bulk1"));
request.add(new IndexRequest("index").id("2")
@ -186,7 +186,7 @@ public class BulkRequestWithGlobalParametersIT extends ESRestHighLevelClientTest
}
public void testMixLocalAndGlobalRouting() throws IOException {
BulkRequest request = new BulkRequest(null);
BulkRequest request = new BulkRequest((String) null);
request.routing("globalRouting");
request.add(new IndexRequest("index").id("1")
.source(XContentType.JSON, "field", "bulk1"));

11
server/src/main/java/org/elasticsearch/action/bulk/BulkAction.java
View File

@ -19,22 +19,17 @@
package org.elasticsearch.action.bulk;
import org.elasticsearch.action.StreamableResponseActionType;
import org.elasticsearch.action.ActionType;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.transport.TransportRequestOptions;
public class BulkAction extends StreamableResponseActionType<BulkResponse> {
public class BulkAction extends ActionType<BulkResponse> {
public static final BulkAction INSTANCE = new BulkAction();
public static final String NAME = "indices:data/write/bulk";
private BulkAction() {
super(NAME);
}
@Override
public BulkResponse newResponse() {
return new BulkResponse();
super(NAME, BulkResponse::new);
}
@Override

21
server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
View File

@ -78,7 +78,17 @@ public class BulkRequest extends ActionRequest implements CompositeIndicesReques
private long sizeInBytes = 0;
public BulkRequest() {
public BulkRequest() {}
public BulkRequest(StreamInput in) throws IOException {
super(in);
waitForActiveShards = ActiveShardCount.readFrom(in);
int size = in.readVInt();
for (int i = 0; i < size; i++) {
requests.add(DocWriteRequest.readDocumentRequest(in));
}
refreshPolicy = RefreshPolicy.readFrom(in);
timeout = in.readTimeValue();
}
public BulkRequest(@Nullable String globalIndex) {
@ -391,14 +401,7 @@ public class BulkRequest extends ActionRequest implements CompositeIndicesReques
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
waitForActiveShards = ActiveShardCount.readFrom(in);
int size = in.readVInt();
for (int i = 0; i < size; i++) {
requests.add(DocWriteRequest.readDocumentRequest(in));
}
refreshPolicy = RefreshPolicy.readFrom(in);
timeout = in.readTimeValue();
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
}
@Override

19
server/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java
View File

@ -56,7 +56,16 @@ public class BulkResponse extends ActionResponse implements Iterable<BulkItemRes
private long tookInMillis;
private long ingestTookInMillis;
BulkResponse() {
BulkResponse() {}
public BulkResponse(StreamInput in) throws IOException {
super(in);
responses = new BulkItemResponse[in.readVInt()];
for (int i = 0; i < responses.length; i++) {
responses[i] = BulkItemResponse.readBulkItem(in);
}
tookInMillis = in.readVLong();
ingestTookInMillis = in.readZLong();
}
public BulkResponse(BulkItemResponse[] responses, long tookInMillis) {
@ -131,13 +140,7 @@ public class BulkResponse extends ActionResponse implements Iterable<BulkItemRes
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
responses = new BulkItemResponse[in.readVInt()];
for (int i = 0; i < responses.length; i++) {
responses[i] = BulkItemResponse.readBulkItem(in);
}
tookInMillis = in.readVLong();
ingestTookInMillis = in.readZLong();
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
}
@Override

2
server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
View File

@ -116,7 +116,7 @@ public class TransportBulkAction extends HandledTransportAction<BulkRequest, Bul
TransportShardBulkAction shardBulkAction, NodeClient client,
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver,
AutoCreateIndex autoCreateIndex, LongSupplier relativeTimeProvider) {
super(BulkAction.NAME, transportService, BulkRequest::new, actionFilters, ThreadPool.Names.WRITE);
super(BulkAction.NAME, transportService, actionFilters, BulkRequest::new, ThreadPool.Names.WRITE);
Objects.requireNonNull(relativeTimeProvider);
this.threadPool = threadPool;
this.clusterService = clusterService;

11
server/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java
View File

@ -64,17 +64,6 @@ public abstract class HandledTransportAction<Request extends ActionRequest, Resp
new TransportHandler());
}
/**
* @deprecated Use {@link #HandledTransportAction(String, boolean, TransportService, ActionFilters, Writeable.Reader, String)} instead.
*/
@Deprecated
protected HandledTransportAction(String actionName, TransportService transportService, Supplier<Request> request,
ActionFilters actionFilters, String executor) {
super(actionName, actionFilters, transportService.getTaskManager());
transportService.registerRequestHandler(actionName, request, executor, false, true,
new TransportHandler());
}
protected HandledTransportAction(String actionName, boolean canTripCircuitBreaker,
TransportService transportService, ActionFilters actionFilters,
Writeable.Reader<Request> requestReader) {

28
server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java
View File

@ -115,10 +115,18 @@ public abstract class AbstractBulkByScrollRequest<Self extends AbstractBulkByScr
*/
private int slices = DEFAULT_SLICES;
/**
* Constructor for deserialization.
*/
public AbstractBulkByScrollRequest() {
public AbstractBulkByScrollRequest(StreamInput in) throws IOException {
super(in);
searchRequest = new SearchRequest(in);
abortOnVersionConflict = in.readBoolean();
maxDocs = in.readVInt();
refresh = in.readBoolean();
timeout = in.readTimeValue();
activeShardCount = ActiveShardCount.readFrom(in);
retryBackoffInitialTime = in.readTimeValue();
maxRetries = in.readVInt();
requestsPerSecond = in.readFloat();
slices = in.readVInt();
}
/**
@ -449,17 +457,7 @@ public abstract class AbstractBulkByScrollRequest<Self extends AbstractBulkByScr
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
searchRequest = new SearchRequest(in);
abortOnVersionConflict = in.readBoolean();
maxDocs = in.readVInt();
refresh = in.readBoolean();
timeout = in.readTimeValue();
activeShardCount = ActiveShardCount.readFrom(in);
retryBackoffInitialTime = in.readTimeValue();
maxRetries = in.readVInt();
requestsPerSecond = in.readFloat();
slices = in.readVInt();
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
}
@Override

14
server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java
View File

@ -35,10 +35,11 @@ public abstract class AbstractBulkIndexByScrollRequest<Self extends AbstractBulk
*/
private Script script;
/**
* Constructor for deserialization.
*/
public AbstractBulkIndexByScrollRequest() {
public AbstractBulkIndexByScrollRequest(StreamInput in) throws IOException {
super(in);
if (in.readBoolean()) {
script = new Script(in);
}
}
/**
@ -74,10 +75,7 @@ public abstract class AbstractBulkIndexByScrollRequest<Self extends AbstractBulk
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
if (in.readBoolean()) {
script = new Script(in);
}
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
}
@Override

2
server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequest.java
View File

@ -66,7 +66,7 @@ public class DeleteByQueryRequest extends AbstractBulkByScrollRequest<DeleteByQu
}
public DeleteByQueryRequest(StreamInput in) throws IOException {
super.readFrom(in);
super(in);
}
private DeleteByQueryRequest(SearchRequest search, boolean setDefaults) {

2
server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java
View File

@ -86,7 +86,7 @@ public class ReindexRequest extends AbstractBulkIndexByScrollRequest<ReindexRequ
}
public ReindexRequest(StreamInput in) throws IOException {
super.readFrom(in);
super(in);
destination = new IndexRequest(in);
remoteInfo = in.readOptionalWriteable(RemoteInfo::new);
}

2
server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java
View File

@ -57,7 +57,7 @@ public class UpdateByQueryRequest extends AbstractBulkIndexByScrollRequest<Updat
}
public UpdateByQueryRequest(StreamInput in) throws IOException {
super.readFrom(in);
super(in);
pipeline = in.readOptionalString();
}

35
server/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseActions.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.index.seqno;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.StreamableResponseActionType;
import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.single.shard.SingleShardRequest;
import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;
@ -123,13 +123,13 @@ public class RetentionLeaseActions {
}
public static class Add extends StreamableResponseActionType<Response> {
public static class Add extends ActionType<Response> {
public static final Add INSTANCE = new Add();
public static final String ACTION_NAME = "indices:admin/seq_no/add_retention_lease";
private Add() {
super(ACTION_NAME);
super(ACTION_NAME, Response::new);
}
public static class TransportAction extends TransportRetentionLeaseAction<AddRequest> {
@ -168,21 +168,15 @@ public class RetentionLeaseActions {
}
}
@Override
public Response newResponse() {
return new Response();
}
}
public static class Renew extends StreamableResponseActionType<Response> {
public static class Renew extends ActionType<Response> {
public static final Renew INSTANCE = new Renew();
public static final String ACTION_NAME = "indices:admin/seq_no/renew_retention_lease";
private Renew() {
super(ACTION_NAME);
super(ACTION_NAME, Response::new);
}
public static class TransportAction extends TransportRetentionLeaseAction<RenewRequest> {
@ -214,21 +208,15 @@ public class RetentionLeaseActions {
}
}
@Override
public Response newResponse() {
return new Response();
}
}
public static class Remove extends StreamableResponseActionType<Response> {
public static class Remove extends ActionType<Response> {
public static final Remove INSTANCE = new Remove();
public static final String ACTION_NAME = "indices:admin/seq_no/remove_retention_lease";
private Remove() {
super(ACTION_NAME);
super(ACTION_NAME, Response::new);
}
public static class TransportAction extends TransportRetentionLeaseAction<RemoveRequest> {
@ -261,12 +249,6 @@ public class RetentionLeaseActions {
}
}
@Override
public Response newResponse() {
return new Response();
}
}
private abstract static class Request<T extends SingleShardRequest<T>> extends SingleShardRequest<T> {
@ -385,8 +367,7 @@ public class RetentionLeaseActions {
public static class Response extends ActionResponse {
public Response() {
}
public Response() {}
Response(final StreamInput in) throws IOException {
super(in);

19
server/src/main/java/org/elasticsearch/persistent/CompletionPersistentTaskAction.java
View File

@ -20,11 +20,11 @@ package org.elasticsearch.persistent;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.StreamableResponseActionType;
import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.elasticsearch.action.support.master.MasterNodeRequest;
import org.elasticsearch.action.support.master.StreamableTransportMasterNodeAction;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
@ -46,18 +46,13 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
* ActionType that is used by executor node to indicate that the persistent action finished or failed on the node and needs to be
* removed from the cluster state in case of successful completion or restarted on some other node in case of failure.
*/
public class CompletionPersistentTaskAction extends StreamableResponseActionType<PersistentTaskResponse> {
public class CompletionPersistentTaskAction extends ActionType<PersistentTaskResponse> {
public static final CompletionPersistentTaskAction INSTANCE = new CompletionPersistentTaskAction();
public static final String NAME = "cluster:admin/persistent/completion";
private CompletionPersistentTaskAction() {
super(NAME);
}
@Override
public PersistentTaskResponse newResponse() {
return new PersistentTaskResponse();
super(NAME, PersistentTaskResponse::new);
}
public static class Request extends MasterNodeRequest<Request> {
@ -127,7 +122,7 @@ public class CompletionPersistentTaskAction extends StreamableResponseActionType
}
}
public static class TransportAction extends StreamableTransportMasterNodeAction<Request, PersistentTaskResponse> {
public static class TransportAction extends TransportMasterNodeAction<Request, PersistentTaskResponse> {
private final PersistentTasksClusterService persistentTasksClusterService;
@ -147,8 +142,8 @@ public class CompletionPersistentTaskAction extends StreamableResponseActionType
}
@Override
protected PersistentTaskResponse newResponse() {
return new PersistentTaskResponse();
protected PersistentTaskResponse read(StreamInput in) throws IOException {
return new PersistentTaskResponse(in);
}
@Override

8
server/src/main/java/org/elasticsearch/persistent/PersistentTaskResponse.java
View File

@ -32,8 +32,9 @@ import java.util.Objects;
public class PersistentTaskResponse extends ActionResponse {
private PersistentTask<?> task;
public PersistentTaskResponse() {
super();
public PersistentTaskResponse(StreamInput in) throws IOException {
super(in);
task = in.readOptionalWriteable(PersistentTask::new);
}
public PersistentTaskResponse(PersistentTask<?> task) {
@ -42,8 +43,7 @@ public class PersistentTaskResponse extends ActionResponse {
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
task = in.readOptionalWriteable(PersistentTask::new);
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
}
@Override

19
server/src/main/java/org/elasticsearch/persistent/RemovePersistentTaskAction.java
View File

@ -20,11 +20,11 @@ package org.elasticsearch.persistent;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.StreamableResponseActionType;
import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.elasticsearch.action.support.master.MasterNodeRequest;
import org.elasticsearch.action.support.master.StreamableTransportMasterNodeAction;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
@ -40,18 +40,13 @@ import org.elasticsearch.transport.TransportService;
import java.io.IOException;
import java.util.Objects;
public class RemovePersistentTaskAction extends StreamableResponseActionType<PersistentTaskResponse> {
public class RemovePersistentTaskAction extends ActionType<PersistentTaskResponse> {
public static final RemovePersistentTaskAction INSTANCE = new RemovePersistentTaskAction();
public static final String NAME = "cluster:admin/persistent/remove";
private RemovePersistentTaskAction() {
super(NAME);
}
@Override
public PersistentTaskResponse newResponse() {
return new PersistentTaskResponse();
super(NAME, PersistentTaskResponse::new);
}
public static class Request extends MasterNodeRequest<Request> {
@ -112,7 +107,7 @@ public class RemovePersistentTaskAction extends StreamableResponseActionType<Per
}
public static class TransportAction extends StreamableTransportMasterNodeAction<Request, PersistentTaskResponse> {
public static class TransportAction extends TransportMasterNodeAction<Request, PersistentTaskResponse> {
private final PersistentTasksClusterService persistentTasksClusterService;
@ -132,8 +127,8 @@ public class RemovePersistentTaskAction extends StreamableResponseActionType<Per
}
@Override
protected PersistentTaskResponse newResponse() {
return new PersistentTaskResponse();
protected PersistentTaskResponse read(StreamInput in) throws IOException {
return new PersistentTaskResponse(in);
}
@Override

19
server/src/main/java/org/elasticsearch/persistent/StartPersistentTaskAction.java
View File

@ -21,11 +21,11 @@ package org.elasticsearch.persistent;
import org.elasticsearch.Version;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.StreamableResponseActionType;
import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.elasticsearch.action.support.master.MasterNodeRequest;
import org.elasticsearch.action.support.master.StreamableTransportMasterNodeAction;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
@ -47,18 +47,13 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
/**
* This action can be used to add the record for the persistent action to the cluster state.
*/
public class StartPersistentTaskAction extends StreamableResponseActionType<PersistentTaskResponse> {
public class StartPersistentTaskAction extends ActionType<PersistentTaskResponse> {
public static final StartPersistentTaskAction INSTANCE = new StartPersistentTaskAction();
public static final String NAME = "cluster:admin/persistent/start";
private StartPersistentTaskAction() {
super(NAME);
}
@Override
public PersistentTaskResponse newResponse() {
return new PersistentTaskResponse();
super(NAME, PersistentTaskResponse::new);
}
public static class Request extends MasterNodeRequest<Request> {
@ -183,7 +178,7 @@ public class StartPersistentTaskAction extends StreamableResponseActionType<Pers
}
public static class TransportAction extends StreamableTransportMasterNodeAction<Request, PersistentTaskResponse> {
public static class TransportAction extends TransportMasterNodeAction<Request, PersistentTaskResponse> {
private final PersistentTasksClusterService persistentTasksClusterService;
@ -208,8 +203,8 @@ public class StartPersistentTaskAction extends StreamableResponseActionType<Pers
}
@Override
protected PersistentTaskResponse newResponse() {
return new PersistentTaskResponse();
protected PersistentTaskResponse read(StreamInput in) throws IOException {
return new PersistentTaskResponse(in);
}
@Override

19
server/src/main/java/org/elasticsearch/persistent/UpdatePersistentTaskStatusAction.java
View File

@ -20,11 +20,11 @@ package org.elasticsearch.persistent;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.StreamableResponseActionType;
import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
import org.elasticsearch.action.support.master.MasterNodeRequest;
import org.elasticsearch.action.support.master.StreamableTransportMasterNodeAction;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
@ -42,18 +42,13 @@ import java.util.Objects;
import static org.elasticsearch.action.ValidateActions.addValidationError;
public class UpdatePersistentTaskStatusAction extends StreamableResponseActionType<PersistentTaskResponse> {
public class UpdatePersistentTaskStatusAction extends ActionType<PersistentTaskResponse> {
public static final UpdatePersistentTaskStatusAction INSTANCE = new UpdatePersistentTaskStatusAction();
public static final String NAME = "cluster:admin/persistent/update_status";
private UpdatePersistentTaskStatusAction() {
super(NAME);
}
@Override
public PersistentTaskResponse newResponse() {
return new PersistentTaskResponse();
super(NAME, PersistentTaskResponse::new);
}
public static class Request extends MasterNodeRequest<Request> {
@ -143,7 +138,7 @@ public class UpdatePersistentTaskStatusAction extends StreamableResponseActionTy
}
}
public static class TransportAction extends StreamableTransportMasterNodeAction<Request, PersistentTaskResponse> {
public static class TransportAction extends TransportMasterNodeAction<Request, PersistentTaskResponse> {
private final PersistentTasksClusterService persistentTasksClusterService;
@ -163,8 +158,8 @@ public class UpdatePersistentTaskStatusAction extends StreamableResponseActionTy
}
@Override
protected PersistentTaskResponse newResponse() {
return new PersistentTaskResponse();
protected PersistentTaskResponse read(StreamInput in) throws IOException {
return new PersistentTaskResponse(in);
}
@Override

19
server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java
View File

@ -30,7 +30,7 @@ import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.MasterNodeRequest;
import org.elasticsearch.action.support.master.StreamableTransportMasterNodeAction;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.cluster.ClusterChangedEvent;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateListener;
@ -506,9 +506,7 @@ public class SnapshotShardsService extends AbstractLifecycleComponent implements
new TransportResponseHandler<UpdateIndexShardSnapshotStatusResponse>() {
@Override
public UpdateIndexShardSnapshotStatusResponse read(StreamInput in) throws IOException {
final UpdateIndexShardSnapshotStatusResponse response = new UpdateIndexShardSnapshotStatusResponse();
response.readFrom(in);
return response;
return new UpdateIndexShardSnapshotStatusResponse(in);
}
@Override
@ -606,12 +604,19 @@ public class SnapshotShardsService extends AbstractLifecycleComponent implements
}
static class UpdateIndexShardSnapshotStatusResponse extends ActionResponse {
UpdateIndexShardSnapshotStatusResponse() {}
UpdateIndexShardSnapshotStatusResponse(StreamInput in) throws IOException {
super(in);
}
@Override
public void writeTo(StreamOutput out) throws IOException {}
}
private class UpdateSnapshotStatusAction
extends StreamableTransportMasterNodeAction<UpdateIndexShardSnapshotStatusRequest, UpdateIndexShardSnapshotStatusResponse> {
extends TransportMasterNodeAction<UpdateIndexShardSnapshotStatusRequest, UpdateIndexShardSnapshotStatusResponse> {
UpdateSnapshotStatusAction(TransportService transportService, ClusterService clusterService,
ThreadPool threadPool, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
super(
@ -626,8 +631,8 @@ public class SnapshotShardsService extends AbstractLifecycleComponent implements
}
@Override
protected UpdateIndexShardSnapshotStatusResponse newResponse() {
return new UpdateIndexShardSnapshotStatusResponse();
protected UpdateIndexShardSnapshotStatusResponse read(StreamInput in) throws IOException {
return new UpdateIndexShardSnapshotStatusResponse(in);
}
@Override

11
server/src/test/java/org/elasticsearch/persistent/PersistentTasksExecutorResponseTests.java
View File

@ -20,14 +20,15 @@ package org.elasticsearch.persistent;
import org.elasticsearch.common.UUIDs;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.test.AbstractStreamableTestCase;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.persistent.PersistentTasksCustomMetaData.PersistentTask;
import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestPersistentTasksExecutor;
import org.elasticsearch.test.AbstractWireSerializingTestCase;
import java.util.Collections;
public class PersistentTasksExecutorResponseTests extends AbstractStreamableTestCase<PersistentTaskResponse> {
public class PersistentTasksExecutorResponseTests extends AbstractWireSerializingTestCase<PersistentTaskResponse> {
@Override
protected PersistentTaskResponse createTestInstance() {
@ -37,13 +38,13 @@ public class PersistentTasksExecutorResponseTests extends AbstractStreamableTest
new TestPersistentTasksPlugin.TestParams("test"),
randomLong(), PersistentTasksCustomMetaData.INITIAL_ASSIGNMENT));
} else {
return new PersistentTaskResponse(null);
return new PersistentTaskResponse((PersistentTask<?>) null);
}
}
@Override
protected PersistentTaskResponse createBlankInstance() {
return new PersistentTaskResponse();
protected Writeable.Reader<PersistentTaskResponse> instanceReader() {
return PersistentTaskResponse::new;
}
@Override

18
x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/PutWatchRequest.java
View File

@ -42,7 +42,14 @@ public final class PutWatchRequest extends ActionRequest {
public PutWatchRequest() {}
public PutWatchRequest(StreamInput in) throws IOException {
readFrom(in);
super(in);
id = in.readString();
source = in.readBytesReference();
active = in.readBoolean();
xContentType = in.readEnum(XContentType.class);
version = in.readZLong();
ifSeqNo = in.readZLong();
ifPrimaryTerm = in.readVLong();
}
public PutWatchRequest(String id, BytesReference source, XContentType xContentType) {
@ -53,14 +60,7 @@ public final class PutWatchRequest extends ActionRequest {
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
id = in.readString();
source = in.readBytesReference();
active = in.readBoolean();
xContentType = in.readEnum(XContentType.class);
version = in.readZLong();
ifSeqNo = in.readZLong();
ifPrimaryTerm = in.readVLong();
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
}
@Override