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

Ensure field caps doesn't error on rank feature fields. (#44370) 

The contract for MappedFieldType#fielddataBuilder is to throw an
IllegalArgumentException if fielddata is not supported. The rank feature mappers
were instead throwing an UnsupportedOperationException, which caused
MappedFieldType#isAggregatable to fail.
This commit is contained in:
Julie Tibshirani 2019-07-16 14:43:04 -07:00
parent 100cb89f3e
commit cc0ff3aa71
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java
View File

@ -164,12 +164,12 @@ public class RankFeatureFieldMapper extends FieldMapper {
@Override
public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName) {
throw new UnsupportedOperationException("[rank_feature] fields do not support sorting, scripting or aggregating");
throw new IllegalArgumentException("[rank_feature] fields do not support sorting, scripting or aggregating");
}
@Override
public Query termQuery(Object value, QueryShardContext context) {
throw new UnsupportedOperationException("Queries on [rank_feature] fields are not supported");
throw new IllegalArgumentException("Queries on [rank_feature] fields are not supported");
}
}

6
modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java
View File

@ -104,17 +104,17 @@ public class RankFeaturesFieldMapper extends FieldMapper {
@Override
public Query existsQuery(QueryShardContext context) {
throw new UnsupportedOperationException("[rank_features] fields do not support [exists] queries");
throw new IllegalArgumentException("[rank_features] fields do not support [exists] queries");
}
@Override
public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName) {
throw new UnsupportedOperationException("[rank_features] fields do not support sorting, scripting or aggregating");
throw new IllegalArgumentException("[rank_features] fields do not support sorting, scripting or aggregating");
}
@Override
public Query termQuery(Object value, QueryShardContext context) {
throw new UnsupportedOperationException("Queries on [rank_features] fields are not supported");
throw new IllegalArgumentException("Queries on [rank_features] fields are not supported");
}
}

5
modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureFieldTypeTests.java
View File

@ -43,4 +43,9 @@ public class RankFeatureFieldTypeTests extends FieldTypeTestCase {
}
});
}
public void testIsAggregatable() {
MappedFieldType fieldType = createDefaultFieldType();
assertFalse(fieldType.isAggregatable());
}
}

4
modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeaturesFieldTypeTests.java
View File

@ -26,4 +26,8 @@ public class RankFeaturesFieldTypeTests extends FieldTypeTestCase {
return new RankFeaturesFieldMapper.RankFeaturesFieldType();
}
public void testIsAggregatable() {
MappedFieldType fieldType = createDefaultFieldType();
assertFalse(fieldType.isAggregatable());
}
}

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

@ -99,13 +99,15 @@ public abstract class MappedFieldType extends FieldType {
@Override
public abstract MappedFieldType clone();
/** Return a fielddata builder for this field
* @throws IllegalArgumentException if the fielddata is not supported on this type.
* An IllegalArgumentException is needed in order to return an http error 400
* when this error occurs in a request. see: {@link org.elasticsearch.ExceptionsHelper#status}
/**
* Return a fielddata builder for this field
*
* @param fullyQualifiedIndexName the name of the index this field-data is build for
* */
*
* @throws IllegalArgumentException if the fielddata is not supported on this type.
* An IllegalArgumentException is needed in order to return an http error 400
* when this error occurs in a request. see: {@link org.elasticsearch.ExceptionsHelper#status}
*/
public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName) {
throw new IllegalArgumentException("Fielddata is not supported on field [" + name() + "] of type [" + typeName() + "]");
}