svn commit: r1389731 - in /lucene/dev/branches/lucene_solr_4_0: ./ lucene/ lucene/facet/ lucene/facet/src/java/org/apache/lucene/facet/search/sampling/ lucene/facet/src/test/org/apache/lucene/facet/search/sampling/

[sh...@apache.org]

Author: shaie
Date: Tue Sep 25 07:22:59 2012
New Revision: 1389731

URL: http://svn.apache.org/viewvc?rev=1389731&view=rev
Log:
LUCENE-4411: Depth requested in a FacetRequest is reset when Sampling is in effect

Added:
    lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/OversampleWithDepthTest.java
      - copied unchanged from r1389718, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/OversampleWithDepthTest.java
Modified:
    lucene/dev/branches/lucene_solr_4_0/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/facet/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/Sampler.java

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/CHANGES.txt?rev=1389731&r1=1389730&r2=1389731&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/CHANGES.txt Tue Sep 25 07:22:59 2012
@@ -164,6 +164,10 @@ Bug Fixes
 * LUCENE-4401: Fix bug where DisjunctionSumScorer would sometimes call score()
   on a subscorer that had already returned NO_MORE_DOCS.  (Liu Chao, Robert Muir)
 
+* LUCENE-4411: when sampling is enabled for a FacetRequest, its depth
+  parameter is reset to the default (1), even if set otherwise.
+  (Gilad Barkai via Shai Erera)
+
 Optimizations
 
 * LUCENE-4322: Decrease lucene-core JAR size. The core JAR size had increased a

Modified: lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/Sampler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/Sampler.java?rev=1389731&r1=1389730&r2=1389731&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/Sampler.java (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/Sampler.java Tue Sep 25 07:22:59 2012
@@ -4,6 +4,7 @@ import java.io.IOException;
 
 import org.apache.lucene.index.IndexReader;
 
+import org.apache.lucene.facet.search.CategoryListIterator;
 import org.apache.lucene.facet.search.FacetArrays;
 import org.apache.lucene.facet.search.ScoredDocIDs;
 import org.apache.lucene.facet.search.aggregator.Aggregator;
@@ -203,8 +204,21 @@ public abstract class Sampler {
     public OverSampledFacetRequest(FacetRequest orig, int num) {
       super(orig.getCategoryPath(), num);
       this.orig = orig;
+      setDepth(orig.getDepth());
+      setNumLabel(orig.getNumLabel());
+      setResultMode(orig.getResultMode());
+      setSortBy(orig.getSortBy());
+      setSortOrder(orig.getSortOrder());
+    }
+    
+    @Override
+    public CategoryListIterator createCategoryListIterator(IndexReader reader,
+        TaxonomyReader taxo, FacetSearchParams sParams, int partition)
+        throws IOException {
+      return orig.createCategoryListIterator(reader, taxo, sParams, partition);
     }
 
+    
     @Override
     public Aggregator createAggregator(boolean useComplements,
         FacetArrays arrays, IndexReader indexReader,
@@ -222,5 +236,10 @@ public abstract class Sampler {
     public boolean requireDocumentScore() {
       return orig.requireDocumentScore();
     }
+    
+    @Override
+    public boolean supportsComplements() {
+      return orig.supportsComplements();
+    }
   }
 }