You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2017/03/07 11:56:39 UTC
lucene-solr:branch_6x: LUCENE-7712: SimpleQueryParser now parses foo~
as foo~2
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 61fa3971f -> f45c31102
LUCENE-7712: SimpleQueryParser now parses foo~ as foo~2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f45c3110
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f45c3110
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f45c3110
Branch: refs/heads/branch_6x
Commit: f45c31102c0700ef798d99060c21ff85b74360a4
Parents: 61fa397
Author: Mike McCandless <mi...@apache.org>
Authored: Tue Mar 7 06:55:47 2017 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Tue Mar 7 06:56:17 2017 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 4 ++++
.../apache/lucene/queryparser/simple/SimpleQueryParser.java | 8 +++++++-
.../lucene/queryparser/simple/TestSimpleQueryParser.java | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f45c3110/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 3c7e245..5ef36c1 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -80,6 +80,10 @@ New Features
efficiently filter out duplicate suggestions (Uwe Schindler, Mike
McCandless)
+* LUCENE-7712: SimpleQueryParser now supports default fuzziness
+ syntax, mapping foo~ to a FuzzyQuery with edit distance 2. (Lee
+ Hinman, David Pilato via Mike McCandless)
+
Bug Fixes
* LUCENE-7630: Fix (Edge)NGramTokenFilter to no longer drop payloads
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f45c3110/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java
----------------------------------------------------------------------
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java
index 9391c77..b5c1b5ec 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java
@@ -499,7 +499,13 @@ public class SimpleQueryParser extends QueryBuilder {
}
int fuzziness = 0;
try {
- fuzziness = Integer.parseInt(new String(slopText, 0, slopLength));
+ String fuzzyString = new String(slopText, 0, slopLength);
+ if ("".equals(fuzzyString)) {
+ // Use automatic fuzziness, ~2
+ fuzziness = 2;
+ } else {
+ fuzziness = Integer.parseInt(fuzzyString);
+ }
} catch (NumberFormatException e) {
// swallow number format exceptions parsing fuzziness
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f45c3110/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java
----------------------------------------------------------------------
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java
index f7cd556..7d674e2 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java
@@ -88,7 +88,7 @@ public class TestSimpleQueryParser extends LuceneTestCase {
Query expected = new FuzzyQuery(new Term("field", "foobar"), 2);
assertEquals(expected, parse("foobar~2"));
- assertEquals(regular, parse("foobar~"));
+ assertEquals(expected, parse("foobar~"));
assertEquals(regular, parse("foobar~a"));
assertEquals(regular, parse("foobar~1a"));