Author: nzamosenchuk
Date: 2010-05-28 05:56:00 -0400 (Fri, 28 May 2010)
New Revision: 2441
Modified:
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/JcrIndexSearcher.java
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryHits.java
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
Log:
EXOJCR-744 : upgrading to Lucene 2.9:
Weight.score(IndexReader, boolean, boolean) usage changed a bit.
Modified:
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/JcrIndexSearcher.java
===================================================================
---
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/JcrIndexSearcher.java 2010-05-28
06:54:18 UTC (rev 2440)
+++
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/JcrIndexSearcher.java 2010-05-28
09:56:00 UTC (rev 2441)
@@ -103,7 +103,7 @@
}
if (hits == null) {
if (sort == null) {
- hits = new LuceneQueryHits(reader, this, query, true, false);
+ hits = new LuceneQueryHits(reader, this, query);
} else {
hits = new SortedLuceneQueryHits(
reader, this, query, sort, resultFetchHint);
Modified:
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryHits.java
===================================================================
---
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryHits.java 2010-05-28
06:54:18 UTC (rev 2440)
+++
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryHits.java 2010-05-28
09:56:00 UTC (rev 2441)
@@ -41,10 +41,10 @@
*/
private final Scorer scorer;
- public LuceneQueryHits(IndexReader reader, IndexSearcher searcher, Query query,
boolean scoreDocsInOrder, boolean topScorer) throws IOException
+ public LuceneQueryHits(IndexReader reader, IndexSearcher searcher, Query query) throws
IOException
{
this.reader = reader;
- this.scorer = query.weight(searcher).scorer(reader, scoreDocsInOrder, topScorer);
+ this.scorer = query.weight(searcher).scorer(reader, true, false);
}
/**
Modified:
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
===================================================================
---
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2010-05-28
06:54:18 UTC (rev 2440)
+++
jcr/branches/1.12-LIC-709/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2010-05-28
09:56:00 UTC (rev 2441)
@@ -2745,7 +2745,7 @@
IndexSearcher searcher = new IndexSearcher(reader);
searcher.setSimilarity(getSimilarity());
- return new LuceneQueryHits(reader, searcher, query, true, false);
+ return new LuceneQueryHits(reader, searcher, query);
}
/**
Show replies by date