Skip to content

Runtime fields core-with-mapped tests support tsdb #83577

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 3 commits into from
Feb 8, 2022
Merged

Runtime fields core-with-mapped tests support tsdb #83577

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0473e4
support tsdb
weizijun Feb 7, 2022
ae1def7
changelog
weizijun Feb 7, 2022
fcf602c
revert
weizijun Feb 8, 2022
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/83577.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 83577
summary: Runtime fields core-with-mapped tests support tsdb
area: Mapping
type: bug
issues: []
3 changes: 0 additions & 3 deletions x-pack/qa/runtime-fields/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ subprojects {
//there is something wrong when using dotted document syntax here, passes in main yaml tests
'search/330_fetch_fields/Test nested field inside object structure',

// AwaitsFix: https://github.com/elastic/elasticsearch/issues/83431
'search.aggregation/450_time_series/Basic test',
/////// TO FIX ///////

/////// NOT SUPPORTED ///////
Expand All @@ -101,7 +99,6 @@ subprojects {
'search/330_fetch_fields/error includes glob pattern',
// we need a @timestamp field to be defined in index mapping
'search/380_sort_segments_on_timestamp/*',
'field_caps/40_time_series/*',
Copy link
Member

@nik9000 nik9000 Feb 7, 2022

Choose a reason for hiding this comment

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

I wonder if this is a bit broad. How many are failing without this?

Copy link
Contributor Author

@weizijun weizijun Feb 8, 2022

Choose a reason for hiding this comment

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

The yaml failed because of the setup create index, index mapping has time_series_dimension and time_series_metric.
I remove this line, and run the test, it is ok.

Copy link
Member

@nik9000 nik9000 Feb 8, 2022

Choose a reason for hiding this comment

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

Could you remove the line from the PR? I think you've covered this in the translater.

Copy link
Contributor Author

@weizijun weizijun Feb 8, 2022

Choose a reason for hiding this comment

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

ok, done

/////// NOT SUPPORTED ///////
].join(',')
}
Expand Down
13 changes: 13 additions & 0 deletions ...e-fields/src/main/java/org/elasticsearch/xpack/runtimefields/test/CoreTestTranslater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.core.RestApiVersion;
import org.elasticsearch.index.mapper.BooleanFieldMapper;
import org.elasticsearch.index.mapper.DataStreamTimestampFieldMapper;
import org.elasticsearch.index.mapper.DateFieldMapper;
import org.elasticsearch.index.mapper.GeoPointFieldMapper;
import org.elasticsearch.index.mapper.IpFieldMapper;
Expand Down Expand Up @@ -292,6 +293,18 @@ protected final boolean runtimeifyMappingProperties(Map<String, Object> properti
// Our source reading script doesn't emulate ignore_malformed
continue;
}
if (propertyMap.containsKey("time_series_dimension")) {
// time_series_dimension field can't emulate with scripts.
continue;
}
if (propertyMap.containsKey("time_series_metric")) {
// time_series_metric field can't emulate with scripts.
continue;
}
if (name.equals(DataStreamTimestampFieldMapper.DEFAULT_PATH)) {
// time_series and data stream indices need timestamp field
continue;
}
Copy link
Member

@nik9000 nik9000 Feb 7, 2022

Choose a reason for hiding this comment

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

👍

if (RUNTIME_TYPES.contains(type) == false) {
continue;
}
Expand Down