Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/101967.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 101967
summary: "Fix incorrect dynamic mapping for non-numeric-value arrays #101965"
area: Mapping
type: bug
issues: []
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,38 @@ setup:
- skip:
version: ' - 8.10.99'
reason: 'Dynamic mapping of floats to dense_vector was added in 8.11'
---
"Fields indexed as strings won't be transformed into dense_vector":
- skip:
# TODO adjust after backport
version: ' - 8.11.99'
reason: 'Dynamic mapping of things other than numbers is fixed in 8.12'
- do:
index:
index: strings-are-not-floats
refresh: true
body:
obviously_string: ["foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo",
"foo", "foo", "foo", "foo", "foo", "foo", "foo", "foo"]
- do:
cluster.health:
wait_for_events: languid
- do:
indices.get_mapping:
index: strings-are-not-floats

- match: { strings-are-not-floats.mappings.properties.obviously_string.type: text }
---
"Fields with float arrays below the threshold still map as float":

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,12 @@ private static void postProcessDynamicArrayMapping(DocumentParserContext context
|| context.isCopyToField(fullFieldName)
|| mappers.size() < MIN_DIMS_FOR_DYNAMIC_FLOAT_MAPPING
|| mappers.size() > MAX_DIMS_COUNT
// Anything that is NOT a number or anything that IS a number but not mapped to `float` should NOT be mapped to dense_vector
|| mappers.stream()
.allMatch(m -> m instanceof NumberFieldMapper.Builder nb && nb.type != NumberFieldMapper.NumberType.FLOAT)) {
.anyMatch(
m -> m instanceof NumberFieldMapper.Builder == false
|| ((NumberFieldMapper.Builder) m).type != NumberFieldMapper.NumberType.FLOAT
)) {
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import java.io.IOException;
import java.time.Instant;
import java.util.stream.Stream;

import static org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper.MAX_DIMS_COUNT;
import static org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper.MIN_DIMS_FOR_DYNAMIC_FLOAT_MAPPING;
Expand Down Expand Up @@ -991,4 +992,15 @@ public void testDefaultDenseVectorMappingsObject() throws IOException {
ObjectMapper parent = (ObjectMapper) update.getRoot().getMapper("parent_object");
assertThat(((FieldMapper) parent.getMapper("mapsToDenseVector")).fieldType().typeName(), equalTo("dense_vector"));
}

public void testStringArraysAreText() throws IOException {
DocumentMapper mapper = createDocumentMapper(topMapping(b -> b.field("numeric_detection", true)));
BytesReference source = BytesReference.bytes(
XContentFactory.jsonBuilder().startObject().field("mapsToString", Stream.generate(() -> "foo").limit(129).toArray()).endObject()
);
ParsedDocument parsedDocument = mapper.parse(new SourceToParse("id", source, XContentType.JSON));
Mapping update = parsedDocument.dynamicMappingsUpdate();
assertNotNull(update);
assertThat(((FieldMapper) update.getRoot().getMapper("mapsToString")).fieldType().typeName(), equalTo("text"));
}
}