[MediaWiki-commits] [Gerrit] Fix handling of short fuzzy queries - change (search/highlighter)

[Manybubbles (Code Review)]

Manybubbles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/133161

Change subject: Fix handling of short fuzzy queries
......................................................................

Fix handling of short fuzzy queries

Change-Id: Iebdb1277268203309dde74a76506ce8a754636b4
---
M 
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattener.java
M 
experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattenerTest.java
2 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/61/133161/1

diff --git 
a/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattener.java
 
b/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattener.java
index 57b8761..29aab9f 100644
--- 
a/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattener.java
+++ 
b/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattener.java
@@ -354,6 +354,7 @@
         String term = query.getTerm().bytes().utf8ToString();
         if (query.getPrefixLength() >= term.length()) {
             callback.flattened(query.getTerm().bytes(), boost, sourceOverride);
+            return;
         }
 
         FuzzyQueryInfo key = new FuzzyQueryInfo(term, query);
diff --git 
a/experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattenerTest.java
 
b/experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattenerTest.java
index 9a75401..4d62e38 100644
--- 
a/experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattenerTest.java
+++ 
b/experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattenerTest.java
@@ -2,6 +2,7 @@
 
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyFloat;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
@@ -103,6 +104,14 @@
     }
 
     @Test
+    public void fuzzyQueryShorterThenPrefix() {
+        Callback callback = mock(Callback.class);
+        new QueryFlattener(1, false).flatten(new FuzzyQuery(bar, 2, 100), 
null, callback);
+        verify(callback).flattened(bar.bytes(), 1f, null);
+        verify(callback, never()).flattened(any(Automaton.class), anyFloat(), 
anyInt());
+    }
+
+    @Test
     public void regexpQuery() {
         flattenedToAutomatonThatMatches(new RegexpQuery(new Term("test", 
"ba[zr]")),
                 recognises(bar), recognises(baz), not(recognises("barr")));

-- 
To view, visit https://gerrit.wikimedia.org/r/133161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebdb1277268203309dde74a76506ce8a754636b4
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <never...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits