Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Runtime script field mapper to reject copy_to and fields #60580

Merged
merged 1 commit into from
Aug 3, 2020
Merged

Runtime script field mapper to reject copy_to and fields #60580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .../src/main/java/org/elasticsearch/xpack/runtimefields/mapper/RuntimeScriptFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,19 @@ public RuntimeScriptFieldMapper build(BuilderContext context) {
"runtime_type [" + runtimeType.getValue() + "] not supported for " + CONTENT_TYPE + " field [" + name + "]"
);
}
// TODO copy to and multi_fields should not be supported, parametrized field mapper needs to be adapted
MultiFields multiFields = multiFieldsBuilder.build(this, context);
if (multiFields.iterator().hasNext()) {
throw new IllegalArgumentException(CONTENT_TYPE + " field does not support [fields]");
}
CopyTo copyTo = this.copyTo.build();
if (copyTo.copyToFields().isEmpty() == false) {
throw new IllegalArgumentException(CONTENT_TYPE + " field does not support [copy_to]");
}
return new RuntimeScriptFieldMapper(
name,
fieldTypeResolver.apply(this, context),
multiFieldsBuilder.build(this, context),
copyTo.build(),
MultiFields.empty(),
CopyTo.empty(),
runtimeType.getValue(),
script.getValue(),
scriptCompiler
Expand Down
40 changes: 40 additions & 0 deletions ...test/java/org/elasticsearch/xpack/runtimefields/mapper/RuntimeScriptFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,46 @@ public void testScriptIsRequired() throws Exception {
assertEquals("Failed to parse mapping: script must be specified for runtime_script field [my_field]", exception.getMessage());
}

public void testCopyToIsNotSupported() throws IOException {
XContentBuilder mapping = XContentFactory.jsonBuilder()
.startObject()
.startObject("_doc")
.startObject("properties")
.startObject("my_field")
.field("type", "runtime_script")
.field("runtime_type", randomFrom(runtimeTypes))
.field("script", "keyword('test')")
.field("copy_to", "field")
.endObject()
.endObject()
.endObject()
.endObject();
MapperParsingException exception = expectThrows(MapperParsingException.class, () -> createIndex("test", Settings.EMPTY, mapping));
assertEquals("Failed to parse mapping: runtime_script field does not support [copy_to]", exception.getMessage());
}

public void testMultiFieldsIsNotSupported() throws IOException {
XContentBuilder mapping = XContentFactory.jsonBuilder()
.startObject()
.startObject("_doc")
.startObject("properties")
.startObject("my_field")
.field("type", "runtime_script")
.field("runtime_type", randomFrom(runtimeTypes))
.field("script", "keyword('test')")
.startObject("fields")
.startObject("test")
.field("type", "keyword")
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject();
MapperParsingException exception = expectThrows(MapperParsingException.class, () -> createIndex("test", Settings.EMPTY, mapping));
assertEquals("Failed to parse mapping: runtime_script field does not support [fields]", exception.getMessage());
}

public void testStoredScriptsAreNotSupported() throws Exception {
XContentBuilder mapping = XContentFactory.jsonBuilder()
.startObject()
Expand Down