Refactor REST get view to actually return the view

Author: craigtaverner

x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java

@@ -618,6 +618,25 @@ private static void loadView(RestClient client, String viewName, String viewFile
         request.setJsonEntity("{\"query\":\"" + viewQuery.replace("\"", "\\\"").replace("\n", " ") + "\"}");
         Response response = client.performRequest(request);
         logger.info("View creation response: {}", response.getStatusLine());
+        getView(client, viewName, logger);
+    }
+
+    private static boolean getView(RestClient client, String viewName, Logger logger) throws IOException {
+        Request request = new Request("GET", "/_query/view/" + viewName);
+        try {
+            Response response = client.performRequest(request);
+            logger.info("View response status: {}", response.getStatusLine());
+            logger.info("View response body info: {}", response.getEntity());
+            logger.info("View response body: {}", response.getEntity().getContent());
+        } catch (ResponseException e) {
+            logger.info("View error: {}", e.getMessage());
+            int code = e.getResponse().getStatusLine().getStatusCode();
+            if (code == 400 || code == 404) {
+                return false;
+            }
+            throw e;
+        }
+        return true;
     }
 
     private static boolean clusterHasViewSupport(RestClient client, Logger logger) throws IOException {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/view/GetViewAction.java

@@ -6,18 +6,20 @@
  */
 package org.elasticsearch.xpack.esql.view;
 
+import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
-import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.action.support.master.MasterNodeRequest;
+import org.elasticsearch.action.support.TransportAction;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.xcontent.ToXContentObject;
+import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.Objects;
 
-public class GetViewAction extends ActionType<AcknowledgedResponse> {
+public class GetViewAction extends ActionType<GetViewAction.Response> {
 
     public static final GetViewAction INSTANCE = new GetViewAction();
     public static final String NAME = "cluster:admin/xpack/esql/view/get";
@@ -26,17 +28,15 @@ private GetViewAction() {
         super(NAME);
     }
 
-    public static class Request extends MasterNodeRequest<GetViewAction.Request> {
-        private final String name;
+    public static class Request extends ActionRequest {
+        private String name;
 
-        public Request(TimeValue masterNodeTimeout, String name) {
-            super(masterNodeTimeout);
+        public Request(String name) {
             this.name = Objects.requireNonNull(name, "name cannot be null");
         }
 
         public Request(StreamInput in) throws IOException {
             super(in);
-            name = in.readString();
         }
 
         @Override
@@ -67,4 +67,49 @@ public int hashCode() {
             return name.hashCode();
         }
     }
+
+    public static class Response extends ActionResponse implements ToXContentObject {
+
+        private final View view;
+
+        public Response(final View view) {
+            this.view = view;
+        }
+
+        public View getView() {
+            return view;
+        }
+
+        @Override
+        public void writeTo(StreamOutput out) throws IOException {
+            TransportAction.localOnly();
+        }
+
+        @Override
+        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+            view.toXContent(builder, params);
+            return builder;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            return view.equals(((Response) o).view);
+        }
+
+        @Override
+        public int hashCode() {
+            return view.hashCode();
+        }
+
+        @Override
+        public String toString() {
+            return "GetViewAction.Response{view=" + view.toString() + '}';
+        }
+    }
 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/view/RestGetViewAction.java

@@ -10,7 +10,6 @@
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestUtils;
 import org.elasticsearch.rest.Scope;
 import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestToXContentListener;
@@ -33,8 +32,8 @@ public String getName() {
     }
 
     @Override
-    protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
-        GetViewAction.Request req = new GetViewAction.Request(RestUtils.getMasterNodeTimeout(request), request.param("name"));
-        return channel -> client.execute(GetViewAction.INSTANCE, req, new RestToXContentListener<>(channel));
+    protected RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
+        GetViewAction.Request req = new GetViewAction.Request(request.param("name"));
+        return channel -> client.execute(TransportGetViewAction.TYPE, req, new RestToXContentListener<>(channel));
     }
 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/view/TransportGetViewAction.java

@@ -7,60 +7,32 @@
 package org.elasticsearch.xpack.esql.view;
 
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.ActionType;
+import org.elasticsearch.action.admin.cluster.remote.RemoteInfoResponse;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.action.support.master.AcknowledgedTransportMasterNodeAction;
-import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.block.ClusterBlockException;
-import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.service.ClusterService;
+import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.injection.guice.Inject;
 import org.elasticsearch.tasks.Task;
-import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
-import org.elasticsearch.xpack.core.ml.action.InferModelAction;
 
-public class TransportGetViewAction extends AcknowledgedTransportMasterNodeAction<GetViewAction.Request> {
+public class TransportGetViewAction extends HandledTransportAction<GetViewAction.Request, GetViewAction.Response> {
+    public static final ActionType<RemoteInfoResponse> TYPE = new ActionType<>(GetViewAction.NAME);
     private final ViewService viewService;
 
     @Inject
-    public TransportGetViewAction(
-        TransportService transportService,
-        ClusterService clusterService,
-        ThreadPool threadPool,
-        ActionFilters actionFilters,
-        ViewService viewService
-    ) {
-        super(
-            GetViewAction.NAME,
-            transportService,
-            clusterService,
-            threadPool,
-            actionFilters,
-            GetViewAction.Request::new,
-            EsExecutors.DIRECT_EXECUTOR_SERVICE
-        );
+    public TransportGetViewAction(TransportService transportService, ActionFilters actionFilters, ViewService viewService) {
+        super(GetViewAction.NAME, transportService, actionFilters, GetViewAction.Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
         this.viewService = viewService;
     }
 
     @Override
-    protected void masterOperation(
-        Task task,
-        GetViewAction.Request request,
-        ClusterState state,
-        ActionListener<AcknowledgedResponse> listener
-    ) {
+    protected void doExecute(Task task, GetViewAction.Request request, ActionListener<GetViewAction.Response> listener) {
         View view = viewService.get(request.name());
         if (view == null) {
-            listener.onResponse(AcknowledgedResponse.FALSE);
+            listener.onFailure(new IllegalArgumentException("View [" + request.name() + "] does not exist"));
         } else {
-            listener.onResponse(AcknowledgedResponse.TRUE);
+            listener.onResponse(new GetViewAction.Response(view));
         }
     }
-
-    @Override
-    protected ClusterBlockException checkBlock(GetViewAction.Request request, ClusterState state) {
-        return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_READ);
-    }
 }