Skip to content

Handle special regex cases for version fields #132511

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

Merged
merged 3 commits into from
Aug 6, 2025
+45 −0
Merged

Handle special regex cases for version fields #132511

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
f660077
Handle special regex cases for version fields
benwtrent Aug 6, 2025
0d0c9bd
Update docs/changelog/132511.yaml
benwtrent Aug 6, 2025
baadcda
Merge branch 'main' into bugfix/version-regex
benwtrent Aug 6, 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/132511.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 132511
summary: Handle special regex cases for version fields
area: Search
type: bug
issues: []
11 changes: 11 additions & 0 deletions ...-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,17 @@ protected TermsEnum getTermsEnum(Terms terms, AttributeSource atts) throws IOExc
@Override
protected AcceptStatus accept(BytesRef term) throws IOException {
BytesRef decoded = VersionEncoder.decodeVersion(term);
if (compiled.runAutomaton == null) {
return switch (compiled.type) {
case SINGLE -> decoded.equals(compiled.term) ? AcceptStatus.YES : AcceptStatus.NO;
case ALL -> AcceptStatus.YES;
case NONE -> AcceptStatus.NO;
default -> {
assert false : "Unexpected automaton type: " + compiled.type;
yield AcceptStatus.NO;
}
};
}
boolean accepted = compiled.runAutomaton.run(decoded.bytes, decoded.offset, decoded.length);
if (accepted) {
return AcceptStatus.YES;
Expand Down
29 changes: 29 additions & 0 deletions ...r-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,35 @@ public void testRegexQuery() throws Exception {
assertEquals("2.1.0-alpha.beta", response.getHits().getHits()[1].getSourceAsMap().get("version"));
}
);

assertResponse(
client().prepareSearch(indexName).setQuery(QueryBuilders.regexpQuery("version", ".*").caseInsensitive(true)),
response -> {
assertEquals(5, response.getHits().getTotalHits().value());
}
);

assertResponse(
client().prepareSearch(indexName).setQuery(QueryBuilders.regexpQuery("version", "2\\.1\\.0").caseInsensitive(false)),
response -> {
assertEquals(1, response.getHits().getTotalHits().value());
}
);

assertResponse(
client().prepareSearch(indexName).setQuery(QueryBuilders.regexpQuery("version", "2\\.1\\.1").caseInsensitive(false)),
response -> {
assertEquals(0, response.getHits().getTotalHits().value());
}
);

// empty regex should not match anything
assertResponse(
client().prepareSearch(indexName).setQuery(QueryBuilders.regexpQuery("version", "").caseInsensitive(false)),
response -> {
assertEquals(0, response.getHits().getTotalHits().value());
}
);
}

public void testFuzzyQuery() throws Exception {
Expand Down