Skip to content

Minor FlatObjectFieldMapper fix #62633

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 1 commit into from
Sep 18, 2020
Merged

Minor FlatObjectFieldMapper fix #62633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 3 additions & 21 deletions ...attened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ public Mapper.Builder<?> parse(String name, Map<String, Object> node, ParserCont
*/
public static final class KeyedFlatObjectFieldType extends StringFieldType {
private final String key;
private boolean splitQueriesOnWhitespace;

public KeyedFlatObjectFieldType(String name, boolean indexed, boolean hasDocValues, String key,
boolean splitQueriesOnWhitespace, Map<String, String> meta) {
Expand All @@ -236,7 +235,6 @@ public KeyedFlatObjectFieldType(String name, boolean indexed, boolean hasDocValu
meta);
setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
this.key = key;
this.splitQueriesOnWhitespace = splitQueriesOnWhitespace;
}

private KeyedFlatObjectFieldType(String name, String key, RootFlatObjectFieldType ref) {
Expand All @@ -252,14 +250,6 @@ public String key() {
return key;
}

public boolean splitQueriesOnWhitespace() {
return splitQueriesOnWhitespace;
}

public void setSplitQueriesOnWhitespace(boolean splitQueriesOnWhitespace) {
this.splitQueriesOnWhitespace = splitQueriesOnWhitespace;
}

@Override
public Query existsQuery(QueryShardContext context) {
Term term = new Term(name(), FlatObjectFieldParser.createKeyedValue(key, ""));
Expand Down Expand Up @@ -438,7 +428,7 @@ public IndexFieldData<?> build(IndexFieldDataCache cache, CircuitBreakerService
* searches on the flat object field itself, e.g. 'my_flat_object: some_value'.
*/
public static final class RootFlatObjectFieldType extends StringFieldType {
private boolean splitQueriesOnWhitespace;
private final boolean splitQueriesOnWhitespace;

public RootFlatObjectFieldType(String name, boolean indexed, boolean hasDocValues, Map<String, String> meta,
boolean splitQueriesOnWhitespace) {
Expand All @@ -453,14 +443,6 @@ public String typeName() {
return CONTENT_TYPE;
}

public boolean splitQueriesOnWhitespace() {
return splitQueriesOnWhitespace;
}

public void setSplitQueriesOnWhitespace(boolean splitQueriesOnWhitespace) {
this.splitQueriesOnWhitespace = splitQueriesOnWhitespace;
}

@Override
public Object valueForDisplay(Object value) {
if (value == null) {
Expand Down Expand Up @@ -596,8 +578,8 @@ protected void doXContentBody(XContentBuilder builder, boolean includeDefaults,
builder.field("null_value", nullValue);
}

if (includeDefaults || fieldType().splitQueriesOnWhitespace()) {
builder.field("split_queries_on_whitespace", fieldType().splitQueriesOnWhitespace());
if (includeDefaults || fieldType().splitQueriesOnWhitespace) {
builder.field("split_queries_on_whitespace", fieldType().splitQueriesOnWhitespace);
}
}
}