bck

Author: original-brownbear

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/BytesKeyedBucketOrds.java

@@ -75,24 +75,6 @@ public interface BucketOrdsEnum {
          * Read the current value.
          */
         void readValue(BytesRef dest);
-
-        /**
-         * An {@linkplain BucketOrdsEnum} that is empty.
-         */
-        BucketOrdsEnum EMPTY = new BucketOrdsEnum() {
-            @Override
-            public boolean next() {
-                return false;
-            }
-
-            @Override
-            public long ord() {
-                return 0;
-            }
-
-            @Override
-            public void readValue(BytesRef dest) {}
-        };
     }
 
     /**

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java

@@ -290,7 +290,6 @@ static class LowCardinality extends GlobalOrdinalsStringTermsAggregator {
             BucketCountThresholds bucketCountThresholds,
             AggregationContext context,
             Aggregator parent,
-            boolean remapGlobalOrds,
             SubAggCollectionMode collectionMode,
             boolean showTermDocCountError,
             Map<String, Object> metadata,
@@ -308,7 +307,7 @@ static class LowCardinality extends GlobalOrdinalsStringTermsAggregator {
                 ALWAYS_TRUE,
                 context,
                 parent,
-                remapGlobalOrds,
+                false,
                 collectionMode,
                 showTermDocCountError,
                 CardinalityUpperBound.ONE,
@@ -385,7 +384,7 @@ protected void doClose() {
             Releasables.close(resultStrategy, segmentDocCounts, collectionStrategy);
         }
 
-        private void mapSegmentCountsToGlobalCounts(LongUnaryOperator mapping) throws IOException {
+        private void mapSegmentCountsToGlobalCounts(LongUnaryOperator mapping) {
             for (long i = 1; i < segmentDocCounts.size(); i++) {
                 // We use set(...) here, because we need to reset the slow to 0.
                 // segmentDocCounts get reused over the segments and otherwise counts would be too high.
@@ -395,7 +394,7 @@ private void mapSegmentCountsToGlobalCounts(LongUnaryOperator mapping) throws IO
                 }
                 long ord = i - 1; // remember we do +1 when counting
                 long globalOrd = mapping.applyAsLong(ord);
-                incrementBucketDocCount(collectionStrategy.globalOrdToBucketOrd(0, globalOrd), inc);
+                incrementBucketDocCount(collectionStrategy.globalOrdToBucketOrd(globalOrd), inc);
             }
         }
     }
@@ -440,7 +439,7 @@ abstract static class CollectionStrategy implements Releasable {
         /**
          * Convert a global ordinal into a bucket ordinal.
          */
-        abstract long globalOrdToBucketOrd(long owningBucketOrd, long globalOrd);
+        abstract long globalOrdToBucketOrd(long globalOrd);
 
         /**
          * Create the aggregation result
@@ -491,8 +490,7 @@ void collectGlobalOrd(long owningBucketOrd, int doc, long globalOrd, LeafBucketC
         }
 
         @Override
-        long globalOrdToBucketOrd(long owningBucketOrd, long globalOrd) {
-            assert owningBucketOrd == 0;
+        long globalOrdToBucketOrd(long globalOrd) {
             return globalOrd;
         }
 
@@ -659,8 +657,8 @@ void collectGlobalOrd(long owningBucketOrd, int doc, long globalOrd, LeafBucketC
         }
 
         @Override
-        long globalOrdToBucketOrd(long owningBucketOrd, long globalOrd) {
-            return bucketOrds.find(owningBucketOrd, globalOrd);
+        long globalOrdToBucketOrd(long globalOrd) {
+            return bucketOrds.find(0, globalOrd);
         }
 
         private void collectZeroDocEntriesIfNeeded(long owningBucketOrd) throws IOException {
@@ -789,7 +787,7 @@ InternalAggregation[] buildAggregations(LongArray owningBucketOrds) throws IOExc
     /**
      * Strategy for building results.
      */
-    abstract class ResultStrategy<
+    abstract static class ResultStrategy<
         R extends InternalAggregation,
         B extends InternalMultiBucketAggregation.InternalBucket,
         TB extends InternalMultiBucketAggregation.InternalBucket> implements Releasable {

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalSignificantTerms.java

@@ -72,7 +72,7 @@ protected Bucket(long subsetDf, long supersetDf, InternalAggregations aggregatio
         /**
          * Read from a stream.
          */
-        protected Bucket(StreamInput in, DocValueFormat format) {
+        protected Bucket(DocValueFormat format) {
             this.format = format;
         }
 

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/SignificanceLookup.java

@@ -89,8 +89,7 @@ interface BackgroundFrequencyForLong extends Releasable {
                 this.backgroundFilter = null;
             }
         } else {
-            Query contextFiltered = context.filterQuery(backgroundQuery);
-            this.backgroundFilter = contextFiltered;
+            this.backgroundFilter = context.filterQuery(backgroundQuery);
         }
         /*
          * We need to use a superset size that includes deleted docs or we

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantLongTerms.java

@@ -37,7 +37,7 @@ public Bucket(long subsetDf, long supersetDf, long term, InternalAggregations ag
         }
 
         Bucket(StreamInput in, DocValueFormat format) throws IOException {
-            super(in, format);
+            super(format);
             subsetDf = in.readVLong();
             supersetDf = in.readVLong();
             term = in.readLong();

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantStringTerms.java

@@ -48,7 +48,7 @@ public Bucket(
          * Read from a stream.
          */
         public Bucket(StreamInput in, DocValueFormat format) throws IOException {
-            super(in, format);
+            super(format);
             termBytes = in.readBytesRef();
             subsetDf = in.readVLong();
             supersetDf = in.readVLong();

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java

@@ -511,7 +511,6 @@ Aggregator create(
                         bucketCountThresholds,
                         context,
                         parent,
-                        false,
                         subAggCollectMode,
                         showTermDocCountError,
                         metadata,

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedSignificantTerms.java

@@ -8,7 +8,6 @@
  */
 package org.elasticsearch.search.aggregations.bucket.terms;
 
-import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.search.DocValueFormat;
@@ -40,7 +39,7 @@ public class UnmappedSignificantTerms extends InternalSignificantTerms<UnmappedS
      * {@linkplain UnmappedTerms} doesn't ever need to build it because it never returns any buckets.
      */
     protected abstract static class Bucket extends InternalSignificantTerms.Bucket<Bucket> {
-        private Bucket(BytesRef term, long subsetDf, long supersetDf, InternalAggregations aggregations, DocValueFormat format) {
+        private Bucket(long subsetDf, long supersetDf, InternalAggregations aggregations, DocValueFormat format) {
             super(subsetDf, supersetDf, aggregations, format);
         }
     }