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 2015/02/06 17:20:39 UTC
svn commit: r1657883 [3/3] - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/java/org/apache/lucene/search/payloads/
lucene/core/src/java/org/apache/lucene/search/spans/ lucene/c...
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1657883&r1=1657882&r2=1657883&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Fri Feb 6 16:20:37 2015
@@ -1142,7 +1142,7 @@ public class SolrIndexSearcher extends I
List<Weight> weights = new ArrayList<>(notCached.size());
for (Query q : notCached) {
Query qq = QueryUtils.makeQueryable(q);
- weights.add(createNormalizedWeight(qq));
+ weights.add(createNormalizedWeight(qq, true));
}
pf.filter = new FilterImpl(answer, weights);
} else {
@@ -2503,7 +2503,7 @@ class FilterImpl extends Filter {
iterators.add(iter);
}
for (Weight w : weights) {
- Scorer scorer = w.scorer(context, context.reader().getLiveDocs(), true);
+ Scorer scorer = w.scorer(context, context.reader().getLiveDocs());
if (scorer == null) return null;
iterators.add(scorer);
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/WrappedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/WrappedQuery.java?rev=1657883&r1=1657882&r2=1657883&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/WrappedQuery.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/WrappedQuery.java Fri Feb 6 16:20:37 2015
@@ -53,8 +53,8 @@ public class WrappedQuery extends Extend
}
@Override
- public Weight createWeight(IndexSearcher searcher) throws IOException {
- return q.createWeight(searcher);
+ public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
+ return q.createWeight(searcher, needsScores);
}
@Override
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java?rev=1657883&r1=1657882&r2=1657883&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java Fri Feb 6 16:20:37 2015
@@ -20,6 +20,7 @@ package org.apache.solr.search.grouping.
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.TopFieldDocs;
import org.apache.lucene.search.grouping.GroupDocs;
import org.apache.lucene.search.grouping.TopGroups;
import org.apache.lucene.util.BytesRef;
@@ -171,7 +172,12 @@ public class TopGroupsShardResponseProce
}
int topN = rb.getGroupingSpec().getOffset() + rb.getGroupingSpec().getLimit();
- TopDocs mergedTopDocs = TopDocs.merge(sortWithinGroup, topN, topDocs.toArray(new TopDocs[topDocs.size()]));
+ final TopDocs mergedTopDocs;
+ if (sortWithinGroup == null) {
+ mergedTopDocs = TopDocs.merge(topN, topDocs.toArray(new TopDocs[topDocs.size()]));
+ } else {
+ mergedTopDocs = TopDocs.merge(sortWithinGroup, topN, topDocs.toArray(new TopFieldDocs[topDocs.size()]));
+ }
rb.mergedQueryCommandResults.put(query, new QueryCommandResult(mergedTopDocs, mergedMatches));
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java?rev=1657883&r1=1657882&r2=1657883&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java Fri Feb 6 16:20:37 2015
@@ -29,7 +29,7 @@ public class BlockJoinChildQParser exten
}
protected Query createQuery(Query parentListQuery, Query query) {
- return new ToChildBlockJoinQuery(query, getFilter(parentListQuery), false);
+ return new ToChildBlockJoinQuery(query, getFilter(parentListQuery));
}
@Override
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java?rev=1657883&r1=1657882&r2=1657883&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java Fri Feb 6 16:20:37 2015
@@ -53,8 +53,8 @@ public class IgnoreAcceptDocsQuery exten
}
@Override
- public Weight createWeight(IndexSearcher searcher) throws IOException {
- Weight inner = q.createWeight(searcher);
+ public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
+ Weight inner = q.createWeight(searcher, needsScores);
return new IADWeight(inner);
}
@@ -62,6 +62,7 @@ public class IgnoreAcceptDocsQuery exten
Weight w;
IADWeight(Weight delegate) {
+ super(q);
this.w = delegate;
}
@@ -71,11 +72,6 @@ public class IgnoreAcceptDocsQuery exten
}
@Override
- public Query getQuery() {
- return q;
- }
-
- @Override
public float getValueForNormalization() throws IOException {
return w.getValueForNormalization();
}
@@ -86,8 +82,8 @@ public class IgnoreAcceptDocsQuery exten
}
@Override
- public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
- return w.scorer(context, null, needsScores);
+ public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
+ return w.scorer(context, null);
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java?rev=1657883&r1=1657882&r2=1657883&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java Fri Feb 6 16:20:37 2015
@@ -64,26 +64,23 @@ final class DeleteByQueryWrapper extends
}
@Override
- public Weight createWeight(IndexSearcher searcher) throws IOException {
+ public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
final LeafReader wrapped = wrap((LeafReader) searcher.getIndexReader());
final IndexSearcher privateContext = new IndexSearcher(wrapped);
- final Weight inner = in.createWeight(privateContext);
- return new Weight() {
+ final Weight inner = in.createWeight(privateContext, needsScores);
+ return new Weight(DeleteByQueryWrapper.this) {
@Override
public Explanation explain(LeafReaderContext context, int doc) throws IOException { throw new UnsupportedOperationException(); }
@Override
- public Query getQuery() { return DeleteByQueryWrapper.this; }
-
- @Override
public float getValueForNormalization() throws IOException { return inner.getValueForNormalization(); }
@Override
public void normalize(float norm, float topLevelBoost) { inner.normalize(norm, topLevelBoost); }
@Override
- public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
- return inner.scorer(privateContext.getIndexReader().leaves().get(0), acceptDocs, needsScores);
+ public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
+ return inner.scorer(privateContext.getIndexReader().leaves().get(0), acceptDocs);
}
};
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java?rev=1657883&r1=1657882&r2=1657883&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java Fri Feb 6 16:20:37 2015
@@ -113,8 +113,8 @@ public class TestRankQueryPlugin extends
return false;
}
- public Weight createWeight(IndexSearcher indexSearcher ) throws IOException{
- return q.createWeight(indexSearcher);
+ public Weight createWeight(IndexSearcher indexSearcher, boolean needsScores) throws IOException{
+ return q.createWeight(indexSearcher, needsScores);
}
public void setBoost(float boost) {