Skip to content

Fix Fuzziness#asDistance(String) #39643

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 1 commit into from
Mar 5, 2019
Merged

Fix Fuzziness#asDistance(String) #39643

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
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/common/unit/Fuzziness.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public int asDistance() {
}

public int asDistance(String text) {
if (this.equals(AUTO)) { //AUTO
if (this.equals(AUTO) || isAutoWithCustomValues()) { //AUTO
final int len = termLen(text);
if (len < lowDistance) {
return 0;
Expand Down
24 changes: 24 additions & 0 deletions server/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,28 @@ private static Fuzziness doSerializeRoundtrip(Fuzziness in) throws IOException {
StreamInput streamInput = output.bytes().streamInput();
return new Fuzziness(streamInput);
}

public void testAsDistanceString() {
Fuzziness fuzziness = Fuzziness.build("0");
assertEquals(0, fuzziness.asDistance(randomAlphaOfLengthBetween(0, 10)));
fuzziness = Fuzziness.build("1");
assertEquals(1, fuzziness.asDistance(randomAlphaOfLengthBetween(0, 10)));
fuzziness = Fuzziness.build("2");
assertEquals(2, fuzziness.asDistance(randomAlphaOfLengthBetween(0, 10)));

fuzziness = Fuzziness.build("AUTO");
assertEquals(0, fuzziness.asDistance(""));
assertEquals(0, fuzziness.asDistance("ab"));
assertEquals(1, fuzziness.asDistance("abc"));
assertEquals(1, fuzziness.asDistance("abcde"));
assertEquals(2, fuzziness.asDistance("abcdef"));

fuzziness = Fuzziness.build("AUTO:5,7");
assertEquals(0, fuzziness.asDistance(""));
assertEquals(0, fuzziness.asDistance("abcd"));
assertEquals(1, fuzziness.asDistance("abcde"));
assertEquals(1, fuzziness.asDistance("abcdef"));
assertEquals(2, fuzziness.asDistance("abcdefg"));

}
}
26 changes: 26 additions & 0 deletions server/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,32 @@ public void testMatchQueryNumeric() throws Exception {
expectThrows(SearchPhaseExecutionException.class, () -> client().prepareSearch().setQuery(matchQuery("double", "2 3 4")).get());
}

public void testMatchQueryFuzzy() throws Exception {
assertAcked(prepareCreate("test").addMapping("_doc", "text", "type=text"));

indexRandom(true, client().prepareIndex("test", "_doc", "1").setSource("text", "Unit"),
client().prepareIndex("test", "_doc", "2").setSource("text", "Unity"));

SearchResponse searchResponse = client().prepareSearch().setQuery(matchQuery("text", "uniy").fuzziness("0")).get();
assertHitCount(searchResponse, 0L);

searchResponse = client().prepareSearch().setQuery(matchQuery("text", "uniy").fuzziness("1")).get();
assertHitCount(searchResponse, 2L);
assertSearchHits(searchResponse, "1", "2");

searchResponse = client().prepareSearch().setQuery(matchQuery("text", "uniy").fuzziness("AUTO")).get();
assertHitCount(searchResponse, 2L);
assertSearchHits(searchResponse, "1", "2");

searchResponse = client().prepareSearch().setQuery(matchQuery("text", "uniy").fuzziness("AUTO:5,7")).get();
assertHitCount(searchResponse, 0L);

searchResponse = client().prepareSearch().setQuery(matchQuery("text", "unify").fuzziness("AUTO:5,7")).get();
assertHitCount(searchResponse, 1L);
assertSearchHits(searchResponse, "2");
}


public void testMultiMatchQuery() throws Exception {
createIndex("test");

Expand Down