Update filtering to support HashSet-based approach for map keys with …

…dots Signed-off-by: hye-on <[email protected]>
opensearch-project · Jan 29, 2025 · 97145a0 · 97145a0
1 parent 9c60c7e
commit 97145a0
Showing 1 changed file with 8 additions and 17 deletions.
diff --git a/server/src/main/java/org/opensearch/common/xcontent/support/XContentMapValues.java b/server/src/main/java/org/opensearch/common/xcontent/support/XContentMapValues.java
@@ -219,22 +219,10 @@ public static Map<String, Object> filter(Map<String, ?> map, String[] includes,
      * @see #filter(Map, String[], String[]) for details
      */
     public static Function<Map<String, ?>, Map<String, Object>> filter(String[] includes, String[] excludes) {
-
-        return (map) -> {
-            if (hasNoDottedKeys(map) && hasNoWildcardsOrDots(includes) && hasNoWildcardsOrDots(excludes)) {
-                return createSetBasedFilter(includes, excludes).apply(map);
-            }
-            return createAutomatonFilter(includes, excludes).apply(map);
-        };
-    }
-
-    private static boolean hasNoDottedKeys(Map<String, ?> map) {
-        for (String key : map.keySet()) {
-            if (key.indexOf('.') != -1) {
-                return false;
-            }
+        if (hasNoWildcardsOrDots(includes) && hasNoWildcardsOrDots(excludes)) {
+            return createSetBasedFilter(includes, excludes);
         }
-        return true;
+        return createAutomatonFilter(includes, excludes);
     }
 
     private static boolean hasNoWildcardsOrDots(String[] fields) {
@@ -254,7 +242,6 @@ private static boolean hasNoWildcardsOrDots(String[] fields) {
      * Creates a simple HashSet-based filter for exact field name matching
      */
     private static Function<Map<String, ?>, Map<String, Object>> createSetBasedFilter(String[] includes, String[] excludes) {
-
         Set<String> includeSet = (includes == null || includes.length == 0) ? null : new HashSet<>(Arrays.asList(includes));
         Set<String> excludeSet = (excludes == null || excludes.length == 0)
             ? Collections.emptySet()
@@ -264,8 +251,12 @@ private static boolean hasNoWildcardsOrDots(String[] fields) {
             Map<String, Object> filtered = new HashMap<>();
             for (Map.Entry<String, ?> entry : map.entrySet()) {
                 String key = entry.getKey();
+                int dotPos = key.indexOf('.');
+                if (dotPos > 0) {
+                    key = key.substring(0, dotPos);
+                }
                 if ((includeSet == null || includeSet.contains(key)) && !excludeSet.contains(key)) {
-                    filtered.put(key, entry.getValue());
+                    filtered.put(entry.getKey(), entry.getValue());
                 }
             }
             return filtered;