lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject svn commit: r1545097 - in /lucene/dev/branches/lucene5339/lucene/facet/src: java/org/apache/lucene/facet/search/ java/org/apache/lucene/facet/sortedset/ test/org/apache/lucene/facet/simple/
Date Sun, 24 Nov 2013 22:35:40 GMT
Author: mikemccand
Date: Sun Nov 24 22:35:40 2013
New Revision: 1545097

URL: http://svn.apache.org/r1545097
Log:
LUCENE-5339: remove old sorted set

Removed:
    lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/search/DrillSideways.java
    lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesAccumulator.java
    lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesFacetFields.java
    lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesReaderState.java
Modified:
    lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java
    lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestRangeFacets.java

Modified: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java?rev=1545097&r1=1545096&r2=1545097&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java
(original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java
Sun Nov 24 22:35:40 2013
@@ -8,8 +8,6 @@ import org.apache.lucene.facet.old.OldFa
 import org.apache.lucene.facet.params.FacetIndexingParams;
 import org.apache.lucene.facet.params.FacetSearchParams;
 import org.apache.lucene.facet.search.FacetsCollector.MatchingDocs;
-import org.apache.lucene.facet.sortedset.SortedSetDocValuesAccumulator;
-import org.apache.lucene.facet.sortedset.SortedSetDocValuesReaderState;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
 import org.apache.lucene.index.IndexReader;
 
@@ -77,35 +75,6 @@ public abstract class FacetsAccumulator 
     return new TaxonomyFacetsAccumulator(fsp, indexReader, taxoReader, arrays);
   }
   
-  /**
-   * Creates a {@link FacetsAccumulator} for the given facet requests. This
-   * method supports {@link RangeAccumulator} and
-   * {@link SortedSetDocValuesAccumulator} by dividing the facet requests into
-   * {@link RangeFacetRequest} and the rest.
-   * <p>
-   * If both types of facet requests are used, it returns a
-   * {@link MultiFacetsAccumulator} and the facet results returned from
-   * {@link #accumulate(List)} may not be in the same order as the given facet
-   * requests.
-   * 
-   * @param fsp
-   *          the search params define the facet requests and the
-   *          {@link FacetIndexingParams}
-   * @param state
-   *          the {@link SortedSetDocValuesReaderState} needed for accumulating
-   *          the categories
-   * @param arrays
-   *          the {@link FacetArrays} which the accumulator should use to
-   *          store the categories weights in. Can be {@code null}.
-   */
-  public static FacetsAccumulator create(FacetSearchParams fsp, SortedSetDocValuesReaderState
state, FacetArrays arrays) throws IOException {
-    if (fsp.indexingParams.getPartitionSize() != Integer.MAX_VALUE) {
-      throw new IllegalArgumentException("only default partition size is supported by this
method: " + fsp.indexingParams.getPartitionSize());
-    }
-    
-    return new SortedSetDocValuesAccumulator(state, fsp, arrays);
-  }
-  
   /** Returns an empty {@link FacetResult}. */
   protected static FacetResult emptyResult(int ordinal, FacetRequest fr) {
     FacetResultNode root = new FacetResultNode(ordinal, 0);

Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestRangeFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestRangeFacets.java?rev=1545097&r1=1545096&r2=1545097&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestRangeFacets.java
(original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestRangeFacets.java
Sun Nov 24 22:35:40 2013
@@ -49,7 +49,6 @@ import org.apache.lucene.facet.search.Fa
 import org.apache.lucene.facet.search.FacetsAccumulator;
 import org.apache.lucene.facet.search.FacetsCollector;
 import org.apache.lucene.facet.simple.SimpleDrillSideways.SimpleDrillSidewaysResult;
-import org.apache.lucene.facet.sortedset.SortedSetDocValuesReaderState;
 import org.apache.lucene.facet.taxonomy.FacetLabel;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;



Mime
View raw message