Fix PPL request concurrency handling issue (#207)

* Downscope request to local method Signed-off-by: Chen Dai <[email protected]> * Fix checkstyle Signed-off-by: Chen Dai <[email protected]>
opensearch-project · Sep 16, 2021 · 7cda06b · 7cda06b
1 parent 74d9fa0
commit 7cda06b
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java
@@ -97,8 +97,6 @@ public class RestPPLQueryAction extends BaseRestHandler {
 
   private final Supplier<Boolean> pplEnabled;
 
-  private PPLQueryRequest pplRequest;
-
   /**
    * Constructor of RestPPLQueryAction.
    */
@@ -155,12 +153,12 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient nod
     }
 
     PPLService pplService = createPPLService(nodeClient);
-    pplRequest = PPLQueryRequestFactory.getPPLRequest(request);
+    PPLQueryRequest pplRequest = PPLQueryRequestFactory.getPPLRequest(request);
 
     if (pplRequest.isExplainRequest()) {
       return channel -> pplService.explain(pplRequest, createExplainResponseListener(channel));
     }
-    return channel -> pplService.execute(pplRequest, createListener(channel));
+    return channel -> pplService.execute(pplRequest, createListener(channel, pplRequest));
   }
 
   /**
@@ -215,7 +213,8 @@ public void onFailure(Exception e) {
     };
   }
 
-  private ResponseListener<QueryResponse> createListener(RestChannel channel) {
+  private ResponseListener<QueryResponse> createListener(RestChannel channel,
+                                                         PPLQueryRequest pplRequest) {
     Format format = pplRequest.format();
     ResponseFormatter<QueryResult> formatter;
     if (format.equals(Format.CSV)) {