Skip to content

Enable New Semantic Text Format Only On Newly Created Indices #121556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 3, 2025
Merged

Enable New Semantic Text Format Only On Newly Created Indices #121556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e02782
Use function to determine default value for index.mapping.semantic_te…
Mikep86 Feb 3, 2025
e1cf3a7
Added test
Mikep86 Feb 3, 2025
0af15a2
Update docs/changelog/121556.yaml
Mikep86 Feb 3, 2025
89fa610
Fix changelog
Mikep86 Feb 3, 2025
5eba99c
Use alternate approach
Mikep86 Feb 3, 2025
ab5cea5
Change variable name
Mikep86 Feb 3, 2025
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/121556.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 121556
summary: Enable New Semantic Text Format Only On Newly Created Indices
area: Mapping
type: bug
issues: []
11 changes: 9 additions & 2 deletions server/src/main/java/org/elasticsearch/index/mapper/InferenceMetadataFieldsMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.IndexVersion;
import org.elasticsearch.index.IndexVersions;
import org.elasticsearch.index.query.SearchExecutionContext;

Expand All @@ -41,6 +42,10 @@ public abstract class InferenceMetadataFieldsMapper extends MetadataFieldMapper
Setting.Property.InternalIndex
);

// Check index version SOURCE_MAPPER_MODE_ATTRIBUTE_NOOP because that index version was added in the same serverless promotion
// where the new format was enabled by default
public static final IndexVersion USE_NEW_SEMANTIC_TEXT_FORMAT_BY_DEFAULT = IndexVersions.SOURCE_MAPPER_MODE_ATTRIBUTE_NOOP;

public static final String NAME = "_inference_fields";
public static final String CONTENT_TYPE = "_inference_fields";

Expand Down Expand Up @@ -86,10 +91,12 @@ public abstract ValueFetcher valueFetcher(
*/
public static boolean isEnabled(Settings settings) {
var version = IndexMetadata.SETTING_INDEX_VERSION_CREATED.get(settings);
if (version.before(IndexVersions.INFERENCE_METADATA_FIELDS)
&& version.between(IndexVersions.INFERENCE_METADATA_FIELDS_BACKPORT, IndexVersions.UPGRADE_TO_LUCENE_10_0_0) == false) {
if ((version.before(IndexVersions.INFERENCE_METADATA_FIELDS)
&& version.between(IndexVersions.INFERENCE_METADATA_FIELDS_BACKPORT, IndexVersions.UPGRADE_TO_LUCENE_10_0_0) == false)
|| (version.before(USE_NEW_SEMANTIC_TEXT_FORMAT_BY_DEFAULT) && USE_LEGACY_SEMANTIC_TEXT_FORMAT.exists(settings) == false)) {
return false;
}

return USE_LEGACY_SEMANTIC_TEXT_FORMAT.get(settings) == false;
}

Expand Down
18 changes: 18 additions & 0 deletions .../org/elasticsearch/xpack/inference/mapper/SemanticInferenceMetadataFieldsMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,24 @@ public void testIsEnabled() {
assertTrue(InferenceMetadataFieldsMapper.isEnabled(settings));
}

public void testIsEnabledByDefault() {
var settings = Settings.builder()
.put(
IndexMetadata.SETTING_INDEX_VERSION_CREATED.getKey(),
IndexVersionUtils.getPreviousVersion(InferenceMetadataFieldsMapper.USE_NEW_SEMANTIC_TEXT_FORMAT_BY_DEFAULT)
)
.build();
assertFalse(InferenceMetadataFieldsMapper.isEnabled(settings));

settings = Settings.builder()
.put(
IndexMetadata.SETTING_INDEX_VERSION_CREATED.getKey(),
InferenceMetadataFieldsMapper.USE_NEW_SEMANTIC_TEXT_FORMAT_BY_DEFAULT
)
.build();
assertTrue(InferenceMetadataFieldsMapper.isEnabled(settings));
}

@Override
public void testFieldHasValue() {
assertTrue(
Expand Down