Populate indexName for BatchQuery

Signed-off-by: Tomoyuki Morita <[email protected]>
ykmr1224 · Aug 30, 2024 · c7ce0ac · c7ce0ac
1 parent 7717692
commit c7ce0ac
Show file tree

Hide file tree

Showing 4 changed files with 145 additions and 64 deletions.
diff --git a/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/BatchQueryHandler.java b/async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/BatchQueryHandler.java
@@ -108,7 +108,14 @@ public DispatchQueryResponse submit(
         .resultIndex(dataSourceMetadata.getResultIndex())
         .datasourceName(dataSourceMetadata.getName())
         .jobType(JobType.BATCH)
+        .indexName(getIndexName(context))
         .status(QueryState.WAITING)
         .build();
   }
+
+  private static String getIndexName(DispatchQueryContext context) {
+    return context.getIndexQueryDetails() != null
+        ? context.getIndexQueryDetails().openSearchIndexName()
+        : null;
+  }
 }
diff --git a/...query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryDetails.java b/...query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryDetails.java
@@ -97,20 +97,24 @@ public String openSearchIndexName() {
     String indexName = StringUtils.EMPTY;
     switch (getIndexType()) {
       case COVERING:
-        indexName =
-            "flint_"
-                + fullyQualifiedTableName.toFlintName()
-                + "_"
-                + strip(getIndexName(), STRIP_CHARS)
-                + "_"
-                + getIndexType().getSuffix();
+        if (getIndexName() != null) { // getIndexName will be null for SHOW INDEX query
+          indexName =
+              "flint_"
+                  + fullyQualifiedTableName.toFlintName()
+                  + "_"
+                  + strip(getIndexName(), STRIP_CHARS)
+                  + "_"
+                  + getIndexType().getSuffix();
+        }
         break;
       case SKIPPING:
         indexName =
             "flint_" + fullyQualifiedTableName.toFlintName() + "_" + getIndexType().getSuffix();
         break;
       case MATERIALIZED_VIEW:
-        indexName = "flint_" + new FullyQualifiedTableName(mvName).toFlintName();
+        if (mvName != null) { // mvName is not available for SHOW MATERIALIZED VIEW query
+          indexName = "flint_" + new FullyQualifiedTableName(mvName).toFlintName();
+        }
         break;
     }
     return percentEncode(indexName).toLowerCase();