Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-2858: Reverse merged revision(s) from lucene/dev/trunk up to 1237714 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene2858@1237716 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2012-01-30 15:27:25 +00:00
parent 9a6e69cf8d e1cb522921
commit 0d7055bf3d
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/contrib/CHANGES.txt
View File

@ -200,6 +200,9 @@ Bug Fixes
* LUCENE-3697: SimpleBoundaryScanner does not work well when highlighting * LUCENE-3697: SimpleBoundaryScanner does not work well when highlighting
at the beginning of the text. (Shay Banon via Koji Sekiguchi) 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 Documentation
* LUCENE-3599: Javadocs for DistanceUtils.haversine() were incorrectly * LUCENE-3599: Javadocs for DistanceUtils.haversine() were incorrectly

6
lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
View File

@ -17,11 +17,11 @@ package org.apache.lucene.search.vectorhighlight;
*/ */
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -60,7 +60,7 @@ public class FieldQuery {
FieldQuery( Query query, IndexReader reader, boolean phraseHighlight, boolean fieldMatch ) throws IOException { FieldQuery( Query query, IndexReader reader, boolean phraseHighlight, boolean fieldMatch ) throws IOException {
this.fieldMatch = fieldMatch; this.fieldMatch = fieldMatch;
List<Query> flatQueries = new ArrayList<Query>(); Set<Query> flatQueries = new LinkedHashSet<Query>();
flatten( query, reader, flatQueries ); flatten( query, reader, flatQueries );
saveTerms( flatQueries, reader ); saveTerms( flatQueries, reader );
Collection<Query> expandQueries = expand( flatQueries ); Collection<Query> expandQueries = expand( flatQueries );
@ -133,7 +133,7 @@ public class FieldQuery {
* => expandQueries={a,"b c","c d","b c d"} * => expandQueries={a,"b c","c d","b c d"}
*/ */
Collection<Query> expand( Collection<Query> flatQueries ){ 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(); ){ for( Iterator<Query> i = flatQueries.iterator(); i.hasNext(); ){
Query query = i.next(); Query query = i.next();
i.remove(); i.remove();

2
solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
View File

@ -132,7 +132,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
// wait a bit in case any ending threads have anything to release // wait a bit in case any ending threads have anything to release
int retries = 0; int retries = 0;
while (endNumOpens - numOpens != endNumCloses - numCloses) { while (endNumOpens - numOpens != endNumCloses - numCloses) {
if (retries++ > 60) { if (retries++ > 120) {
break; break;
} }
try { try {