You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2014/11/27 11:39:41 UTC

svn commit: r1642079 - in /lucene/dev/branches/lucene2878/lucene/core/src: java/org/apache/lucene/search/MultiPhraseQuery.java test/org/apache/lucene/search/TestSimpleExplanations.java

Author: romseygeek
Date: Thu Nov 27 10:39:40 2014
New Revision: 1642079

URL: http://svn.apache.org/r1642079
Log:
Always ask for positions in MPQ.scorer(); fencepost error in UnionDocsAndPositionsEnum posqueue sorting

Modified:
    lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
    lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java

Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java?rev=1642079&r1=1642078&r2=1642079&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java Thu Nov 27 10:39:40 2014
@@ -193,6 +193,9 @@ public class MultiPhraseQuery extends Qu
       assert !termArrays.isEmpty();
       final LeafReader reader = context.reader();
       final Bits liveDocs = acceptDocs;
+
+      if ((flags & DocsEnum.FLAG_POSITIONS) < DocsEnum.FLAG_POSITIONS)
+        flags = DocsEnum.FLAG_POSITIONS;
       
       PhraseQuery.PostingsAndFreq[] postingsFreqs = new PhraseQuery.PostingsAndFreq[termArrays.size()];
 
@@ -503,7 +506,7 @@ class UnionDocsAndPositionsEnum extends 
 
     final void sort() {
       //Arrays.sort(_array, _index, _lastIndex);
-      sorter.sort(_index, _lastIndex - 1);
+      sorter.sort(_index, _lastIndex);
     }
 
     final void clear() {

Modified: lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java?rev=1642079&r1=1642078&r2=1642079&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java Thu Nov 27 10:39:40 2014
@@ -242,6 +242,13 @@ public class TestSimpleExplanations exte
   }
   
   /* MultiPhraseQuery */
+
+  /*
+      "w1 w2 w3 w4 w5",
+    "w1 w3 w2 w3 zz",
+    "w1 xx w2 yy w3",
+    "w1 w3 xx w2 yy w3 zz"
+   */
   
   public void testMPQ1() throws Exception {
     MultiPhraseQuery q = new MultiPhraseQuery();