Updating testing and logging for dense_vector dynamic dims (#100546) (#…

…100833) This adds a test for dynamic dims update mapping merges. Also, this adds logging to help investigate a periodically failing test. related to: #100502
elastic · Oct 13, 2023 · 23280ee · 23280ee
1 parent 364ae21
commit 23280ee
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/...lRestTest/resources/rest-api-spec/test/search.vectors/60_dense_vector_dynamic_mapping.yml b/...lRestTest/resources/rest-api-spec/test/search.vectors/60_dense_vector_dynamic_mapping.yml
@@ -3,6 +3,30 @@ setup:
       version: ' - 8.10.99'
       reason: 'Dynamic mapping of floats to dense_vector was added in 8.11'
 
+  # Additional logging for issue: https://github.com/elastic/elasticsearch/issues/100502
+  - do:
+      cluster.put_settings:
+        body: >
+          {
+            "persistent": {
+              "logger.org.elasticsearch.index": "TRACE"
+            }
+          }
+
+---
+teardown:
+  - skip:
+      version: ' - 8.10.99'
+      reason: 'Dynamic mapping of floats to dense_vector was added in 8.11'
+
+  - do:
+      cluster.put_settings:
+          body: >
+            {
+              "persistent": {
+                "logger.org.elasticsearch.index": null
+              }
+            }
 ---
 "Fields with float arrays below the threshold still map as float":
 

diff --git a/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java
@@ -20,7 +20,9 @@
 import org.apache.lucene.search.FieldExistsQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.util.BigArrays;
+import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.codec.CodecService;
 import org.elasticsearch.index.codec.PerFieldMapperCodec;
@@ -231,6 +233,26 @@ public void testDims() {
         }
     }
 
+    public void testMergeDims() throws IOException {
+        XContentBuilder mapping = mapping(b -> {
+            b.startObject("field");
+            b.field("type", "dense_vector");
+            b.endObject();
+        });
+        MapperService mapperService = createMapperService(mapping);
+
+        mapping = mapping(b -> {
+            b.startObject("field");
+            b.field("type", "dense_vector").field("dims", 4).field("similarity", "cosine").field("index", true);
+            b.endObject();
+        });
+        merge(mapperService, mapping);
+        assertEquals(
+            XContentHelper.convertToMap(BytesReference.bytes(mapping), false, mapping.contentType()).v2(),
+            XContentHelper.convertToMap(mapperService.documentMapper().mappingSource().uncompressed(), false, mapping.contentType()).v2()
+        );
+    }
+
     public void testDefaults() throws Exception {
         DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "dense_vector").field("dims", 3)));