Skip to content

Configure keeping source in FieldMapper #112706

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 22 commits into from
Sep 19, 2024
+619 −25
Merged

Configure keeping source in FieldMapper #112706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3ece000
Configure keeping source in FieldMapper
kkrik-es Sep 10, 2024
eb2be1a
Merge branch 'main' into synthetic-source/keep-field-param
kkrik-es Sep 10, 2024
5d5566e
Update docs/changelog/112706.yaml
kkrik-es Sep 10, 2024
1a2e4af
revert unintended
kkrik-es Sep 10, 2024
9f72215
Merge remote-tracking branch 'origin/synthetic-source/keep-field-para…
kkrik-es Sep 10, 2024
9135045
spotless
kkrik-es Sep 10, 2024
9aed8b1
fix tests
kkrik-es Sep 10, 2024
8746f59
fix tests
kkrik-es Sep 10, 2024
f9a677e
fix tests
kkrik-es Sep 10, 2024
885f975
Merge branch 'main' into synthetic-source/keep-field-param
kkrik-es Sep 11, 2024
a29d601
address comments
kkrik-es Sep 11, 2024
2043bf3
spotless
kkrik-es Sep 11, 2024
be782bc
Merge branch 'main' into synthetic-source/keep-field-param
kkrik-es Sep 12, 2024
ad5458b
address review comments
kkrik-es Sep 12, 2024
806f434
fix test
kkrik-es Sep 12, 2024
e026593
spotless
kkrik-es Sep 12, 2024
d664029
Merge branch 'main' into synthetic-source/keep-field-param
kkrik-es Sep 13, 2024
e47623c
sync
kkrik-es Sep 13, 2024
887e822
disable keeping array source in randomized tests
kkrik-es Sep 13, 2024
fa15f55
Merge branch 'main' into synthetic-source/keep-field-param
kkrik-es Sep 19, 2024
2afddca
enable in randomized tests
kkrik-es Sep 19, 2024
64658f3
check for conflicting ignored values on second pass
kkrik-es Sep 19, 2024
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/112706.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 112706
summary: Configure keeping source in `FieldMapper`
area: Mapping
type: enhancement
issues: []
4 changes: 3 additions & 1 deletion ...aRestTest/java/org/elasticsearch/datastreams/logsdb/qa/matchers/source/SourceMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@ private Optional<MatchResult> matchWithFieldSpecificMatcher(String fieldName, Li

// Checks for scenarios when source is stored exactly and therefore can be compared without special logic.
private boolean sourceMatchesExactly(MappingTransforms.FieldMapping mapping, List<Object> expectedValues) {
return mapping.parentMappingParameters().stream().anyMatch(m -> m.getOrDefault("enabled", "true").equals("false"));
return mapping.parentMappingParameters().stream().anyMatch(m -> m.getOrDefault("enabled", "true").equals("false"))
|| mapping.mappingParameters().getOrDefault("synthetic_source_keep", "none").equals("all")
|| expectedValues.size() > 1 && mapping.mappingParameters().getOrDefault("synthetic_source_keep", "none").equals("arrays");
}

private MatchResult matchWithGenericMatcher(List<Object> actualValues, List<Object> expectedValues) {
Expand Down
Loading