svn commit: r1680727 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java solr/core/src/java/org/apache/solr/search/facet/FacetModule.java

[yo...@apache.org]

Author: yonik
Date: Thu May 21 03:53:44 2015
New Revision: 1680727

URL: http://svn.apache.org/r1680727
Log:
move FacetMerger public to make javadoc happy

Added:
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java
      - copied unchanged from r1680726, lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java
Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java?rev=1680727&r1=1680726&r2=1680727&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java Thu May 21 03:53:44 2015
@@ -215,22 +215,6 @@ class FacetComponentState {
   FacetMerger merger;
 }
 
-//
-// The FacetMerger code is in the prototype stage, and this is the reason that
-// many implementations are all in this file.  They can be moved to separate
-// files after the interfaces are locked down more.
-//
-
-abstract class FacetMerger {
-  public abstract void merge(Object facetResult, Context mcontext);
-  public abstract Object getMergedResult();
-
-  public static class Context {
-    FacetComponentState state;  // todo: is this needed?
-    Object root;
-  }
-}
-
 
 abstract class FacetSortableMerger extends FacetMerger {
   public void prepareSort() {
@@ -307,6 +291,7 @@ class FacetLongMerger extends FacetSorta
 // base class for facets that create buckets (and can hence have sub-facets)
 abstract class FacetBucketMerger<FacetRequestT extends FacetRequest> extends FacetMerger {
   FacetRequestT freq;
+  int bucketNumber;
 
   public FacetBucketMerger(FacetRequestT freq) {
     this.freq = freq;
@@ -314,7 +299,7 @@ abstract class FacetBucketMerger<FacetRe
 
   /** Bucketval is the representative value for the bucket.  Only applicable to terms and range queries to distinguish buckets. */
   FacetBucket newBucket(Comparable bucketVal) {
-    return new FacetBucket(this, bucketVal);
+    return new FacetBucket(this, bucketVal, bucketNumber++);
   }
 
   // do subs...
@@ -360,14 +345,17 @@ class FacetQueryMerger extends FacetBuck
 
 
 class FacetBucket {
-  FacetBucketMerger parent;
-  Comparable bucketValue;
+  final FacetBucketMerger parent;
+  final Comparable bucketValue;
+  final int bucketNumber;  // this is just for internal correlation (the first bucket created is bucket 0, the next bucket 1, etc)
+
   long count;
   Map<String, FacetMerger> subs;
 
-  public FacetBucket(FacetBucketMerger parent, Comparable bucketValue) {
+  public FacetBucket(FacetBucketMerger parent, Comparable bucketValue, int bucketNumber) {
     this.parent = parent;
     this.bucketValue = bucketValue;
+    this.bucketNumber = bucketNumber;
   }
 
   public long getCount() {
@@ -448,7 +436,7 @@ class FacetFieldMerger extends FacetBuck
   FacetBucket allBuckets;
   FacetMerger numBuckets;
 
-  LinkedHashMap<Object,FacetBucket> buckets = new LinkedHashMap<Object,FacetBucket>();
+  LinkedHashMap<Object,FacetBucket> buckets = new LinkedHashMap<>();
   List<FacetBucket> sortedBuckets;
   int numReturnedBuckets; // the number of buckets in the bucket lists returned from all of the shards
 
@@ -730,11 +718,6 @@ class FacetRangeMerger extends FacetBuck
   }
 
   @Override
-  FacetBucket newBucket(Comparable bucketVal) {
-    return super.newBucket(bucketVal);
-  }
-
-  @Override
   FacetMerger createFacetMerger(String key, Object val) {
     return super.createFacetMerger(key, val);
   }