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.

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

fix constant_keyword field type not working #14651

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Refactoring Grok.validatePatternBank by using an iterative approach ([#14206](https://github.com/opensearch-project/OpenSearch/pull/14206))
- Update help output for _cat ([#14722](https://github.com/opensearch-project/OpenSearch/pull/14722))
- Fix bulk upsert ignores the default_pipeline and final_pipeline when auto-created index matches the index template ([#12891](https://github.com/opensearch-project/OpenSearch/pull/12891))
- Fix constant_keyword field type ([#14651](https://github.com/opensearch-project/OpenSearch/pull/14651))

### Security

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
---
setup:
- do:
indices.create:
index: test
body:
mappings:
properties:
genre:
type : "constant_keyword"
"value" : "1"

- do:
index:
index: test
id: 1
body: {
"genre": "1"
}

- do:
index:
index: test
id: 2
body: {
"genre": 1
}

- do:
indices.refresh:
index: test

---
# Delete Index when connection is teardown
teardown:
- do:
indices.delete:
index: test

---
"Mappings":
- skip:
version: " - 2.13.99"
reason: "constant_keyword is introduced in 2.14.0"

- do:
indices.get_mapping:
index: test
- is_true: test.mappings
- match: { test.mappings.properties.genre.type: constant_keyword }
- length: { test.mappings.properties.genre: 2 }

---
"Supported queries":
- skip:
version: " - 2.13.99"
reason: "constant_keyword is introduced in 2.14.0 in main branch"

# Verify Document Count
- do:
search:
body: {
query: {
match_all: {}
}
}

- length: { hits.hits: 2 }
- match: { hits.hits.0._source.genre: "1" }
- match: { hits.hits.1._source.genre: 1 }
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ private static ConstantKeywordFieldMapper toType(FieldMapper in) {
*/
public static class Builder extends ParametrizedFieldMapper.Builder {

private final Parameter<String> value;
private final Parameter<String> value = Parameter.stringParam(valuePropertyName, false, m -> toType(m).value, null);

public Builder(String name, String value) {
super(name);
this.value = Parameter.stringParam(valuePropertyName, false, m -> toType(m).value, value);
this.value.setValue(value);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@ public void testMissingDefaultIndexMapper() throws Exception {
assertThat(e.getMessage(), containsString("Field [field] is missing required parameter [value]"));
}

public void testBuilderToXContent() throws IOException {
ConstantKeywordFieldMapper.Builder builder = new ConstantKeywordFieldMapper.Builder("name", "value1");
XContentBuilder xContentBuilder = JsonXContent.contentBuilder().startObject();
builder.toXContent(xContentBuilder, false);
xContentBuilder.endObject();
assertEquals("{\"value\":\"value1\"}", xContentBuilder.toString());
}

private final SourceToParse source(CheckedConsumer<XContentBuilder, IOException> build) throws IOException {
XContentBuilder builder = JsonXContent.contentBuilder().startObject();
build.accept(builder);
Expand Down
Loading