Fix shadowing ts param in non ts mappings by gmarouli · Pull Request #141549 · elastic/elasticsearch

gmarouli · 2026-01-29T20:02:40Z

Runtime fields are not allowed to shadow time series metrics and dimensions in a time series index. However, shadowing metrics and dimensions in non time series indices should be valid because they behave like regular fields.

Fixes #140882

elasticsearchmachine · 2026-02-03T10:50:14Z

Pinging @elastic/es-storage-engine (Team:StorageEngine)

elasticsearchmachine · 2026-02-03T10:50:42Z

Hi @gmarouli, I've created a changelog YAML for you.

kkrik-es · 2026-02-03T12:38:27Z

server/src/main/java/org/elasticsearch/index/IndexMode.java

@@ -598,10 +598,10 @@ public boolean useTimeSeriesDocValuesCodec() {
     */
    public static IndexMode fromString(String value) {
        return switch (value) {


Use value.toLowerCase to play it safe?

kkrik-es · 2026-02-03T12:42:08Z

server/src/test/java/org/elasticsearch/index/mapper/MappingLookupTests.java

        List<ObjectMapper> objectMappers,
        List<RuntimeField> runtimeFields
+    ) {
+        return createMappingLookup(fieldMappers, objectMappers, runtimeFields, randomFrom(IndexMode.values()));


I wonder if this will lead to all sorts of failures, e.g. because there's no dimension and no routing path set. Maybe set to standard by default?

The index mode is not used anywhere else yet apart from shadowing. This is why I did not default to standard, because it's a fail-safe that we are not interfering with anything else. Do you agree that since it shouldn't matter, we can leave it random?

Runtime fields are not allowed to shadow time series metrics and dimensions in a time series index. However, shadowing metrics and dimensions in non time series indices should be valid because they behave like regular fields. Fixes elastic#140882

elasticsearchmachine · 2026-02-03T14:16:39Z

💔 Backport failed

Status	Branch	Result
✅	9.3
❌	9.1	Commit could not be cherrypicked due to conflicts
❌	8.19	Commit could not be cherrypicked due to conflicts
❌	9.2	Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 141549

Runtime fields are not allowed to shadow time series metrics and dimensions in a time series index. However, shadowing metrics and dimensions in non time series indices should be valid because they behave like regular fields. Fixes #140882

Runtime fields are not allowed to shadow time series metrics and dimensions in a time series index. However, shadowing metrics and dimensions in non time series indices should be valid because they behave like regular fields. Fixes elastic#140882 (cherry picked from commit e9bd294) # Conflicts: # server/src/test/java/org/elasticsearch/search/SearchServiceTests.java # server/src/test/java/org/elasticsearch/search/diversification/DiversifyRetrieverBuilderTests.java

Runtime fields are not allowed to shadow time series metrics and dimensions in a time series index. However, shadowing metrics and dimensions in non time series indices should be valid because they behave like regular fields. Fixes elastic#140882 (cherry picked from commit e9bd294) # Conflicts: # server/src/test/java/org/elasticsearch/search/SearchServiceTests.java # server/src/test/java/org/elasticsearch/search/diversification/DiversifyRetrieverBuilderTests.java # x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCacheTests.java # x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/SecurityIndexReaderWrapperIntegrationTests.java # x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/planner/EsPhysicalOperationProvidersTests.java

Runtime fields are not allowed to shadow time series metrics and dimensions in a time series index. However, shadowing metrics and dimensions in non time series indices should be valid because they behave like regular fields. Fixes elastic#140882 (cherry picked from commit e9bd294) # Conflicts: # rest-api-spec/build.gradle # server/src/main/java/org/elasticsearch/index/IndexFeatures.java # server/src/test/java/org/elasticsearch/search/SearchServiceTests.java # server/src/test/java/org/elasticsearch/search/diversification/DiversifyRetrieverBuilderTests.java # x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCacheTests.java # x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/SecurityIndexReaderWrapperIntegrationTests.java # x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/planner/EsPhysicalOperationProvidersTests.java

gmarouli · 2026-02-04T08:14:18Z

💚 All backports created successfully

Status	Branch	Result
✅	9.2
✅	9.1
✅	8.19

Questions ?

Please refer to the Backport tool documentation

Runtime fields are not allowed to shadow time series metrics and dimensions in a time series index. However, shadowing metrics and dimensions in non time series indices should be valid because they behave like regular fields. Fixes elastic#140882

Runtime fields are not allowed to shadow time series metrics and dimensions in a time series index. However, shadowing metrics and dimensions in non time series indices should be valid because they behave like regular fields. Fixes #140882 (cherry picked from commit e9bd294) # Conflicts: # server/src/test/java/org/elasticsearch/search/SearchServiceTests.java # server/src/test/java/org/elasticsearch/search/diversification/DiversifyRetrieverBuilderTests.java # x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCacheTests.java # x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/SecurityIndexReaderWrapperIntegrationTests.java # x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/planner/EsPhysicalOperationProvidersTests.java

* Fix shadowing ts param in non ts mappings (#141549) Runtime fields are not allowed to shadow time series metrics and dimensions in a time series index. However, shadowing metrics and dimensions in non time series indices should be valid because they behave like regular fields. Fixes #140882 (cherry picked from commit e9bd294) # Conflicts: # rest-api-spec/build.gradle # server/src/main/java/org/elasticsearch/index/IndexFeatures.java # server/src/test/java/org/elasticsearch/search/SearchServiceTests.java # server/src/test/java/org/elasticsearch/search/diversification/DiversifyRetrieverBuilderTests.java # x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCacheTests.java # x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/SecurityIndexReaderWrapperIntegrationTests.java # x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/planner/EsPhysicalOperationProvidersTests.java * [CI] Auto commit changes from spotless --------- Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>

Runtime fields are not allowed to shadow time series metrics and dimensions in a time series index. However, shadowing metrics and dimensions in non time series indices should be valid because they behave like regular fields. Fixes #140882 (cherry picked from commit e9bd294) # Conflicts: # server/src/test/java/org/elasticsearch/search/SearchServiceTests.java # server/src/test/java/org/elasticsearch/search/diversification/DiversifyRetrieverBuilderTests.java

gmarouli added 3 commits January 29, 2026 21:56

Write unit test to capture the difference in validation

8017966

Add index mode parameter to MappingLookup

032bc0d

Update callers

134e5e3

elasticsearchmachine added the v9.4.0 label Jan 29, 2026

gmarouli added 6 commits January 30, 2026 16:22

Merge branch 'main' into fix-shadowing-ts-param-in-non-ts-mappings

6955d44

Make parsing from setting a bit more flexible.

ae52a9a

Make parsing from setting a bit more flexible.

4e72fb6

Merge branch 'main' into fix-shadowing-ts-param-in-non-ts-mappings

2d0c6ef

Update yaml tests

d3a3847

Fix new shadow validation tests

09f6605

gmarouli added auto-backport Automatically create backport pull requests when merged branch:9.2 branch:9.1 branch:8.19 branch:9.3 >bug labels Feb 3, 2026

gmarouli marked this pull request as ready for review February 3, 2026 10:49

gmarouli added the :StorageEngine/Mapping The storage related side of mappings label Feb 3, 2026

elasticsearchmachine added v9.3.1 v9.1.11 v8.19.12 v9.2.6 Team:StorageEngine and removed branch:9.2 branch:9.1 branch:8.19 branch:9.3 labels Feb 3, 2026

Update docs/changelog/141549.yaml

221dbc7

gmarouli added 2 commits February 3, 2026 13:55

Add missing javadoc for indexMode param

1ecba65

Update 141549.yaml

d31483f

gmarouli added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Feb 3, 2026

kkrik-es reviewed Feb 3, 2026

View reviewed changes

gmarouli removed the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Feb 3, 2026

kkrik-es approved these changes Feb 3, 2026

View reviewed changes

lower case the index mode before converting it to

7ba099c

gmarouli added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Feb 3, 2026

elasticsearchmachine merged commit e9bd294 into elastic:main Feb 3, 2026
35 checks passed

gmarouli deleted the fix-shadowing-ts-param-in-non-ts-mappings branch February 3, 2026 14:15

gmarouli mentioned this pull request Feb 3, 2026

[9.3] Fix shadowing ts param in non ts mappings (#141549) #141735

Merged

elasticsearchmachine added the backport pending label Feb 3, 2026

gmarouli mentioned this pull request Feb 4, 2026

[9.2] Fix shadowing ts param in non ts mappings (#141549) #141808

Merged

gmarouli mentioned this pull request Feb 4, 2026

[9.1] Fix shadowing ts param in non ts mappings (#141549) #141809

Merged

gmarouli mentioned this pull request Feb 4, 2026

[8.19] Fix shadowing ts param in non ts mappings (#141549) #141810

Merged

gmarouli removed the backport pending label Feb 4, 2026

This was referenced Feb 4, 2026

[CI] ClientYamlTestSuiteIT test {yaml=tsdb/05_dimension_and_metric_in_non_tsdb_index/can shadow metrics} failing #141869

Closed

[CI] ClientYamlTestSuiteIT test {yaml=tsdb/05_dimension_and_metric_in_non_tsdb_index/can shadow dimensions} failing #141868

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix shadowing ts param in non ts mappings#141549

Fix shadowing ts param in non ts mappings#141549
elasticsearchmachine merged 13 commits intoelastic:mainfrom
gmarouli:fix-shadowing-ts-param-in-non-ts-mappings

gmarouli commented Jan 29, 2026 •

edited

Loading

elasticsearchmachine commented Feb 3, 2026

elasticsearchmachine commented Feb 3, 2026

kkrik-es Feb 3, 2026

kkrik-es Feb 3, 2026

gmarouli Feb 3, 2026

Uh oh!

elasticsearchmachine commented Feb 3, 2026

gmarouli commented Feb 4, 2026

Labels

4 participants

Conversation

gmarouli commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

elasticsearchmachine commented Feb 3, 2026

elasticsearchmachine commented Feb 3, 2026

kkrik-es Feb 3, 2026

Choose a reason for hiding this comment

kkrik-es Feb 3, 2026

Choose a reason for hiding this comment

gmarouli Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

elasticsearchmachine commented Feb 3, 2026

💔 Backport failed

gmarouli commented Feb 4, 2026

💚 All backports created successfully

Questions ?

Labels

4 participants

gmarouli commented Jan 29, 2026 •

edited

Loading