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

Remove extraneous references to 'tokenized' in the mapper code. (#31010) 

These are likely left over from when there were three options for
the index mapping ('no', 'analyzed', 'not_analyzed').
This commit is contained in:
Julie Tibshirani 2018-06-08 09:23:46 -07:00 committed by GitHub
parent a86c0f8c25
commit 2378fa19b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java
View File

@ -84,14 +84,6 @@ public class BooleanFieldMapper extends FieldMapper {
this.builder = this;
}
@Override
public Builder tokenized(boolean tokenized) {
if (tokenized) {
throw new IllegalArgumentException("bool field can't be tokenized");
}
return super.tokenized(tokenized);
}
@Override
public BooleanFieldMapper build(BuilderContext context) {
setupFieldType(context);

15
server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
View File

@ -147,11 +147,6 @@ public abstract class FieldMapper extends Mapper implements Cloneable {
return builder;
}
public T tokenized(boolean tokenized) {
this.fieldType.setTokenized(tokenized);
return builder;
}
public T boost(float boost) {
this.fieldType.setBoost(boost);
return builder;
@ -376,9 +371,8 @@ public abstract class FieldMapper extends Mapper implements Cloneable {
boolean indexed = fieldType().indexOptions() != IndexOptions.NONE;
boolean defaultIndexed = defaultFieldType.indexOptions() != IndexOptions.NONE;
if (includeDefaults || indexed != defaultIndexed ||
fieldType().tokenized() != defaultFieldType.tokenized()) {
builder.field("index", indexTokenizeOption(indexed, fieldType().tokenized()));
if (includeDefaults || indexed != defaultIndexed) {
builder.field("index", indexed);
}
if (includeDefaults || fieldType().stored() != defaultFieldType.stored()) {
builder.field("store", fieldType().stored());
@ -474,11 +468,6 @@ public abstract class FieldMapper extends Mapper implements Cloneable {
}
}
/* Only protected so that string can override it */
protected Object indexTokenizeOption(boolean indexed, boolean tokenized) {
return indexed;
}
protected abstract String contentType();
public static class MultiFields {

2
server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java
View File

@ -165,7 +165,7 @@ public abstract class MappedFieldType extends FieldType {
boolean indexed = indexOptions() != IndexOptions.NONE;
boolean mergeWithIndexed = other.indexOptions() != IndexOptions.NONE;
// TODO: should be validating if index options go "up" (but "down" is ok)
if (indexed != mergeWithIndexed || tokenized() != other.tokenized()) {
if (indexed != mergeWithIndexed) {
conflicts.add("mapper [" + name() + "] has different [index] values");
}
if (stored() != other.stored()) {

2
server/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java
View File

@ -122,7 +122,7 @@ public class MultiFieldTests extends ESSingleNodeTestCase {
DocumentMapper builderDocMapper = new DocumentMapper.Builder(new RootObjectMapper.Builder("person").add(
new TextFieldMapper.Builder("name").store(true)
.addMultiField(new TextFieldMapper.Builder("indexed").index(true).tokenized(true))
.addMultiField(new TextFieldMapper.Builder("indexed").index(true))
.addMultiField(new TextFieldMapper.Builder("not_indexed").index(false).store(true))
), indexService.mapperService()).build(indexService.mapperService());