Skip to content

Commit 9e65cd0

Browse files
update in semantic_text mapper and fetcher to incorporate the support functionality
1 parent 785e8d6 commit 9e65cd0

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesFetcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static Map<String, IndexFieldCapabilities> retrieveFieldCaps(
174174
if ((includeEmptyFields || ft.fieldHasValue(fieldInfos))
175175
&& (fieldPredicate.test(ft.name()) || context.isMetadataField(ft.name()))
176176
&& (filter == null || filter.test(ft))
177-
&& ft.familyTypeName() != null) {
177+
&& ft.excludeFromFieldCaps() == false) {
178178
IndexFieldCapabilities fieldCap = new IndexFieldCapabilities(
179179
field,
180180
ft.familyTypeName(),

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ private static NestedObjectMapper.Builder createChunksField(
10461046
.excludeFromFieldCaps(true);
10471047
chunksField.add(chunkTextField);
10481048
} else {
1049-
chunksField.add(new OffsetSourceFieldMapper.Builder(CHUNKED_OFFSET_FIELD));
1049+
chunksField.add(new OffsetSourceFieldMapper.Builder(CHUNKED_OFFSET_FIELD).excludeFromFieldCaps(true));
10501050
}
10511051
return chunksField;
10521052
}
@@ -1057,14 +1057,13 @@ private static Mapper.Builder createEmbeddingsField(
10571057
boolean useLegacyFormat
10581058
) {
10591059
return switch (modelSettings.taskType()) {
1060-
case SPARSE_EMBEDDING -> new SparseVectorFieldMapper.Builder(CHUNKED_EMBEDDINGS_FIELD, true).setStored(
1060+
case SPARSE_EMBEDDING -> new SparseVectorFieldMapper.Builder(CHUNKED_EMBEDDINGS_FIELD).setStored(
10611061
useLegacyFormat == false
1062-
);
1062+
).setExcludeFromFieldCaps(true);
10631063
case TEXT_EMBEDDING -> {
10641064
DenseVectorFieldMapper.Builder denseVectorMapperBuilder = new DenseVectorFieldMapper.Builder(
10651065
CHUNKED_EMBEDDINGS_FIELD,
1066-
indexVersionCreated,
1067-
true
1066+
indexVersionCreated
10681067
);
10691068

10701069
SimilarityMeasure similarity = modelSettings.similarity();
@@ -1089,6 +1088,7 @@ private static Mapper.Builder createEmbeddingsField(
10891088
&& defaultIndexOptions.validate(modelSettings.elementType(), modelSettings.dimensions(), false)) {
10901089
denseVectorMapperBuilder.indexOptions(defaultIndexOptions);
10911090
}
1091+
denseVectorMapperBuilder.excludeFromFieldCaps(true);
10921092

10931093
yield denseVectorMapperBuilder;
10941094
}

0 commit comments

Comments
 (0)