svn commit: r1237716 - in /lucene/dev/branches/lucene2858: ./ lucene/ lucene/contrib/ lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ solr/ solr/test-framework/ solr/test-framework/src/java/org/apache/solr/

[us...@apache.org]

Author: uschindler
Date: Mon Jan 30 15:27:25 2012
New Revision: 1237716

URL: http://svn.apache.org/viewvc?rev=1237716&view=rev
Log:
LUCENE-2858: Reverse merged revision(s) from lucene/dev/trunk up to 1237714

Modified:
    lucene/dev/branches/lucene2858/   (props changed)
    lucene/dev/branches/lucene2858/lucene/   (props changed)
    lucene/dev/branches/lucene2858/lucene/contrib/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
    lucene/dev/branches/lucene2858/solr/   (props changed)
    lucene/dev/branches/lucene2858/solr/test-framework/   (props changed)
    lucene/dev/branches/lucene2858/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java

Modified: lucene/dev/branches/lucene2858/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/CHANGES.txt?rev=1237716&r1=1237715&r2=1237716&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/CHANGES.txt Mon Jan 30 15:27:25 2012
@@ -200,6 +200,9 @@ Bug Fixes
  * LUCENE-3697: SimpleBoundaryScanner does not work well when highlighting
    at the beginning of the text. (Shay Banon via Koji Sekiguchi)
 
+ * LUCENE-3719: FVH: slow performance on very large queries.
+   (Igor Motov via Koji Sekiguchi)
+
 Documentation
 
  * LUCENE-3599: Javadocs for DistanceUtils.haversine() were incorrectly

Modified: lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java?rev=1237716&r1=1237715&r2=1237716&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java Mon Jan 30 15:27:25 2012
@@ -17,11 +17,11 @@ package org.apache.lucene.search.vectorh
  */
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -60,7 +60,7 @@ public class FieldQuery {
 
   FieldQuery( Query query, IndexReader reader, boolean phraseHighlight, boolean fieldMatch ) throws IOException {
     this.fieldMatch = fieldMatch;
-    List<Query> flatQueries = new ArrayList<Query>();
+    Set<Query> flatQueries = new LinkedHashSet<Query>();
     flatten( query, reader, flatQueries );
     saveTerms( flatQueries, reader );
     Collection<Query> expandQueries = expand( flatQueries );
@@ -133,7 +133,7 @@ public class FieldQuery {
    *      => expandQueries={a,"b c","c d","b c d"}
    */
   Collection<Query> expand( Collection<Query> flatQueries ){
-    List<Query> expandQueries = new ArrayList<Query>();
+    Set<Query> expandQueries = new LinkedHashSet<Query>();
     for( Iterator<Query> i = flatQueries.iterator(); i.hasNext(); ){
       Query query = i.next();
       i.remove();

Modified: lucene/dev/branches/lucene2858/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1237716&r1=1237715&r2=1237716&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/lucene2858/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Mon Jan 30 15:27:25 2012
@@ -132,7 +132,7 @@ public abstract class SolrTestCaseJ4 ext
      // wait a bit in case any ending threads have anything to release
      int retries = 0;
      while (endNumOpens - numOpens != endNumCloses - numCloses) {
-       if (retries++ > 60) {
+       if (retries++ > 120) {
          break;
        }
        try {