Skip to content

Commit

Permalink
Merge pull request #11272 from rjernst/refactor/mapper-names
Browse files Browse the repository at this point in the history 
Mappings: Cleanup names handling
  • Loading branch information
@rjernst
rjernst committed May 21, 2015
2 parents 17eec9d + 5203205 commit ea3c5d5
Show file tree
Hide file tree
Showing 19 changed files with 57 additions and 104 deletions.
4 changes: 2 additions & 2 deletions .../elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java
View file
Expand Up @@ -201,8 +201,8 @@ private ImmutableMap<String, FieldMappingMetaData> findFieldMappingsByType(Docum
}
for (Iterator<FieldMapper<?>> it = remainingFieldMappers.iterator(); it.hasNext(); ) {
final FieldMapper<?> fieldMapper = it.next();
if (Regex.simpleMatch(field, fieldMapper.names().name())) {
addFieldMapper(fieldMapper.names().name(), fieldMapper, fieldMappings, request.includeDefaults());
if (Regex.simpleMatch(field, fieldMapper.names().shortName())) {
addFieldMapper(fieldMapper.names().shortName(), fieldMapper, fieldMappings, request.includeDefaults());
it.remove();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java
View file
Expand Up @@ -61,7 +61,7 @@ public IndexFieldData.XFieldComparatorSource comparatorSource(Object missingValu
}

private IllegalStateException fail() {
return new IllegalStateException("Field data loading is forbidden on " + getFieldNames().name());
return new IllegalStateException("Field data loading is forbidden on " + getFieldNames().fullName());
}

}
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java
View file
Expand Up @@ -97,7 +97,7 @@ public IndexFieldData<?> build(Index index, Settings indexSettings, FieldMapper<
final Settings fdSettings = mapper.fieldDataType().getSettings();
final Map<String, Settings> filter = fdSettings.getGroups("filter");
if (filter != null && !filter.isEmpty()) {
throw new IllegalArgumentException("Doc values field data doesn't support filters [" + fieldNames.name() + "]");
throw new IllegalArgumentException("Doc values field data doesn't support filters [" + fieldNames.fullName() + "]");
}

if (BINARY_INDEX_FIELD_NAMES.contains(fieldNames.indexName())) {
Expand Down
18 changes: 1 addition & 17 deletions src/main/java/org/elasticsearch/index/mapper/ContentPath.java
View file
Expand Up @@ -19,12 +19,9 @@

package org.elasticsearch.index.mapper;

/**
*
*/
public class ContentPath {

public static enum Type {
public enum Type {
JUST_NAME,
FULL,
}
Expand All @@ -41,8 +38,6 @@ public static enum Type {

private String[] path = new String[10];

private String sourcePath;

public ContentPath() {
this(0);
}
Expand All @@ -60,7 +55,6 @@ public ContentPath(int offset) {

public void reset() {
this.index = 0;
this.sourcePath = null;
}

public void add(String name) {
Expand Down Expand Up @@ -99,14 +93,4 @@ public Type pathType() {
public void pathType(Type type) {
this.pathType = type;
}

public String sourcePath(String sourcePath) {
String orig = this.sourcePath;
this.sourcePath = sourcePath;
return orig;
}

public String sourcePath() {
return this.sourcePath;
}
}
68 changes: 19 additions & 49 deletions src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
View file
Expand Up @@ -44,41 +44,34 @@
*/
public interface FieldMapper<T> extends Mapper {

public static final String DOC_VALUES_FORMAT = "doc_values_format";
String DOC_VALUES_FORMAT = "doc_values_format";

public static class Names {
class Names {

private final String name;
private final String shortName;

private final String indexName;

private final String indexNameClean;
private final String originalIndexName;

private final String fullName;

private final String sourcePath;

public Names(String name) {
this(name, name, name, name);
}

public Names(String name, String indexName, String indexNameClean, String fullName) {
this(name, indexName, indexNameClean, fullName, fullName);
}

public Names(String name, String indexName, String indexNameClean, String fullName, @Nullable String sourcePath) {
this.name = name;
public Names(String shortName, String indexName, String originalIndexName, String fullName) {
this.shortName = shortName;
this.indexName = indexName;
this.indexNameClean = indexNameClean;
this.originalIndexName = originalIndexName;
this.fullName = fullName;
this.sourcePath = sourcePath == null ? this.fullName : sourcePath;
}

/**
* The logical name of the field.
*/
public String name() {
return name;
public String shortName() {
return shortName;
}

/**
Expand All @@ -90,10 +83,10 @@ public String indexName() {
}

/**
* The cleaned index name, before any "path" modifications performed on it.
* The original index name, before any "path" modifications performed on it.
*/
public String indexNameClean() {
return indexNameClean;
public String originalIndexName() {
return originalIndexName;
}

/**
Expand All @@ -103,27 +96,6 @@ public String fullName() {
return fullName;
}

/**
* The dot path notation to extract the value from source.
*/
public String sourcePath() {
return sourcePath;
}

/**
* Creates a new index term based on the provided value.
*/
public Term createIndexNameTerm(String value) {
return new Term(indexName, value);
}

/**
* Creates a new index term based on the provided value.
*/
public Term createIndexNameTerm(BytesRef value) {
return new Term(indexName, value);
}

@Override
public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) return false;
Expand All @@ -132,25 +104,23 @@ public boolean equals(Object o) {

if (!fullName.equals(names.fullName)) return false;
if (!indexName.equals(names.indexName)) return false;
if (!indexNameClean.equals(names.indexNameClean)) return false;
if (!name.equals(names.name)) return false;
if (!sourcePath.equals(names.sourcePath)) return false;
if (!originalIndexName.equals(names.originalIndexName)) return false;
if (!shortName.equals(names.shortName)) return false;

return true;
}

@Override
public int hashCode() {
int result = name.hashCode();
int result = shortName.hashCode();
result = 31 * result + indexName.hashCode();
result = 31 * result + indexNameClean.hashCode();
result = 31 * result + originalIndexName.hashCode();
result = 31 * result + fullName.hashCode();
result = 31 * result + sourcePath.hashCode();
return result;
}
}

public static enum Loading {
enum Loading {
LAZY {
@Override
public String toString() {
Expand Down Expand Up @@ -220,7 +190,7 @@ public static Loading parse(String loading, Loading defaultValue) {
/**
* List of fields where this field should be copied to
*/
public AbstractFieldMapper.CopyTo copyTo();
AbstractFieldMapper.CopyTo copyTo();

/**
* Returns the actual value of the field.
Expand Down Expand Up @@ -285,7 +255,7 @@ public static Loading parse(String loading, Loading defaultValue) {
*
* @return If the field is available before indexing or not.
* */
public boolean isGenerated();
boolean isGenerated();

/**
* Parse using the provided {@link ParseContext} and return a mapping
Expand Down
31 changes: 17 additions & 14 deletions src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
View file
Expand Up @@ -19,7 +19,6 @@

package org.elasticsearch.index.mapper.core;

import com.carrotsearch.hppc.ObjectHashSet;
import com.carrotsearch.hppc.cursors.ObjectCursor;
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import com.google.common.base.Function;
Expand All @@ -33,7 +32,6 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.queries.TermsQuery;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.FuzzyQuery;
import org.apache.lucene.search.MultiTermQuery;
import org.apache.lucene.search.PrefixQuery;
Expand Down Expand Up @@ -261,7 +259,7 @@ public T copyTo(CopyTo copyTo) {
}

protected Names buildNames(BuilderContext context) {
return new Names(name, buildIndexName(context), buildIndexNameClean(context), buildFullName(context), context.path().sourcePath());
return new Names(name, buildIndexName(context), buildIndexNameClean(context), buildFullName(context));
}

protected String buildIndexName(BuilderContext context) {
Expand Down Expand Up @@ -364,7 +362,8 @@ public final boolean hasDocValues() {

@Override
public String name() {
return names.name();
// TODO: cleanup names so Mapper knows about paths, so that it is always clear whether we are using short or full name
return names.shortName();
}

@Override
Expand Down Expand Up @@ -475,7 +474,7 @@ public boolean useTermQueryWithQueryString() {

@Override
public Query termQuery(Object value, @Nullable QueryParseContext context) {
return new TermQuery(names().createIndexNameTerm(indexedValueForSearch(value)));
return new TermQuery(createTerm(value));
}

@Override
Expand Down Expand Up @@ -509,12 +508,12 @@ public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower

@Override
public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
return new FuzzyQuery(names.createIndexNameTerm(indexedValueForSearch(value)), fuzziness.asDistance(value), prefixLength, maxExpansions, transpositions);
return new FuzzyQuery(createTerm(value), fuzziness.asDistance(value), prefixLength, maxExpansions, transpositions);
}

@Override
public Query prefixQuery(Object value, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
PrefixQuery query = new PrefixQuery(names().createIndexNameTerm(indexedValueForSearch(value)));
PrefixQuery query = new PrefixQuery(createTerm(value));
if (method != null) {
query.setRewriteMethod(method);
}
Expand All @@ -523,13 +522,17 @@ public Query prefixQuery(Object value, @Nullable MultiTermQuery.RewriteMethod me

@Override
public Query regexpQuery(Object value, int flags, int maxDeterminizedStates, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
RegexpQuery query = new RegexpQuery(names().createIndexNameTerm(indexedValueForSearch(value)), flags, maxDeterminizedStates);
RegexpQuery query = new RegexpQuery(createTerm(value), flags, maxDeterminizedStates);
if (method != null) {
query.setRewriteMethod(method);
}
return query;
}

protected Term createTerm(Object value) {
return new Term(names.indexName(), indexedValueForSearch(value));
}

@Override
public Query nullValueFilter() {
return null;
Expand Down Expand Up @@ -629,7 +632,7 @@ public void merge(Mapper mergeWith, MergeResult mergeResult) throws MergeMapping

@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(names.name());
builder.startObject(names.shortName());
boolean includeDefaults = params.paramAsBoolean("include_defaults", false);
doXContentBody(builder, includeDefaults, params);
return builder.endObject();
Expand All @@ -638,8 +641,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException {

builder.field("type", contentType());
if (indexCreatedBefore2x && (includeDefaults || !names.name().equals(names.indexNameClean()))) {
builder.field("index_name", names.indexNameClean());
if (indexCreatedBefore2x && (includeDefaults || !names.shortName().equals(names.originalIndexName()))) {
builder.field("index_name", names.originalIndexName());
}

if (includeDefaults || boost != 1.0f) {
Expand Down Expand Up @@ -864,7 +867,7 @@ public void parse(AbstractFieldMapper mainField, ParseContext context) throws IO
ContentPath.Type origPathType = context.path().pathType();
context.path().pathType(pathType);

context.path().add(mainField.name());
context.path().add(mainField.names().shortName());
for (ObjectCursor<FieldMapper> cursor : mappers.values()) {
cursor.value.parse(context);
}
Expand All @@ -881,7 +884,7 @@ public void merge(Mapper mergeWith, MergeResult mergeResult) throws MergeMapping

for (ObjectCursor<FieldMapper> cursor : mergeWithMultiField.multiFields.mappers.values()) {
FieldMapper mergeWithMapper = cursor.value;
Mapper mergeIntoMapper = mappers.get(mergeWithMapper.name());
Mapper mergeIntoMapper = mappers.get(mergeWithMapper.names().shortName());
if (mergeIntoMapper == null) {
// no mapping, simply add it if not simulating
if (!mergeResult.simulate()) {
Expand All @@ -892,7 +895,7 @@ public void merge(Mapper mergeWith, MergeResult mergeResult) throws MergeMapping
if (newMappersBuilder == null) {
newMappersBuilder = ImmutableOpenMap.builder(mappers);
}
newMappersBuilder.put(mergeWithMapper.name(), mergeWithMapper);
newMappersBuilder.put(mergeWithMapper.names().shortName(), mergeWithMapper);
if (mergeWithMapper instanceof AbstractFieldMapper) {
if (newFieldMappers == null) {
newFieldMappers = new ArrayList<>(2);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
View file
Expand Up @@ -461,7 +461,7 @@ public TokenStream tokenStream(Analyzer analyzer, TokenStream previous) throws I

@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(name())
builder.startObject(names().shortName())
.field(Fields.TYPE, CONTENT_TYPE);

builder.field(Fields.ANALYZER, indexAnalyzer.name());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapper.java
View file
Expand Up @@ -144,7 +144,7 @@ protected void parseCreateField(ParseContext context, List<Field> fields) throws
if (valueAndBoost.value() == null) {
count = nullValue();
} else {
count = countPositions(analyzer.analyzer().tokenStream(name(), valueAndBoost.value()));
count = countPositions(analyzer.analyzer().tokenStream(names().shortName(), valueAndBoost.value()));
}
addIntegerFields(context, fields, count, valueAndBoost.boost());
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java
View file
Expand Up @@ -515,7 +515,7 @@ protected void parseCreateField(ParseContext context, List<Field> fields) throws
public Mapper parse(ParseContext context) throws IOException {
ContentPath.Type origPathType = context.path().pathType();
context.path().pathType(pathType);
context.path().add(name());
context.path().add(names().shortName());

GeoPoint sparse = context.parseExternalValue(GeoPoint.class);

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
View file
Expand Up @@ -193,7 +193,7 @@ public Query queryStringTermQuery(Term term) {

@Override
public Query termQuery(Object value, QueryParseContext context) {
return queryStringTermQuery(names().createIndexNameTerm(indexedValueForSearch(value)));
return queryStringTermQuery(createTerm(value));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java
View file
Expand Up @@ -133,7 +133,7 @@ public Query termQuery(Object value, @Nullable QueryParseContext context) {
if (fieldType.indexOptions() == IndexOptions.NONE) {
return new ConstantScoreQuery(new PrefixQuery(new Term(UidFieldMapper.NAME, Uid.typePrefixAsBytes(BytesRefs.toBytesRef(value)))));
}
return new ConstantScoreQuery(new TermQuery(names().createIndexNameTerm(BytesRefs.toBytesRef(value))));
return new ConstantScoreQuery(new TermQuery(createTerm(value)));
}

@Override
Expand Down

0 comments on commit ea3c5d5

Please sign in to comment.