honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make FieldMapper.copyTo() always non-null. (#25994) 

Otherwise it is confusing that both a null copyTo and an empty copyTo should
be treated the same.
This commit is contained in:
Adrien Grand 2017-08-02 10:07:29 +02:00 committed by GitHub
parent 58feb5efa0
commit 88d456989e
7 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java
View File

@ -473,9 +473,7 @@ final class DocumentParser {
if (update != null) {
context.addDynamicMapper(update);
}
if (fieldMapper.copyTo() != null) {
parseCopyFields(context, fieldMapper.copyTo().copyToFields());
}
parseCopyFields(context, fieldMapper.copyTo().copyToFields());
}
}

19
core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
View File

@ -43,6 +43,7 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.StreamSupport;
public abstract class FieldMapper extends Mapper implements Cloneable {
@ -60,7 +61,7 @@ public abstract class FieldMapper extends Mapper implements Cloneable {
protected boolean indexOptionsSet = false;
protected boolean docValuesSet = false;
protected final MultiFields.Builder multiFieldsBuilder;
protected CopyTo copyTo;
protected CopyTo copyTo = CopyTo.empty();
protected Builder(String name, MappedFieldType fieldType, MappedFieldType defaultFieldType) {
super(name);
@ -256,7 +257,7 @@ public abstract class FieldMapper extends Mapper implements Cloneable {
defaultFieldType.freeze();
this.defaultFieldType = defaultFieldType;
this.multiFields = multiFields;
this.copyTo = copyTo;
this.copyTo = Objects.requireNonNull(copyTo);
}
@Override
@ -407,10 +408,7 @@ public abstract class FieldMapper extends Mapper implements Cloneable {
}
multiFields.toXContent(builder, params);
if (copyTo != null) {
copyTo.toXContent(builder, params);
}
copyTo.toXContent(builder, params);
}
protected final void doXContentAnalyzers(XContentBuilder builder, boolean includeDefaults) throws IOException {
@ -617,6 +615,12 @@ public abstract class FieldMapper extends Mapper implements Cloneable {
*/
public static class CopyTo {
private static final CopyTo EMPTY = new CopyTo(Collections.emptyList());
public static CopyTo empty() {
return EMPTY;
}
private final List<String> copyToFields;
private CopyTo(List<String> copyToFields) {
@ -643,6 +647,9 @@ public abstract class FieldMapper extends Mapper implements Cloneable {
}
public CopyTo build() {
if (copyToBuilders.isEmpty()) {
return EMPTY;
}
return new CopyTo(Collections.unmodifiableList(copyToBuilders));
}
}

2
core/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java
View File

@ -55,7 +55,7 @@ public abstract class MetadataFieldMapper extends FieldMapper {
}
protected MetadataFieldMapper(String simpleName, MappedFieldType fieldType, MappedFieldType defaultFieldType, Settings indexSettings) {
super(simpleName, fieldType, defaultFieldType, indexSettings, MultiFields.empty(), null);
super(simpleName, fieldType, defaultFieldType, indexSettings, MultiFields.empty(), CopyTo.empty());
}
/**

2
core/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java
View File

@ -95,7 +95,7 @@ public class DocumentFieldMapperTests extends LuceneTestCase {
private static final Settings SETTINGS = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build();
FakeFieldMapper(String simpleName, MappedFieldType fieldType) {
super(simpleName, fieldType.clone(), fieldType.clone(), SETTINGS, null, null);
super(simpleName, fieldType.clone(), fieldType.clone(), SETTINGS, MultiFields.empty(), CopyTo.empty());
}
@Override

2
modules/parent-join/src/main/java/org/elasticsearch/join/mapper/MetaJoinFieldMapper.java
View File

@ -108,7 +108,7 @@ public class MetaJoinFieldMapper extends FieldMapper {
}
MetaJoinFieldMapper(String name, MappedFieldType fieldType, Settings indexSettings) {
super(name, fieldType, ParentIdFieldMapper.Defaults.FIELD_TYPE, indexSettings, MultiFields.empty(), null);
super(name, fieldType, ParentIdFieldMapper.Defaults.FIELD_TYPE, indexSettings, MultiFields.empty(), CopyTo.empty());
}
void setFieldMapper(ParentJoinFieldMapper mapper) {

2
modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java
View File

@ -134,7 +134,7 @@ public final class ParentIdFieldMapper extends FieldMapper {
Set<String> children,
MappedFieldType fieldType,
Settings indexSettings) {
super(simpleName, fieldType, Defaults.FIELD_TYPE, indexSettings, MultiFields.empty(), null);
super(simpleName, fieldType, Defaults.FIELD_TYPE, indexSettings, MultiFields.empty(), CopyTo.empty());
this.parentName = parentName;
this.children = children;
}

2
modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java
View File

@ -249,7 +249,7 @@ public final class ParentJoinFieldMapper extends FieldMapper {
MetaJoinFieldMapper uniqueFieldMapper,
List<ParentIdFieldMapper> parentIdFields,
boolean eagerGlobalOrdinals) {
super(simpleName, fieldType, Defaults.FIELD_TYPE, indexSettings, MultiFields.empty(), null);
super(simpleName, fieldType, Defaults.FIELD_TYPE, indexSettings, MultiFields.empty(), CopyTo.empty());
this.parentIdFields = parentIdFields;
this.uniqueFieldMapper = uniqueFieldMapper;
this.uniqueFieldMapper.setFieldMapper(this);