You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2013/05/28 14:03:12 UTC
svn commit: r1486896 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/facet/
lucene/facet/src/java/org/apache/lucene/facet/search/DrillSideways.java
Author: shaie
Date: Tue May 28 12:03:12 2013
New Revision: 1486896
URL: http://svn.apache.org/r1486896
Log:
LUCENE-5020: Make DrillSidewaysResult ctor public
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/DrillSideways.java
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/DrillSideways.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/DrillSideways.java?rev=1486896&r1=1486895&r2=1486896&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/DrillSideways.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/DrillSideways.java Tue May 28 12:03:12 2013
@@ -410,8 +410,7 @@ public class DrillSideways {
doMaxScore,
true);
DrillSidewaysResult r = search(query, hitCollector, fsp);
- r.hits = hitCollector.topDocs();
- return r;
+ return new DrillSidewaysResult(r.facetResults, hitCollector.topDocs());
} else {
return search(after, query, topN, fsp);
}
@@ -425,8 +424,7 @@ public class DrillSideways {
DrillDownQuery query, int topN, FacetSearchParams fsp) throws IOException {
TopScoreDocCollector hitCollector = TopScoreDocCollector.create(Math.min(topN, searcher.getIndexReader().maxDoc()), after, true);
DrillSidewaysResult r = search(query, hitCollector, fsp);
- r.hits = hitCollector.topDocs();
- return r;
+ return new DrillSidewaysResult(r.facetResults, hitCollector.topDocs());
}
/** Override this to use a custom drill-down {@link
@@ -454,16 +452,20 @@ public class DrillSideways {
return false;
}
- /** Represents the returned result from a drill sideways
- * search. */
+ /**
+ * Represents the returned result from a drill sideways search. Note that if
+ * you called
+ * {@link DrillSideways#search(DrillDownQuery, Collector, FacetSearchParams)},
+ * then {@link #hits} will be {@code null}.
+ */
public static class DrillSidewaysResult {
/** Combined drill down & sideways results. */
public final List<FacetResult> facetResults;
/** Hits. */
- public TopDocs hits;
+ public final TopDocs hits;
- DrillSidewaysResult(List<FacetResult> facetResults, TopDocs hits) {
+ public DrillSidewaysResult(List<FacetResult> facetResults, TopDocs hits) {
this.facetResults = facetResults;
this.hits = hits;
}