Skip to content

Expose mapped type for the @timestamp field #137531

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
albertzaharovits merged 2 commits into from
Nov 3, 2025
Merged

Expose mapped type for the @timestamp field #137531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7027710
Expose field mapper type for timestamp field
albertzaharovits Nov 3, 2025
14a7f67
Mark as nullable
albertzaharovits Nov 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
18 changes: 9 additions & 9 deletions server/src/main/java/org/elasticsearch/index/mapper/MappingLookup.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.index.IndexSettings;
import org.elasticsearch.index.analysis.IndexAnalyzers;
import org.elasticsearch.index.analysis.NamedAnalyzer;
import org.elasticsearch.index.mapper.DateFieldMapper.DateFieldType;
import org.elasticsearch.inference.InferenceService;
import org.elasticsearch.search.lookup.SourceFilter;

Expand Down Expand Up @@ -530,19 +531,18 @@ public boolean isDataStreamTimestampFieldEnabled() {
}

/**
* Returns if this mapping contains a timestamp field that is of type date, has doc values, and is either indexed or uses a doc values
* skipper.
* @return {@code true} if contains a timestamp field of type date that has doc values and is either indexed or uses a doc values
* skipper, {@code false} otherwise.
* If this mapping contains a timestamp field that is of type date, has doc values, and is either indexed or uses a doc values
* skipper, this returns the field type for it.
*/
public boolean hasTimestampField() {
public DateFieldType getTimestampFieldType() {
Copy link
Contributor

@andreidan andreidan Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we mark the method as @Nullable so callers get some indication of the result needing a null check?

Copy link
Contributor Author

@albertzaharovits albertzaharovits Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, good point, I've pushed 14a7f67

final MappedFieldType mappedFieldType = fieldTypesLookup().get(DataStream.TIMESTAMP_FIELD_NAME);
if (mappedFieldType instanceof DateFieldMapper.DateFieldType dateMappedFieldType) {
if (mappedFieldType instanceof DateFieldType dateMappedFieldType) {
IndexType indexType = dateMappedFieldType.indexType();
return indexType.hasPoints() || indexType.hasDocValuesSkipper();
} else {
return false;
if (indexType.hasPoints() || indexType.hasDocValuesSkipper()) {
return dateMappedFieldType;
}
}
return null;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3842,7 +3842,7 @@ private EngineConfig newEngineConfig(LongSupplier globalCheckpointSupplier) {
this.warmer.warm(reader);
}
};
final boolean isTimeBasedIndex = mapperService == null ? false : mapperService.mappingLookup().hasTimestampField();
final boolean isTimeBasedIndex = mapperService == null ? false : mapperService.mappingLookup().getTimestampFieldType() != null;
return new EngineConfig(
shardId,
threadPool,
Expand Down