iter

Author: lkts

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/matchers/source/FieldSpecificMatcher.java

@@ -20,6 +20,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 import static org.elasticsearch.logsdb.datageneration.matchers.Messages.formatErrorMessage;
@@ -46,12 +47,17 @@ class CountedKeywordMatcher implements FieldSpecificMatcher {
             this.expectedSettings = expectedSettings;
         }
 
-        private static List<String> normalize(List<Object> values) {
-            return values.stream().filter(Objects::nonNull).map(it -> (String) it).toList();
-        }
+        @Override
+        public MatchResult match(
+            List<Object> actual,
+            List<Object> expected,
+            Map<String, Object> actualMapping,
+            Map<String, Object> expectedMapping
+        ) {
+            var actualNormalized = normalize(actual);
+            var expectedNormalized = normalize(expected);
 
-        private static boolean matchCountsEqualExact(List<String> actualNormalized, List<String> expectedNormalized) {
-            HashMap<String, Integer> counts = new HashMap<>();
+            Map<String, Integer> counts = new TreeMap<>();
             for (String value : actualNormalized) {
                 counts.put(value, counts.getOrDefault(value, 0) + 1);
             }
@@ -64,31 +70,29 @@ private static boolean matchCountsEqualExact(List<String> actualNormalized, List
                 }
             }
 
-            return counts.isEmpty();
-        }
-
-        @Override
-        public MatchResult match(
-            List<Object> actual,
-            List<Object> expected,
-            Map<String, Object> actualMapping,
-            Map<String, Object> expectedMapping
-        ) {
-            var actualNormalized = normalize(actual);
-            var expectedNormalized = normalize(expected);
+            if (counts.isEmpty() == false) {
+                var extraValuesMessage = new StringBuilder("extra values: ");
+                for (var entry : counts.entrySet()) {
+                    extraValuesMessage.append('\n').append(entry.getKey()).append(": ").append(entry.getValue());
+                }
 
-            return matchCountsEqualExact(actualNormalized, expectedNormalized)
-                ? MatchResult.match()
-                : MatchResult.noMatch(
+                return MatchResult.noMatch(
                     formatErrorMessage(
                         actualMappings,
                         actualSettings,
                         expectedMappings,
                         expectedSettings,
-                        "Values of type [counted_keyword] don't match after normalization, normalized"
+                        "Values of type [counted_keyword] don't match, " + extraValuesMessage + ".\n"
                             + prettyPrintCollections(actualNormalized, expectedNormalized)
                     )
                 );
+            }
+
+            return MatchResult.match();
+        }
+
+        private static List<String> normalize(List<Object> values) {
+            return values.stream().filter(Objects::nonNull).map(it -> (String) it).toList();
         }
     }
 

test/framework/src/test/java/org/elasticsearch/logsdb/datageneration/SourceMatcherTests.java

@@ -62,16 +62,16 @@ public void testDynamicMismatch() throws IOException {
 
     public void testMappedMatch() throws IOException {
         List<Map<String, Object>> values = List.of(
-            Map.of("aaa", 124, "bbb", false, "ccc", 12.34),
-            Map.of("aaa", 124, "bbb", false, "ccc", 12.34)
+            Map.of("aaa", 124, "bbb", "hey", "ccc", 12.34),
+            Map.of("aaa", 124, "bbb", "yeh", "ccc", 12.34)
         );
 
         var mapping = XContentBuilder.builder(XContentType.JSON.xContent());
         mapping.startObject();
         mapping.startObject("_doc");
         {
             mapping.startObject("aaa").field("type", "long").endObject();
-            mapping.startObject("bbb").field("type", "boolean").endObject();
+            mapping.startObject("bbb").field("type", "keyword").endObject();
             mapping.startObject("ccc").field("type", "half_float").endObject();
         }
         mapping.endObject();
@@ -83,20 +83,20 @@ public void testMappedMatch() throws IOException {
 
     public void testMappedMismatch() throws IOException {
         List<Map<String, Object>> actual = List.of(
-            Map.of("aaa", 124, "bbb", false, "ccc", 12.34),
-            Map.of("aaa", 124, "bbb", false, "ccc", 12.34)
+            Map.of("aaa", 124, "bbb", "hey", "ccc", 12.34),
+            Map.of("aaa", 124, "bbb", "yeh", "ccc", 12.34)
         );
         List<Map<String, Object>> expected = List.of(
-            Map.of("aaa", 124, "bbb", false, "ccc", 12.34),
-            Map.of("aaa", 124, "bbb", false, "ccc", 12.35)
+            Map.of("aaa", 124, "bbb", "hey", "ccc", 12.34),
+            Map.of("aaa", 124, "bbb", "yeh", "ccc", 12.35)
         );
 
         var mapping = XContentBuilder.builder(XContentType.JSON.xContent());
         mapping.startObject();
         mapping.startObject("_doc");
         {
             mapping.startObject("aaa").field("type", "long").endObject();
-            mapping.startObject("bbb").field("type", "boolean").endObject();
+            mapping.startObject("bbb").field("type", "keyword").endObject();
             mapping.startObject("ccc").field("type", "half_float").endObject();
         }
         mapping.endObject();