Smart subfield selection.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Bit-Quill · Jul 28, 2023 · 8b0671c · 8b0671c
1 parent 5232ad2
commit 8b0671c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchTextType.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/type/OpenSearchTextType.java
@@ -54,8 +54,13 @@ public String convertFieldForSearchQuery(String fieldName) {
     if (fields.size() == 0) {
       return fieldName;
     }
-    // Pick first field. What to do if there are multiple fields?
+    // Pick first string subfield (if present) otherwise pick first subfield.
     // Multi-field text support requested in https://github.com/opensearch-project/sql/issues/1887
-    return String.format("%s.%s", fieldName, fields.keySet().toArray()[0]);
+    String subField = fields.entrySet().stream()
+        .filter(e -> e.getValue().getExprType().equals(STRING))
+        .map(Map.Entry::getKey)
+        .findFirst()
+        .orElseGet(() -> fields.keySet().toArray(String[]::new)[0]);
+    return String.format("%s.%s", fieldName, subField);
   }
 }
diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchTextTypeTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/data/type/OpenSearchTextTypeTest.java
@@ -100,7 +100,7 @@ public void convertFieldForSearchQuery() {
             OpenSearchTextType.of(fieldsWithKeyword).convertFieldForSearchQuery("field")),
         () -> assertEquals("field.numbers",
             OpenSearchTextType.of(fieldsWithNumber).convertFieldForSearchQuery("field")),
-        () -> assertEquals("field.numbers",
+        () -> assertEquals("field.words",
             OpenSearchTextType.of(fieldsWithMixed).convertFieldForSearchQuery("field"))
     );
   }