elastic · jimczi · Nov 21, 2017 · Nov 21, 2017
diff --git a/build.gradle b/build.gradle
@@ -251,7 +251,6 @@ subprojects {
     "org.elasticsearch.plugin:parent-join-client:${version}": ':modules:parent-join',
     "org.elasticsearch.plugin:aggs-matrix-stats-client:${version}": ':modules:aggs-matrix-stats',
     "org.elasticsearch.plugin:percolator-client:${version}": ':modules:percolator',
-    "org.elasticsearch.plugin:aggs-composite-client:${version}": ':modules:aggs-composite',
   ]
   if (indexCompatVersions[-1].snapshot) {
     /* The last and second to last versions can be snapshots. Rather than use

diff --git a/client/rest-high-level/build.gradle b/client/rest-high-level/build.gradle
@@ -39,8 +39,7 @@ dependencies {
   compile "org.elasticsearch.client:elasticsearch-rest-client:${version}"
   compile "org.elasticsearch.plugin:parent-join-client:${version}"
   compile "org.elasticsearch.plugin:aggs-matrix-stats-client:${version}"
-  compile "org.elasticsearch.plugin:aggs-composite-client:${version}"
-
+
   testCompile "org.elasticsearch.client:test:${version}"
   testCompile "org.elasticsearch.test:framework:${version}"
   testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"

diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java
@@ -56,6 +56,8 @@
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.bucket.adjacency.AdjacencyMatrixAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.adjacency.ParsedAdjacencyMatrix;
+import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.composite.ParsedComposite;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.filter.FiltersAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.filter.ParsedFilter;
@@ -621,6 +623,7 @@ static List<NamedXContentRegistry.Entry> getDefaultNamedXContents() {
         map.put(ScriptedMetricAggregationBuilder.NAME, (p, c) -> ParsedScriptedMetric.fromXContent(p, (String) c));
         map.put(IpRangeAggregationBuilder.NAME, (p, c) -> ParsedBinaryRange.fromXContent(p, (String) c));
         map.put(TopHitsAggregationBuilder.NAME, (p, c) -> ParsedTopHits.fromXContent(p, (String) c));
+        map.put(CompositeAggregationBuilder.NAME, (p, c) -> ParsedComposite.fromXContent(p, (String) c));
         List<NamedXContentRegistry.Entry> entries = map.entrySet().stream()
                 .map(entry -> new NamedXContentRegistry.Entry(Aggregation.class, new ParseField(entry.getKey()), entry.getValue()))
                 .collect(Collectors.toList());

diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java
@@ -62,7 +62,6 @@
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.InternalAggregations;
-import org.elasticsearch.search.aggregations.composite.CompositeAggregationBuilder;
 import org.elasticsearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder;
 import org.elasticsearch.search.suggest.Suggest;
 import org.elasticsearch.test.ESTestCase;
@@ -648,7 +647,7 @@ public void testDefaultNamedXContents() {
 
     public void testProvidedNamedXContents() {
         List<NamedXContentRegistry.Entry> namedXContents = RestHighLevelClient.getProvidedNamedXContents();
-        assertEquals(3, namedXContents.size());
+        assertEquals(2, namedXContents.size());
         Map<Class<?>, Integer> categories = new HashMap<>();
         List<String> names = new ArrayList<>();
         for (NamedXContentRegistry.Entry namedXContent : namedXContents) {
@@ -659,10 +658,9 @@ public void testProvidedNamedXContents() {
             }
         }
         assertEquals(1, categories.size());
-        assertEquals(Integer.valueOf(3), categories.get(Aggregation.class));
+        assertEquals(Integer.valueOf(2), categories.get(Aggregation.class));
         assertTrue(names.contains(ChildrenAggregationBuilder.NAME));
         assertTrue(names.contains(MatrixStatsAggregationBuilder.NAME));
-        assertTrue(names.contains(CompositeAggregationBuilder.NAME));
     }
 
     private static class TrackingActionListener implements ActionListener<Integer> {

diff --git a/client/transport/build.gradle b/client/transport/build.gradle
@@ -32,7 +32,6 @@ dependencies {
   compile "org.elasticsearch.plugin:lang-mustache-client:${version}"
   compile "org.elasticsearch.plugin:percolator-client:${version}"
   compile "org.elasticsearch.plugin:parent-join-client:${version}"
-  compile "org.elasticsearch.plugin:aggs-composite-client:${version}"
   testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
   testCompile "junit:junit:${versions.junit}"
   testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"

diff --git a/...t/transport/src/main/java/org/elasticsearch/transport/client/PreBuiltTransportClient.java b/...t/transport/src/main/java/org/elasticsearch/transport/client/PreBuiltTransportClient.java
@@ -30,7 +30,6 @@
 import org.elasticsearch.percolator.PercolatorPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.script.mustache.MustachePlugin;
-import org.elasticsearch.search.aggregations.composite.CompositeAggregationPlugin;
 import org.elasticsearch.transport.Netty4Plugin;
 
 import java.util.Arrays;
@@ -45,7 +44,6 @@
  * {@link PercolatorPlugin},
  * {@link MustachePlugin},
  * {@link ParentJoinPlugin}
- * {@link CompositeAggregationPlugin}
  * plugins for the client. These plugins are all the required modules for Elasticsearch.
  */
 @SuppressWarnings({"unchecked","varargs"})
@@ -90,8 +88,7 @@ private static void setSystemPropertyIfUnset(final String key, final String valu
                 ReindexPlugin.class,
                 PercolatorPlugin.class,
                 MustachePlugin.class,
-                ParentJoinPlugin.class,
-                CompositeAggregationPlugin.class));
+                ParentJoinPlugin.class));
 
     /**
      * Creates a new transport client with pre-installed plugins.

diff --git a/...nsport/src/test/java/org/elasticsearch/transport/client/PreBuiltTransportClientTests.java b/...nsport/src/test/java/org/elasticsearch/transport/client/PreBuiltTransportClientTests.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.transport.client;
 
 import com.carrotsearch.randomizedtesting.RandomizedTest;
-import org.apache.lucene.util.Constants;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.network.NetworkModule;
 import org.elasticsearch.common.settings.Settings;
@@ -30,7 +29,6 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.script.mustache.MustachePlugin;
 import org.elasticsearch.transport.Netty4Plugin;
-import org.elasticsearch.search.aggregations.composite.CompositeAggregationPlugin;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -54,7 +52,7 @@ public void testPluginInstalled() {
     public void testInstallPluginTwice() {
         for (Class<? extends Plugin> plugin :
                 Arrays.asList(ParentJoinPlugin.class, ReindexPlugin.class, PercolatorPlugin.class,
-                    MustachePlugin.class, CompositeAggregationPlugin.class)) {
+                    MustachePlugin.class)) {
             try {
                 new PreBuiltTransportClient(Settings.EMPTY, plugin);
                 fail("exception expected");

diff --git a/core/src/main/java/org/elasticsearch/search/SearchModule.java b/core/src/main/java/org/elasticsearch/search/SearchModule.java
@@ -99,6 +99,9 @@
 import org.elasticsearch.search.aggregations.PipelineAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.adjacency.AdjacencyMatrixAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.adjacency.InternalAdjacencyMatrix;
+import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregation;
+import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.composite.InternalComposite;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.filter.FiltersAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.filter.InternalFilter;
@@ -408,6 +411,8 @@ private void registerAggregations(List<SearchPlugin> plugins) {
                 GeoCentroidAggregationBuilder::parse).addResultReader(InternalGeoCentroid::new));
         registerAggregation(new AggregationSpec(ScriptedMetricAggregationBuilder.NAME, ScriptedMetricAggregationBuilder::new,
                 ScriptedMetricAggregationBuilder::parse).addResultReader(InternalScriptedMetric::new));
+        registerAggregation((new AggregationSpec(CompositeAggregationBuilder.NAME, CompositeAggregationBuilder::new,
+            CompositeAggregationBuilder::parse).addResultReader(InternalComposite::new)));
         registerFromPlugin(plugins, SearchPlugin::getAggregations, this::registerAggregation);
     }
 

diff --git a/...tions/composite/CompositeAggregation.java → ...ucket/composite/CompositeAggregation.java b/...tions/composite/CompositeAggregation.java → ...ucket/composite/CompositeAggregation.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.xcontent.XContentBuilder;

diff --git a/...omposite/CompositeAggregationBuilder.java → ...omposite/CompositeAggregationBuilder.java b/...omposite/CompositeAggregationBuilder.java → ...omposite/CompositeAggregationBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.SortField;

diff --git a/...omposite/CompositeAggregationFactory.java → ...omposite/CompositeAggregationFactory.java b/...omposite/CompositeAggregationFactory.java → ...omposite/CompositeAggregationFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.elasticsearch.search.aggregations.Aggregator;
 import org.elasticsearch.search.aggregations.AggregatorFactories;

diff --git a/...composite/CompositeAggregationPlugin.java → ...composite/CompositeAggregationPlugin.java b/...composite/CompositeAggregationPlugin.java → ...composite/CompositeAggregationPlugin.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.plugins.SearchPlugin;

diff --git a/...ations/composite/CompositeAggregator.java → ...bucket/composite/CompositeAggregator.java b/...ations/composite/CompositeAggregator.java → ...bucket/composite/CompositeAggregator.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.CollectionTerminatedException;

diff --git a/.../aggregations/composite/CompositeKey.java → ...ations/bucket/composite/CompositeKey.java b/.../aggregations/composite/CompositeKey.java → ...ations/bucket/composite/CompositeKey.java
@@ -17,21 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
-import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.search.DocValueFormat;
-
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
 
 /**
  * A key that is composed of multiple {@link Comparable} values.

diff --git a/.../composite/CompositeValuesComparator.java → .../composite/CompositeValuesComparator.java b/.../composite/CompositeValuesComparator.java → .../composite/CompositeValuesComparator.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexReader;
@@ -26,10 +26,6 @@
 
 import java.io.IOException;
 
-import static org.elasticsearch.search.aggregations.composite.CompositeValuesSource.wrapBinary;
-import static org.elasticsearch.search.aggregations.composite.CompositeValuesSource.wrapDouble;
-import static org.elasticsearch.search.aggregations.composite.CompositeValuesSource.wrapGlobalOrdinals;
-import static org.elasticsearch.search.aggregations.composite.CompositeValuesSource.wrapLong;
 import static org.elasticsearch.search.aggregations.support.ValuesSource.Numeric;
 import static org.elasticsearch.search.aggregations.support.ValuesSource.Bytes;
 import static org.elasticsearch.search.aggregations.support.ValuesSource.Bytes.WithOrdinals;
@@ -51,16 +47,16 @@ final class CompositeValuesComparator {
             final int reverseMul = sources[i].reverseMul();
             if (sources[i].valuesSource() instanceof WithOrdinals && reader instanceof DirectoryReader) {
                 WithOrdinals vs = (WithOrdinals) sources[i].valuesSource();
-                arrays[i] = wrapGlobalOrdinals(vs, size, reverseMul);
+                arrays[i] = CompositeValuesSource.wrapGlobalOrdinals(vs, size, reverseMul);
             } else if (sources[i].valuesSource() instanceof Bytes) {
                 Bytes vs = (Bytes) sources[i].valuesSource();
-                arrays[i] = wrapBinary(vs, size, reverseMul);
+                arrays[i] = CompositeValuesSource.wrapBinary(vs, size, reverseMul);
             } else if (sources[i].valuesSource() instanceof Numeric) {
                 final Numeric vs = (Numeric) sources[i].valuesSource();
                 if (vs.isFloatingPoint()) {
-                    arrays[i] = wrapDouble(vs, size, reverseMul);
+                    arrays[i] = CompositeValuesSource.wrapDouble(vs, size, reverseMul);
                 } else {
-                    arrays[i] = wrapLong(vs, size, reverseMul);
+                    arrays[i] = CompositeValuesSource.wrapLong(vs, size, reverseMul);
                 }
             }
         }

diff --git a/...ions/composite/CompositeValuesSource.java → ...cket/composite/CompositeValuesSource.java b/...ions/composite/CompositeValuesSource.java → ...cket/composite/CompositeValuesSource.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SortedNumericDocValues;

diff --git a/...mposite/CompositeValuesSourceBuilder.java → ...mposite/CompositeValuesSourceBuilder.java b/...mposite/CompositeValuesSourceBuilder.java → ...mposite/CompositeValuesSourceBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.IndexReader;

diff --git a/...omposite/CompositeValuesSourceConfig.java → ...omposite/CompositeValuesSourceConfig.java b/...omposite/CompositeValuesSourceConfig.java → ...omposite/CompositeValuesSourceConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.elasticsearch.search.aggregations.support.ValuesSource;
 import org.elasticsearch.search.sort.SortOrder;

diff --git a/...te/CompositeValuesSourceParserHelper.java → ...te/CompositeValuesSourceParserHelper.java b/...te/CompositeValuesSourceParserHelper.java → ...te/CompositeValuesSourceParserHelper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParsingException;

diff --git a/...ite/DateHistogramValuesSourceBuilder.java → ...ite/DateHistogramValuesSourceBuilder.java b/...ite/DateHistogramValuesSourceBuilder.java → ...ite/DateHistogramValuesSourceBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.search.SortField;
 import org.elasticsearch.common.ParseField;

diff --git a/...ions/composite/HistogramValuesSource.java → ...cket/composite/HistogramValuesSource.java b/...ions/composite/HistogramValuesSource.java → ...cket/composite/HistogramValuesSource.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SortedNumericDocValues;

diff --git a/...mposite/HistogramValuesSourceBuilder.java → ...mposite/HistogramValuesSourceBuilder.java b/...mposite/HistogramValuesSourceBuilder.java → ...mposite/HistogramValuesSourceBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.search.SortField;
 import org.elasticsearch.common.io.stream.StreamInput;

diff --git a/...egations/composite/InternalComposite.java → ...s/bucket/composite/InternalComposite.java b/...egations/composite/InternalComposite.java → ...s/bucket/composite/InternalComposite.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -59,7 +59,7 @@ public class InternalComposite
         this.reverseMuls = reverseMuls;
     }
 
-    InternalComposite(StreamInput in) throws IOException {
+    public InternalComposite(StreamInput in) throws IOException {
         super(in);
         this.size = in.readVInt();
         this.sourceNames = in.readList(StreamInput::readString);

diff --git a/...gregations/composite/ParsedComposite.java → ...ons/bucket/composite/ParsedComposite.java b/...gregations/composite/ParsedComposite.java → ...ons/bucket/composite/ParsedComposite.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.XContentBuilder;

diff --git a/...tions/composite/RoundingValuesSource.java → ...ucket/composite/RoundingValuesSource.java b/...tions/composite/RoundingValuesSource.java → ...ucket/composite/RoundingValuesSource.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SortedNumericDocValues;

diff --git a/...s/composite/TermsValuesSourceBuilder.java → ...t/composite/TermsValuesSourceBuilder.java b/...s/composite/TermsValuesSourceBuilder.java → ...t/composite/TermsValuesSourceBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.search.aggregations.composite;
+package org.elasticsearch.search.aggregations.bucket.composite;
 
 import org.apache.lucene.search.SortField;
 import org.elasticsearch.common.io.stream.StreamInput;

diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java
@@ -32,6 +32,7 @@
 import org.elasticsearch.rest.action.search.RestSearchAction;
 import org.elasticsearch.search.aggregations.Aggregation.CommonFields;
 import org.elasticsearch.search.aggregations.bucket.adjacency.InternalAdjacencyMatrixTests;
+import org.elasticsearch.search.aggregations.bucket.composite.InternalCompositeTests;
 import org.elasticsearch.search.aggregations.bucket.filter.InternalFilterTests;
 import org.elasticsearch.search.aggregations.bucket.filter.InternalFiltersTests;
 import org.elasticsearch.search.aggregations.bucket.geogrid.InternalGeoHashGridTests;
@@ -144,6 +145,7 @@ private static List<InternalAggregationTestCase> getAggsTests() {
         aggsTests.add(new InternalScriptedMetricTests());
         aggsTests.add(new InternalBinaryRangeTests());
         aggsTests.add(new InternalTopHitsTests());
+        aggsTests.add(new InternalCompositeTests());
         return Collections.unmodifiableList(aggsTests);
     }