Added tests

Author: Kubik42

modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml

@@ -650,6 +650,48 @@ synthetic_source match_only_text with ignored multi-field:
   - match:
       hits.hits.0._source.foo: "Apache Lucene powers Elasticsearch"
 
+---
+synthetic_source match_only_text with ignored multi-field and multiple values in the same doc:
+  - requires:
+      cluster_features: [ "mapper.source.mode_from_index_setting" ]
+      reason: "Source mode configured through index setting"
+
+  - do:
+      indices.create:
+        index: synthetic_source_test
+        body:
+          settings:
+            index:
+              mapping.source.mode: synthetic
+          mappings:
+            properties:
+              foo:
+                type: match_only_text
+                fields:
+                  raw:
+                    type: keyword
+                    ignore_above: 20
+
+  - do:
+      index:
+        index: synthetic_source_test
+        id: "1"
+        refresh: true
+        body:
+          foo: [ "This value is too long and will be ignored", "This value is short" ]
+
+  - do:
+      search:
+        index: synthetic_source_test
+        body:
+          query:
+            match_phrase:
+              foo: this value is
+
+  - match: { "hits.total.value": 1 }
+  - match: { hits.hits.0._source.foo.0: "This value is too long and will be ignored" }
+  - match: { hits.hits.0._source.foo.1: "This value is short" }
+
 ---
 synthetic_source match_only_text with stored multi-field:
   - requires:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mapping/20_synthetic_source.yml

@@ -79,3 +79,87 @@ synthetic_source text with multi-field:
   - match: { "hits.total.value": 1 }
   - match:
       hits.hits.0._source.foo: "Apache Lucene powers Elasticsearch"
+
+---
+synthetic_source text with ignored multi-field:
+  - requires:
+      cluster_features: [ "mapper.source.mode_from_index_setting" ]
+      reason: "Source mode configured through index setting"
+
+  - do:
+      indices.create:
+        index: synthetic_source_test
+        body:
+          settings:
+            index:
+              mapping.source.mode: synthetic
+          mappings:
+            properties:
+              foo:
+                type: text
+                fields:
+                  raw:
+                    type: keyword
+                    ignored: 5
+
+  - do:
+      index:
+        index: synthetic_source_test
+        id:    "1"
+        refresh: true
+        body:
+          foo: "Apache Lucene powers Elasticsearch"
+
+  - do:
+      search:
+        index: synthetic_source_test
+        body:
+          query:
+            match_phrase:
+              foo: apache lucene
+
+  - match: { "hits.total.value": 1 }
+  - match:
+      hits.hits.0._source.foo: "Apache Lucene powers Elasticsearch"
+
+---
+synthetic_source text with ignored multi-field and multiple values in the same doc:
+  - requires:
+      cluster_features: [ "mapper.source.mode_from_index_setting" ]
+      reason: "Source mode configured through index setting"
+
+  - do:
+      indices.create:
+        index: synthetic_source_test
+        body:
+          settings:
+            index:
+              mapping.source.mode: synthetic
+          mappings:
+            properties:
+              foo:
+                type: text
+                fields:
+                  raw:
+                    type: keyword
+                    ignored: 20
+
+  - do:
+      index:
+        index: synthetic_source_test
+        id:    "1"
+        refresh: true
+        body:
+          foo: [ "This value is too long and will be ignored", "This value is short" ]
+
+  - do:
+      search:
+        index: synthetic_source_test
+        body:
+          query:
+            match_phrase:
+              foo: this value is
+
+  - match: { "hits.total.value": 1 }
+  - match: { hits.hits.0._source.foo: "This value is too long and will be ignored" }
+  - match: { hits.hits.0._source.foo: "This value is short" }

server/src/test/java/org/elasticsearch/index/mapper/CompositeSyntheticFieldLoaderTests.java

@@ -22,6 +22,7 @@
 import java.util.stream.Stream;
 
 public class CompositeSyntheticFieldLoaderTests extends ESTestCase {
+
     public void testComposingMultipleStoredFields() throws IOException {
         var sut = new CompositeSyntheticFieldLoader(
             "foo",
@@ -234,4 +235,52 @@ public void testFieldName() {
         var sut = new CompositeSyntheticFieldLoader("foo", "bar.baz.foo");
         assertEquals("bar.baz.foo", sut.fieldName());
     }
+
+    public void testMergeTwoFieldLoaders() throws IOException {
+        // given
+        var fieldLoader1 = new CompositeSyntheticFieldLoader(
+                "foo",
+                "bar.baz.foo",
+                List.of(new CompositeSyntheticFieldLoader.StoredFieldLayer("foo.one") {
+                    @Override
+                    protected void writeValue(Object value, XContentBuilder b) throws IOException {
+                        b.value((long) value);
+                    }
+                }, new CompositeSyntheticFieldLoader.StoredFieldLayer("foo.two") {
+                    @Override
+                    protected void writeValue(Object value, XContentBuilder b) throws IOException {
+                        b.value((long) value);
+                    }
+                })
+        );
+
+        var fieldLoader2 = new CompositeSyntheticFieldLoader(
+            "foo",
+            "bar.baz.foo",
+            List.of(new CompositeSyntheticFieldLoader.StoredFieldLayer("foo.three") {
+                @Override
+                protected void writeValue(Object value, XContentBuilder b) throws IOException {
+                    b.value((long) value);
+                }
+            })
+        );
+
+        var mergedFieldLoader = fieldLoader1.mergedWith(fieldLoader2);
+
+        var storedFieldLoaders = mergedFieldLoader.storedFieldLoaders()
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+        storedFieldLoaders.get("foo.one").load(List.of(45L, 46L));
+        storedFieldLoaders.get("foo.two").load(List.of(1L));
+        storedFieldLoaders.get("foo.three").load(List.of(98L, 99L));
+
+        // when
+        var result = XContentBuilder.builder(XContentType.JSON.xContent());
+        result.startObject();
+        mergedFieldLoader.write(result);
+        result.endObject();
+
+        // then
+        assertEquals("""
+                             {"foo":[45,46,1,98,99]}""", Strings.toString(result));
+    }
 }