Skip to content

Generate IndexOrDocValuesQuery for term queries in IpFieldMapper #128846

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Generate IndexOrDocValuesQuery for term queries in IpFieldMapper #128846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a43a5af
Generate IndexOrDocValuesQuery for term queries in IpFieldMapper
iverase Jun 3, 2025
19baad8
Update docs/changelog/128846.yaml
iverase Jun 3, 2025
5b0ac74
Merge branch 'main' into ipRangeTermQuery
iverase Jun 4, 2025
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
5 changes: 5 additions & 0 deletions docs/changelog/128846.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 128846
summary: Generate `IndexOrDocValuesQuery` for term queries in `IpFieldMapper`
area: Search
type: enhancement
issues: []
4 changes: 3 additions & 1 deletion server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,9 @@ public Query termQuery(Object value, @Nullable SearchExecutionContext context) {
query = InetAddressPoint.newExactQuery(name(), address);
}
}
if (isIndexed()) {
if (isIndexed() && hasDocValues()) {
return new IndexOrDocValuesQuery(query, convertToDocValuesQuery(query));
} else if (isIndexed()) {
return query;
} else {
return convertToDocValuesQuery(query);
Expand Down
22 changes: 21 additions & 1 deletion server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,33 @@ public void testTermQuery() {
MappedFieldType ft = new IpFieldMapper.IpFieldType("field");

String ip = "2001:db8::2:1";
Query query = InetAddressPoint.newExactQuery("field", InetAddresses.forString(ip));
assertEquals(new IndexOrDocValuesQuery(query, convertToDocValuesQuery(query)), ft.termQuery(ip, MOCK_CONTEXT));

ip = "192.168.1.7";
query = InetAddressPoint.newExactQuery("field", InetAddresses.forString(ip));
assertEquals(new IndexOrDocValuesQuery(query, convertToDocValuesQuery(query)), ft.termQuery(ip, MOCK_CONTEXT));

ip = "2001:db8::2:1";
String prefix = ip + "/64";
query = InetAddressPoint.newPrefixQuery("field", InetAddresses.forString(ip), 64);
assertEquals(new IndexOrDocValuesQuery(query, convertToDocValuesQuery(query)), ft.termQuery(prefix, MOCK_CONTEXT));

ip = "192.168.1.7";
prefix = ip + "/16";
query = InetAddressPoint.newPrefixQuery("field", InetAddresses.forString(ip), 16);
assertEquals(new IndexOrDocValuesQuery(query, convertToDocValuesQuery(query)), ft.termQuery(prefix, MOCK_CONTEXT));

ft = new IpFieldMapper.IpFieldType("field", true, false);
Copy link
Contributor

@drempapis drempapis Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For completeness, please consider adding tests that cover the doc values–only case, e.g.

ft = new IpFieldMapper.IpFieldType("field", false, true);


ip = "2001:db8::2:1";
assertEquals(InetAddressPoint.newExactQuery("field", InetAddresses.forString(ip)), ft.termQuery(ip, MOCK_CONTEXT));

ip = "192.168.1.7";
assertEquals(InetAddressPoint.newExactQuery("field", InetAddresses.forString(ip)), ft.termQuery(ip, MOCK_CONTEXT));

ip = "2001:db8::2:1";
String prefix = ip + "/64";
prefix = ip + "/64";
assertEquals(InetAddressPoint.newPrefixQuery("field", InetAddresses.forString(ip), 64), ft.termQuery(prefix, MOCK_CONTEXT));

ip = "192.168.1.7";
Expand Down
Loading