fix tests

kkrik-es · Dec 3, 2024 · 73638b9 · 73638b9
1 parent 4b5590c
commit 73638b9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml
@@ -1192,6 +1192,8 @@ root with subobjects false and dynamic false:
             subobjects: false
             dynamic: false
             properties:
+              id:
+                type: integer
               my.keyword.field:
                 type: keyword
 
@@ -1201,7 +1203,7 @@ root with subobjects false and dynamic false:
         refresh: true
         body:
           - '{ "index": { } }'
-          - '{ "my": { "keyword.field": "abc" } }'
+          - '{ "id": 1, "my": { "keyword.field": "abc" } }'
   - match: { errors: false }
 
   # indexing a dynamically-mapped field still fails (silently)
@@ -1211,17 +1213,18 @@ root with subobjects false and dynamic false:
         refresh: true
         body:
           - '{ "index": { } }'
-          - '{ "my": { "random.field": "abc" } }'
+          - '{ "id": 2, "my": { "random.field": "abc" } }'
   - match: { errors: false }
 
   - do:
       search:
         index: test
         body:
+          sort: id
           fields: [ "*" ]
 
-  - match: { hits.hits.0.fields: { my.keyword.field: [ abc ] } }
-  - match: { hits.hits.1.fields: null }
+  - match: { hits.hits.0.fields: { my.keyword.field: [ abc ], id: [ 1 ] } }
+  - match: { hits.hits.1.fields: { id: [ 2 ] } }
 
   - do:
       search:
@@ -1249,6 +1252,8 @@ object with subobjects false and dynamic false:
                 subobjects: false
                 dynamic: false
                 properties:
+                  id:
+                    type: integer
                   nested.keyword.field:
                     type: keyword
 
@@ -1258,7 +1263,7 @@ object with subobjects false and dynamic false:
         refresh: true
         body:
           - '{ "index": { } }'
-          - '{ "my": { "nested": { "keyword.field": "abc" } } }'
+          - '{ "id": 1, "my": { "nested": { "keyword.field": "abc" } } }'
   - match: { errors: false }
 
   # indexing a dynamically-mapped field still fails (silently)
@@ -1268,17 +1273,18 @@ object with subobjects false and dynamic false:
         refresh: true
         body:
           - '{ "index": { } }'
-          - '{ "my": { "nested": { "random.field": "abc" } } }'
+          - '{ "id": 2, "my": { "nested": { "random.field": "abc" } } }'
   - match: { errors: false }
 
   - do:
       search:
         index: test
         body:
+          sort: id
           fields: [ "*" ]
 
-  - match: { hits.hits.0.fields: { my.nested.keyword.field: [ abc ] } }
-  - match: { hits.hits.1.fields: null }
+  - match: { hits.hits.0.fields: { my.nested.keyword.field: [ abc ], id: [ 1 ] } }
+  - match: { hits.hits.1.fields: { id: [ 2 ] } }
 
   - do:
       search:

diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java
@@ -2074,15 +2074,15 @@ public void testSubobjectsFalseWithInnerDottedObjectDynamicFalse() throws Except
 
         doc = mapper.parse(source("""
             { "metrics": { "service": { "test.other.dots": "foo" }  } }"""));
-        assertNull(doc.rootDoc().getField("metrics.service.test.with.dots"));
+        assertNull(doc.rootDoc().getField("metrics.service.test.other.dots"));
 
         doc = mapper.parse(source("""
             { "metrics": { "service.test": { "other.dots": "foo" }  } }"""));
-        assertNull(doc.rootDoc().getField("metrics.service.test.with.dots"));
+        assertNull(doc.rootDoc().getField("metrics.service.test.other.dots"));
 
         doc = mapper.parse(source("""
             { "metrics": { "service": { "test": { "other.dots": "foo" }  }  } }"""));
-        assertNull(doc.rootDoc().getField("metrics.service.test.with.dots"));
+        assertNull(doc.rootDoc().getField("metrics.service.test.other.dots"));
     }
 
     public void testSubobjectsFalseRoot() throws Exception {
@@ -2126,15 +2126,15 @@ public void testSubobjectsFalseRootWithInnerDottedObjectDynamicFalse() throws Ex
 
         doc = mapper.parse(source("""
             { "service": { "test.other.dots": "foo" } }"""));
-        assertNull(doc.rootDoc().getField("service.test.with.dots"));
+        assertNull(doc.rootDoc().getField("service.test.other.dots"));
 
         doc = mapper.parse(source("""
             { "service.test": { "other.dots": "foo" } }"""));
-        assertNull(doc.rootDoc().getField("service.test.with.dots"));
+        assertNull(doc.rootDoc().getField("service.test.other.dots"));
 
         doc = mapper.parse(source("""
             { "service": { "test": { "other.dots": "foo" } } }"""));
-        assertNull(doc.rootDoc().getField("service.test.with.dots"));
+        assertNull(doc.rootDoc().getField("service.test.other.dots"));
     }
 
     public void testSubobjectsFalseStructuredPath() throws Exception {