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

Disallow the new parent join field on indices with multiple types 

Relates https://github.com/elastic/elasticsearch/pull/24978
This commit is contained in:
Jim Ferenczi 2017-06-02 18:28:03 +02:00
parent 18f16ba555
commit 4077600035
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@ import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.IndexableField;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.elasticsearch.Version;
import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
@ -39,7 +38,6 @@ import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.Mapper; import org.elasticsearch.index.mapper.Mapper;
import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperParsingException;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.ParentFieldMapper;
import org.elasticsearch.index.mapper.ParseContext; import org.elasticsearch.index.mapper.ParseContext;
import org.elasticsearch.index.mapper.StringFieldType; import org.elasticsearch.index.mapper.StringFieldType;
@ -90,12 +88,18 @@ public final class ParentJoinFieldMapper extends FieldMapper {
return joinFieldName + "#" + parentName; return joinFieldName + "#" + parentName;
} }
private static void checkPreConditions(Version indexCreatedVersion, ContentPath path, String name) { private static void checkIndexCompatibility(IndexSettings settings, String name) {
if (indexCreatedVersion.before(Version.V_6_0_0_alpha2)) { if (settings.getIndexMetaData().isRoutingPartitionedIndex()) {
throw new IllegalStateException("unable to create join field [" + name + throw new IllegalStateException("cannot create join field [" + name + "] " +
"] for index created before " + Version.V_6_0_0_alpha2); "for the partitioned index " + "[" + settings.getIndex().getName() + "]");
}
if (settings.isSingleType() == false) {
throw new IllegalStateException("cannot create join field [" + name + "] " +
"on multi-types index [" + settings.getIndex().getName() + "]");
}
} }
private static void checkObjectOrNested(ContentPath path, String name) {
if (path.pathAsText(name).contains(".")) { if (path.pathAsText(name).contains(".")) {
throw new IllegalArgumentException("join field [" + path.pathAsText(name) + "] " + throw new IllegalArgumentException("join field [" + path.pathAsText(name) + "] " +
"cannot be added inside an object or in a multi-field"); "cannot be added inside an object or in a multi-field");
@ -144,7 +148,7 @@ public final class ParentJoinFieldMapper extends FieldMapper {
@Override @Override
public ParentJoinFieldMapper build(BuilderContext context) { public ParentJoinFieldMapper build(BuilderContext context) {
checkPreConditions(context.indexCreatedVersion(), context.path(), name); checkObjectOrNested(context.path(), name);
fieldType.setName(name); fieldType.setName(name);
final List<ParentIdFieldMapper> parentIdFields = new ArrayList<>(); final List<ParentIdFieldMapper> parentIdFields = new ArrayList<>();
parentIdFieldBuilders.stream() parentIdFieldBuilders.stream()
@ -166,10 +170,7 @@ public final class ParentJoinFieldMapper extends FieldMapper {
@Override @Override
public Mapper.Builder<?,?> parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException { public Mapper.Builder<?,?> parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
final IndexSettings indexSettings = parserContext.mapperService().getIndexSettings(); final IndexSettings indexSettings = parserContext.mapperService().getIndexSettings();
if (indexSettings.getIndexMetaData().isRoutingPartitionedIndex()) { checkIndexCompatibility(indexSettings, name);
throw new IllegalStateException("cannot set join field [" + name + "] for the partitioned index " +
"[" + indexSettings.getIndex().getName() + "]");
}
Builder builder = new Builder(name); Builder builder = new Builder(name);
for (Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator(); iterator.hasNext();) { for (Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator(); iterator.hasNext();) {