Skip to content

[9.3] Merge fixes from patch branch back into main (#139721) #139758

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
elasticsearchmachine merged 1 commit into from
Dec 18, 2025
Merged

[9.3] Merge fixes from patch branch back into main (#139721) #139758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/139526.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 139526
summary: Fix `index.mapping.use_doc_values_skippers` defaults in serverless
area: Mapping
type: bug
issues: []
18 changes: 7 additions & 11 deletions server/src/main/java/org/elasticsearch/index/IndexSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,25 +771,21 @@ public Iterator<Setting<?>> settings() {
Property.ServerlessPublic
);

private static final boolean DOC_VALUES_SKIPPER = new FeatureFlag("doc_values_skipper").isEnabled();
public static final Setting<Boolean> USE_DOC_VALUES_SKIPPER = Setting.boolSetting("index.mapping.use_doc_values_skipper", s -> {
IndexVersion iv = SETTING_INDEX_VERSION_CREATED.get(s);
if (MODE.get(s) == IndexMode.TIME_SERIES) {
if (DiscoveryNode.isStateless(s)) {
if (iv.onOrAfter(IndexVersions.STATELESS_SKIPPERS_ENABLED_FOR_TSDB)) {
return "true";
} else {
return "false";
}
if (DOC_VALUES_SKIPPER && iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)) {
return "true";
}
if (iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)) {
if (iv.onOrAfter(IndexVersions.STATELESS_SKIPPERS_ENABLED_FOR_TSDB)) {
return "true";
}
return "false";
} else {
if (DiscoveryNode.isStateless(s)) {
return "false";
}
if (iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT) && iv.before(IndexVersions.SKIPPER_DEFAULTS_ONLY_ON_TSDB)) {
if (DOC_VALUES_SKIPPER
&& iv.onOrAfter(IndexVersions.SKIPPERS_ENABLED_BY_DEFAULT)
&& iv.before(IndexVersions.SKIPPER_DEFAULTS_ONLY_ON_TSDB)) {
return "true";
}
return "false";
Expand Down
10 changes: 0 additions & 10 deletions server/src/test/java/org/elasticsearch/index/mapper/SkipperSettingsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ public void testSkipperSettingDefaults() {
IndexSettings indexSettings = settings(IndexVersion.current(), b -> {});
assertFalse(indexSettings.useDocValuesSkipper());
}
{
IndexSettings indexSettings = settings(IndexVersions.STANDARD_INDEXES_USE_SKIPPERS, b -> {});
assertTrue(indexSettings.useDocValuesSkipper());
}
{
IndexSettings indexSettings = settings(IndexVersions.SKIPPER_DEFAULTS_ONLY_ON_TSDB, b -> {});
assertFalse(indexSettings.useDocValuesSkipper());
Expand Down Expand Up @@ -73,12 +69,6 @@ public void testLogsDBSkipperSettingDefaults() {
);
assertFalse(indexSettings.useDocValuesSkipper());
}
{
IndexSettings indexSettings = settings(IndexVersions.STANDARD_INDEXES_USE_SKIPPERS, b -> {
b.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.getName());
});
assertTrue(indexSettings.useDocValuesSkipper());
}
{
IndexSettings indexSettings = settings(IndexVersions.SKIPPER_DEFAULTS_ONLY_ON_TSDB, b -> {
b.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.getName());
Expand Down