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 exists queries on nested flat_object fields throws exception #16803

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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 @@ -97,6 +97,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Fix Shallow copy snapshot failures on closed index ([#16868](https://github.com/opensearch-project/OpenSearch/pull/16868))
- Fix multi-value sort for unsigned long ([#16732](https://github.com/opensearch-project/OpenSearch/pull/16732))
- The `phone-search` analyzer no longer emits the tel/sip prefix, international calling code, extension numbers and unformatted input as a token ([#16993](https://github.com/opensearch-project/OpenSearch/pull/16993))
- Fix exists queries on nested flat_object fields throws exception ([#16803](https://github.com/opensearch-project/OpenSearch/pull/16803))

### Security

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,26 @@ teardown:
- do:
indices.delete:
index: test

---
"Exist query in root field":
- skip:
version: "- 2.99.99"
reason: "the query would throw exception prior to 2.99.99"

- do:
search:
body: {
_source: true,
size: 10,
query: {
exists: {
field: "catalog"
}
}
}
- length: { hits.hits: 2 }

---
"Invalid docs":
- skip:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.opensearch.common.unit.Fuzziness;
import org.opensearch.common.xcontent.JsonToStringXContentParser;
import org.opensearch.core.common.ParsingException;
import org.opensearch.core.common.Strings;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.xcontent.DeprecationHandler;
import org.opensearch.core.xcontent.NamedXContentRegistry;
Expand Down Expand Up @@ -87,7 +88,7 @@ public static class Defaults {
@Override
public MappedFieldType keyedFieldType(String key) {
return new FlatObjectFieldType(
this.name() + DOT_SYMBOL + key,
Strings.isNullOrEmpty(key) ? this.name() : (this.name() + DOT_SYMBOL + key),
this.name(),
(KeywordFieldType) valueFieldMapper.fieldType(),
(KeywordFieldType) valueAndPathFieldMapper.fieldType()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.BytesRef;
import org.opensearch.common.util.set.Sets;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.json.JsonXContent;
import org.opensearch.core.xcontent.ToXContent;
Expand All @@ -24,6 +25,7 @@
import org.opensearch.search.DocValueFormat;

import java.io.IOException;
import java.util.Set;

import static org.opensearch.common.xcontent.JsonToStringXContentParser.VALUE_AND_PATH_SUFFIX;
import static org.opensearch.common.xcontent.JsonToStringXContentParser.VALUE_SUFFIX;
Expand Down Expand Up @@ -416,7 +418,14 @@ public void testFetchDocValues() throws IOException {
Throwable throwable = assertThrows(IllegalArgumentException.class, () -> ft.docValueFormat(null, null));
assertEquals("Field [field] of type [flat_object] does not support doc_value in root field", throwable.getMessage());
}
}

public void testPatternMatch() throws IOException {
MapperService mapperService = createMapperService(fieldMapping(this::minimalMapping));
QueryShardContext queryShardContext = createQueryShardContext(mapperService);
Set<String> fields = queryShardContext.simpleMatchToIndexNames("field.*");
assertEquals(2, fields.size());
assertEquals(Sets.newHashSet("field._value", "field._valueAndPath"), fields);
}

@Override
Expand Down
Loading