Skip time series field type merge for non-TS agg queries#143262
Merged
kkrik-es merged 3 commits intoelastic:mainfrom Mar 2, 2026
Merged
Skip time series field type merge for non-TS agg queries#143262kkrik-es merged 3 commits intoelastic:mainfrom
kkrik-es merged 3 commits intoelastic:mainfrom
Conversation
The timeSeriesFieldType.merge check in IndexResolver.createField could produce InvalidMappedField errors for queries that do not use time series aggregation. This adds a hasTimeSeriesAggregation flag to FieldsInfo, set by PreAnalyzer when a TimeSeriesAggregate or PromqlCommand is present, so the merge is only enforced when the query actually aggregates time series data. Made-with: Cursor
kkrik-es
added
>enhancement
Team:StorageEngine
:StorageEngine/ES|QL
Collaborator
|
Hi @kkrik-es, I've created a changelog YAML for you. |
kkrik-es
added
auto-backport
Collaborator
|
Pinging @elastic/es-storage-engine (Team:StorageEngine) |
sidosera
approved these changes
Mar 2, 2026
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
szybia
added a commit
to szybia/elasticsearch
that referenced
this pull request
Mar 2, 2026
…locations
* upstream/main: (94 commits)
Mute org.elasticsearch.xpack.esql.qa.mixed.EsqlClientYamlIT test {p0=esql/40_tsdb/TS Command grouping on text field} elastic#142544
Mute org.elasticsearch.index.store.StoreDirectoryMetricsIT testDirectoryMetrics elastic#143419
Mute org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT test elastic#143023
TS_INFO information retrieval command (elastic#142721)
ESQL: External source parallel execution and distribution (elastic#143349)
Mute org.elasticsearch.index.mapper.blockloader.FlattenedFieldRootBlockLoaderTests testBlockLoaderForFieldInObject {preference=Params[syntheticSource=false, preference=DOC_VALUES]} elastic#143414
Mute org.elasticsearch.index.mapper.blockloader.FlattenedFieldRootBlockLoaderTests testBlockLoaderForFieldInObject {preference=Params[syntheticSource=false, preference=NONE]} elastic#143413
Mute org.elasticsearch.index.mapper.blockloader.FlattenedFieldRootBlockLoaderTests testBlockLoaderForFieldInObject {preference=Params[syntheticSource=false, preference=STORED]} elastic#143412
Removing ingest random sampling (elastic#143289)
Mute org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT test elastic#143023
[Transform] Clean up internal tests (elastic#143246)
Skip time series field type merge for non-TS agg queries (elastic#143262)
Enable zero-copy SIMD vector scoring on searchable snapshots (frozen tier) (elastic#141718)
Mute org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT testCancelViaExpirationOnRemoteResultsWithMinimizeRoundtrips elastic#143407
Fix MemorySegmentUtilsTests (elastic#143391)
Unmute testWorkflowsRestrictionAllowsAccess (elastic#143308)
Cancel async query on expiry (elastic#143016)
ESQL: Finish migrating error testing (elastic#143322)
Reduce LuceneOperator.Status memory consumption with large QueryDSL queries (elastic#143175)
ESQL: Generative testing with full text functions (elastic#142961)
...
kkrik-es
removed
backport pending
auto-backport
tballison
pushed a commit
to tballison/elasticsearch
that referenced
this pull request
Mar 3, 2026
) * Skip time series field type merge for non-TS queries The timeSeriesFieldType.merge check in IndexResolver.createField could produce InvalidMappedField errors for queries that do not use time series aggregation. This adds a hasTimeSeriesAggregation flag to FieldsInfo, set by PreAnalyzer when a TimeSeriesAggregate or PromqlCommand is present, so the merge is only enforced when the query actually aggregates time series data. Made-with: Cursor * Update docs/changelog/143262.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Conflicting time series information is only relevant for time series aggregations. The rest of the queries can ignore this field.