Skip to content
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

Jump to bottom

Added null check for ParentJoinFieldMapper #42997 #43360

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Added null check for ParentJoinFieldMapper #42997 #43360

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2a9f76
Added null check for ParentJoinFieldMapper
0xamogh Jun 19, 2019
c5e57c5
Merge remote-tracking branch 'elasticsearch/master'
0xamogh Jun 22, 2019
4fe2c80
Flattened nested if-else structure
0xamogh Jun 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...nt-join/src/main/java/org/elasticsearch/join/aggregations/ChildrenAggregationBuilder.java
View file
Open in desktop
Expand Up @@ -112,15 +112,19 @@ protected ValuesSourceConfig<WithOrdinals> resolveConfig(SearchContext context)

private void joinFieldResolveConfig(SearchContext context, ValuesSourceConfig<WithOrdinals> config) {
ParentJoinFieldMapper parentJoinFieldMapper = ParentJoinFieldMapper.getMapper(context.mapperService());
if(parentJoinFieldMapper == null){
config.unmapped(true);
}

ParentIdFieldMapper parentIdFieldMapper = parentJoinFieldMapper.getParentIdFieldMapper(childType, false);
if (parentIdFieldMapper != null) {
if (parentIdFieldMapper == null) {
config.unmapped(true);
} else {
parentFilter = parentIdFieldMapper.getParentFilter();
childFilter = parentIdFieldMapper.getChildFilter(childType);
MappedFieldType fieldType = parentIdFieldMapper.fieldType();
final SortedSetDVOrdinalsIndexFieldData fieldData = context.getForField(fieldType);
config.fieldContext(new FieldContext(fieldType.name(), fieldData, fieldType));
} else {
config.unmapped(true);
}
}

Expand Down