You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2013/05/02 01:03:19 UTC
svn commit: r1478227 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/CHANGES.txt lucene/core/
lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java
lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java
Author: jpountz
Date: Wed May 1 23:03:19 2013
New Revision: 1478227
URL: http://svn.apache.org/r1478227
Log:
LUCENE-4970: Fix boost value of rewritten NGramPhraseQuery.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1478227&r1=1478226&r2=1478227&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Wed May 1 23:03:19 2013
@@ -41,6 +41,9 @@ Bug Fixes
the child query has no hits, more aggressively catch cases where childQuery
incorrectly matches parent documents (Mike McCandless)
+* LUCENE-4970: Fix boost value of rewritten NGramPhraseQuery.
+ (Shingo Sasaki via Adrien Grand)
+
Optimizations
* LUCENE-4938: Don't use an unnecessarily large priority queue in IndexSearcher
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java?rev=1478227&r1=1478226&r2=1478227&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java Wed May 1 23:03:19 2013
@@ -64,6 +64,7 @@ public class NGramPhraseQuery extends Ph
// now create the new optimized phrase query for n-gram
PhraseQuery optimized = new PhraseQuery();
+ optimized.setBoost(getBoost());
int pos = 0;
final int lastPos = terms.length - 1;
for(int i = 0; i < terms.length; i++){
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java?rev=1478227&r1=1478226&r2=1478227&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java Wed May 1 23:03:19 2013
@@ -88,6 +88,17 @@ public class TestNGramPhraseQuery extend
pq3 = (PhraseQuery)q;
assertArrayEquals(new Term[]{new Term("f", "ABC"), new Term("f", "DEF"), new Term("f", "FGH")}, pq3.getTerms());
assertArrayEquals(new int[]{0, 3, 5}, pq3.getPositions());
+
+ // LUCENE-4970: boosting test
+ PhraseQuery pq4 = new NGramPhraseQuery(2);
+ pq4.add(new Term("f", "AB"));
+ pq4.add(new Term("f", "BC"));
+ pq4.add(new Term("f", "CD"));
+ pq4.setBoost(100.0F);
+
+ q = pq4.rewrite(reader);
+ assertNotSame(pq4, q);
+ assertEquals(pq4.getBoost(), q.getBoost(), 0.1f);
}
}