Modify IT as temporary reproduce commit

Signed-off-by: Chen Dai <[email protected]>
opensearch-project · Nov 29, 2023 · 7d11c12 · 7d11c12
1 parent f400d03
commit 7d11c12
Showing 1 changed file with 22 additions and 21 deletions.
diff --git a/.../src/test/java/org/opensearch/sql/spark/asyncquery/InteractiveQueryNullResultFixTest.java b/.../src/test/java/org/opensearch/sql/spark/asyncquery/InteractiveQueryNullResultFixTest.java
@@ -28,17 +28,15 @@
 public class InteractiveQueryNullResultFixTest extends AsyncQueryExecutorServiceSpec {
 
   @Test
-  public void queryResult() {
-    LocalEMRSClient emrClient = new LocalEMRSClient();
-    AsyncQueryExecutorService queryService = createAsyncQueryExecutorService(emrClient);
-
+  public void reproduceSuccessStatementWithNullResult() {
+    AsyncQueryExecutorService queryService = createAsyncQueryExecutorService(new LocalEMRSClient());
     CreateAsyncQueryResponse response =
         queryService.createAsyncQuery(
             new CreateAsyncQueryRequest("SELECT 1", DATASOURCE, LangType.SQL, null));
-
     AsyncQueryExecutionResponse results = queryService.getAsyncQueryResults(response.getQueryId());
 
-    System.out.println(results);
+    assertEquals(StatementState.SUCCESS.getState(), results.getStatus());
+    assertNull(results.getResults());
   }
 
   @Override
@@ -51,27 +49,13 @@ public JSONObject getResultWithQueryId(String queryId, String resultIndex) {
         JSONObject result = super.getResultWithQueryId(queryId, resultIndex);
 
         // 2) EMR-S bulk writes query_execution_result with refresh = wait_for
-        Map<String, Object> document = new HashMap<>();
-        document.put("result", new String[] {"{'1':1}"});
-        document.put("schema", new String[] {"{'column_name':'1','data_type':'integer'}"});
-        document.put("jobRunId", "XXX");
-        document.put("applicationId", "YYY");
-        document.put("dataSourceName", DATASOURCE);
-        document.put("status", "SUCCESS");
-        document.put("error", "");
-        document.put("queryId", queryId);
-        document.put("queryText", "SELECT 1");
-        document.put("sessionId", "ZZZ");
-        document.put("updateTime", 1699124602715L);
-        document.put("queryRunTime", 123);
-
         String resultIndexName = resultIndex == null ? DEFAULT_RESULT_INDEX : resultIndex;
         try {
           IndexRequest request =
               new IndexRequest()
                   .index(resultIndexName)
                   .setRefreshPolicy(WAIT_UNTIL)
-                  .source(document);
+                  .source(createResultDoc(queryId));
           client.index(request).get();
         } catch (Exception e) {
           Assert.fail("Failed to write result doc: " + e.getMessage());
@@ -86,4 +70,21 @@ public JSONObject getResultWithQueryId(String queryId, String resultIndex) {
       }
     };
   }
+
+  private Map<String, Object> createResultDoc(String queryId) {
+    Map<String, Object> document = new HashMap<>();
+    document.put("result", new String[] {"{'1':1}"});
+    document.put("schema", new String[] {"{'column_name':'1','data_type':'integer'}"});
+    document.put("jobRunId", "XXX");
+    document.put("applicationId", "YYY");
+    document.put("dataSourceName", DATASOURCE);
+    document.put("status", "SUCCESS");
+    document.put("error", "");
+    document.put("queryId", queryId);
+    document.put("queryText", "SELECT 1");
+    document.put("sessionId", "ZZZ");
+    document.put("updateTime", 1699124602715L);
+    document.put("queryRunTime", 123);
+    return document;
+  }
 }