Incorporating changes from main

Signed-off-by: Vacha Shah <[email protected]>
opensearch-project · Feb 8, 2024 · 3cac405 · 3cac405
1 parent 5085c50
commit 3cac405
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/common/util/FeatureFlags.java b/server/src/main/java/org/opensearch/common/util/FeatureFlags.java
@@ -58,7 +58,7 @@ public class FeatureFlags {
      * Gates the optimization to enable bloom filters for doc id lookup.
      */
     public static final String DOC_ID_FUZZY_SET = "opensearch.experimental.optimize_doc_id_lookup.fuzzy_set.enabled";
-     
+
     /**
      * Gates the functionality of integrating protobuf within search API and node-to-node communication.
      */
@@ -122,6 +122,6 @@ public static boolean isEnabled(Setting<Boolean> featureFlag) {
     );
 
     public static final Setting<Boolean> DOC_ID_FUZZY_SET_SETTING = Setting.boolSetting(DOC_ID_FUZZY_SET, false, Property.NodeScope);
-    
+
     public static final Setting<Boolean> PROTOBUF_SETTING = Setting.boolSetting(PROTOBUF, false, Property.NodeScope, Property.Dynamic);
 }
diff --git a/server/src/main/java/org/opensearch/search/SearchHit.java b/server/src/main/java/org/opensearch/search/SearchHit.java
@@ -284,7 +284,20 @@ public SearchHit(byte[] in) throws IOException {
         });
         this.sortValues = new SearchSortValues(this.searchHitProto.getSortValues().toByteArray());
         if (this.searchHitProto.getMatchedQueriesCount() > 0) {
-            this.matchedQueries = this.searchHitProto.getMatchedQueriesList().toArray(new String[0]);
+            this.matchedQueries = new LinkedHashMap<>(this.searchHitProto.getMatchedQueriesCount());
+            for (String query : this.searchHitProto.getMatchedQueriesList()) {
+                matchedQueries.put(query, Float.NaN);
+            }
+        }
+        if (this.searchHitProto.getMatchedQueriesWithScoresCount() > 0) {
+            Map<String, Float> tempMap = this.searchHitProto.getMatchedQueriesWithScoresMap()
+                .entrySet()
+                .stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue()));
+            this.matchedQueries = tempMap.entrySet()
+                .stream()
+                .sorted(Map.Entry.comparingByKey())
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new));
         }
         if (this.searchHitProto.hasExplanation()) {
             this.explanation = readExplanation(this.searchHitProto.getExplanation().toByteArray());

diff --git a/server/src/main/proto/server/search/FetchSearchResultProto.proto b/server/src/main/proto/server/search/FetchSearchResultProto.proto
@@ -51,6 +51,7 @@ message SearchHit {
   optional string index = 16;
   optional string clusterAlias = 17;
   map<string, SearchHits> innerHits = 18;
+  map<string, float> matchedQueriesWithScores = 19;
 
   message NestedIdentity {
     optional string field = 1;