dynamic update not required if model_settings stays null

Samiul-TheSoccerFan · Samiul-TheSoccerFan · commit 6403aa03d622 · 2025-03-05T07:09:17.000-05:00
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java
@@ -405,7 +405,7 @@ void parseCreateFieldFromContext(DocumentParserContext context, SemanticTextFiel
         }
 
         final SemanticTextFieldMapper mapper;
-        if (fieldType().getModelSettings() == null) {
+        if (fieldType().getModelSettings() == null && field.inference().modelSettings() != null) {
             mapper = addDynamicUpdate(context, field);
         } else {
             Conflicts conflicts = new Conflicts(fullFieldName);

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ void parseCreateFieldFromContext(DocumentParserContext context, SemanticTextFiel`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`final SemanticTextFieldMapper mapper;`
`408`		`- if (fieldType().getModelSettings() == null) {`
	`408`	`+ if (fieldType().getModelSettings() == null && field.inference().modelSettings() != null) {`
`409`	`409`	`mapper = addDynamicUpdate(context, field);`
`410`	`410`	`} else {`
`411`	`411`	`Conflicts conflicts = new Conflicts(fullFieldName);`