From d0c985502b38e695d45a72ecc4dc89cf513b3f2d Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Thu, 4 Mar 2021 16:03:04 -0800 Subject: [PATCH] [Rename] modules/aggs-matrix-stats (#199) This PR refactors the aggs-matrix-stats module as part of the Elasticsearch to OpenSearch renaming. Signed-off-by: Rabi Panda --- .../client/RestHighLevelClientTests.java | 2 +- .../java/org/elasticsearch/client/SearchIT.java | 4 ++-- modules/aggs-matrix-stats/build.gradle | 4 ++-- .../MatrixStatsAggregationBuilders.java | 6 +++--- .../matrix/MatrixAggregationPlugin.java | 8 ++++---- .../spi/MatrixStatsNamedXContentProvider.java | 6 +++--- .../matrix/stats/InternalMatrixStats.java | 2 +- .../stats/MatrixAggregationInspectionHelper.java | 2 +- .../aggregations/matrix/stats/MatrixStats.java | 2 +- .../stats/MatrixStatsAggregationBuilder.java | 4 ++-- .../matrix/stats/MatrixStatsAggregator.java | 8 ++++---- .../stats/MatrixStatsAggregatorFactory.java | 4 ++-- .../matrix/stats/MatrixStatsParser.java | 15 +++++++-------- .../matrix/stats/MatrixStatsResults.java | 2 +- .../matrix/stats/ParsedMatrixStats.java | 2 +- .../aggregations/matrix/stats/RunningStats.java | 2 +- .../aggregations/support/ArrayValuesSource.java | 3 ++- .../ArrayValuesSourceAggregationBuilder.java | 5 ++++- .../ArrayValuesSourceAggregatorFactory.java | 6 ++++-- .../support/ArrayValuesSourceParser.java | 7 ++++++- ...lasticsearch.plugins.spi.NamedXContentProvider | 1 - ...g.opensearch.plugins.spi.NamedXContentProvider | 1 + .../matrix/stats/BaseMatrixStatsTestCase.java | 2 +- .../matrix/stats/InternalMatrixStatsTests.java | 6 +++--- .../matrix/stats/MatrixStatsAggregatorTests.java | 4 ++-- .../aggregations/matrix/stats/MultiPassStats.java | 2 +- .../matrix/stats/RunningStatsTests.java | 2 +- .../matrix/MatrixStatsClientYamlTestSuiteIT.java | 2 +- 28 files changed, 62 insertions(+), 52 deletions(-) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/MatrixStatsAggregationBuilders.java (83%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/MatrixAggregationPlugin.java (81%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java (87%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/InternalMatrixStats.java (99%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/MatrixAggregationInspectionHelper.java (94%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/MatrixStats.java (96%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java (96%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/MatrixStatsAggregator.java (94%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java (96%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/MatrixStatsParser.java (75%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/MatrixStatsResults.java (99%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/ParsedMatrixStats.java (99%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/RunningStats.java (99%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/support/ArrayValuesSource.java (96%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java (97%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java (95%) rename modules/aggs-matrix-stats/src/main/java/org/{elasticsearch => opensearch}/search/aggregations/support/ArrayValuesSourceParser.java (96%) delete mode 100644 modules/aggs-matrix-stats/src/main/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider create mode 100644 modules/aggs-matrix-stats/src/main/resources/META-INF/services/org.opensearch.plugins.spi.NamedXContentProvider rename modules/aggs-matrix-stats/src/test/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/BaseMatrixStatsTestCase.java (96%) rename modules/aggs-matrix-stats/src/test/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/InternalMatrixStatsTests.java (97%) rename modules/aggs-matrix-stats/src/test/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java (97%) rename modules/aggs-matrix-stats/src/test/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/MultiPassStats.java (99%) rename modules/aggs-matrix-stats/src/test/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/stats/RunningStatsTests.java (97%) rename modules/aggs-matrix-stats/src/yamlRestTest/java/org/{elasticsearch => opensearch}/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java (96%) 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 index 0a88db889e000..d47a753f675af 100644 --- 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 @@ -68,7 +68,7 @@ import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.InternalAggregations; -import org.elasticsearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; +import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; import org.elasticsearch.search.suggest.Suggest; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.InternalAggregationTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java index 0569e6ca216ee..a672089e12175 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java @@ -71,8 +71,8 @@ import org.elasticsearch.search.aggregations.bucket.terms.RareTermsAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; -import org.elasticsearch.search.aggregations.matrix.stats.MatrixStats; -import org.elasticsearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; +import org.opensearch.search.aggregations.matrix.stats.MatrixStats; +import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.WeightedAvg; import org.elasticsearch.search.aggregations.metrics.WeightedAvgAggregationBuilder; import org.elasticsearch.search.aggregations.support.MultiValuesSourceFieldConfig; diff --git a/modules/aggs-matrix-stats/build.gradle b/modules/aggs-matrix-stats/build.gradle index 044a64224b206..90405283819de 100644 --- a/modules/aggs-matrix-stats/build.gradle +++ b/modules/aggs-matrix-stats/build.gradle @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.yaml-rest-test' +apply plugin: 'opensearch.yaml-rest-test' esplugin { description 'Adds aggregations whose input are a list of numeric fields and output includes a matrix.' - classname 'org.elasticsearch.search.aggregations.matrix.MatrixAggregationPlugin' + classname 'org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin' hasClientJar = true } diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/MatrixStatsAggregationBuilders.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/MatrixStatsAggregationBuilders.java similarity index 83% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/MatrixStatsAggregationBuilders.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/MatrixStatsAggregationBuilders.java index 38c412738fcfd..1db8627267a39 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/MatrixStatsAggregationBuilders.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/MatrixStatsAggregationBuilders.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations; +package org.opensearch.search.aggregations; -import org.elasticsearch.search.aggregations.matrix.stats.MatrixStats; -import org.elasticsearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; +import org.opensearch.search.aggregations.matrix.stats.MatrixStats; +import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; public class MatrixStatsAggregationBuilders { /** diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/MatrixAggregationPlugin.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationPlugin.java similarity index 81% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/MatrixAggregationPlugin.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationPlugin.java index a712371fa10d2..5e9ce683088bb 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/MatrixAggregationPlugin.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationPlugin.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.search.aggregations.matrix; +package org.opensearch.search.aggregations.matrix; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.matrix.stats.InternalMatrixStats; -import org.elasticsearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; -import org.elasticsearch.search.aggregations.matrix.stats.MatrixStatsParser; +import org.opensearch.search.aggregations.matrix.stats.InternalMatrixStats; +import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; +import org.opensearch.search.aggregations.matrix.stats.MatrixStatsParser; import java.util.List; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java similarity index 87% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java index bb71e3085de62..cfe93f1b72ebd 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.search.aggregations.matrix.spi; +package org.opensearch.search.aggregations.matrix.spi; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ContextParser; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.plugins.spi.NamedXContentProvider; import org.elasticsearch.search.aggregations.Aggregation; -import org.elasticsearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; -import org.elasticsearch.search.aggregations.matrix.stats.ParsedMatrixStats; +import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; +import org.opensearch.search.aggregations.matrix.stats.ParsedMatrixStats; import java.util.List; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStats.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStats.java similarity index 99% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStats.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStats.java index 94b571635cff9..c51dab55470b6 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStats.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStats.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixAggregationInspectionHelper.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixAggregationInspectionHelper.java similarity index 94% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixAggregationInspectionHelper.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixAggregationInspectionHelper.java index c62c91477cdef..181828cde3d91 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixAggregationInspectionHelper.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixAggregationInspectionHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; /** * Counterpart to {@link org.elasticsearch.search.aggregations.support.AggregationInspectionHelper}, providing diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStats.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStats.java similarity index 96% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStats.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStats.java index f7604ff18ec10..62cb4fb5c2d60 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStats.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStats.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.elasticsearch.search.aggregations.Aggregation; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java similarity index 96% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java index 76003b947a740..e1afa97d93d74 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -27,7 +27,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.AggregatorFactory; -import org.elasticsearch.search.aggregations.support.ArrayValuesSourceAggregationBuilder; +import org.opensearch.search.aggregations.support.ArrayValuesSourceAggregationBuilder; import org.elasticsearch.search.aggregations.support.ValuesSourceConfig; import java.io.IOException; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java similarity index 94% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java index 7862577603da6..e16d1ab230766 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.ScoreMode; @@ -30,9 +30,9 @@ import org.elasticsearch.search.aggregations.LeafBucketCollector; import org.elasticsearch.search.aggregations.LeafBucketCollectorBase; import org.elasticsearch.search.aggregations.metrics.MetricsAggregator; -import org.elasticsearch.search.aggregations.support.ArrayValuesSource.NumericArrayValuesSource; import org.elasticsearch.search.aggregations.support.ValuesSource; import org.elasticsearch.search.internal.SearchContext; +import org.opensearch.search.aggregations.support.ArrayValuesSource; import java.io.IOException; import java.util.Map; @@ -42,7 +42,7 @@ **/ final class MatrixStatsAggregator extends MetricsAggregator { /** Multiple ValuesSource with field names */ - private final NumericArrayValuesSource valuesSources; + private final ArrayValuesSource.NumericArrayValuesSource valuesSources; /** array of descriptive stats, per shard, needed to compute the correlation */ ObjectArray stats; @@ -51,7 +51,7 @@ final class MatrixStatsAggregator extends MetricsAggregator { Aggregator parent, MultiValueMode multiValueMode, Map metadata) throws IOException { super(name, context, parent, metadata); if (valuesSources != null && !valuesSources.isEmpty()) { - this.valuesSources = new NumericArrayValuesSource(valuesSources, multiValueMode); + this.valuesSources = new ArrayValuesSource.NumericArrayValuesSource(valuesSources, multiValueMode); stats = context.bigArrays().newObjectArray(1); } else { this.valuesSources = null; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java similarity index 96% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java index ac0b7671b9d20..a41baa2f90fa5 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.MultiValueMode; @@ -25,7 +25,7 @@ import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.AggregatorFactory; import org.elasticsearch.search.aggregations.CardinalityUpperBound; -import org.elasticsearch.search.aggregations.support.ArrayValuesSourceAggregatorFactory; +import org.opensearch.search.aggregations.support.ArrayValuesSourceAggregatorFactory; import org.elasticsearch.search.aggregations.support.ValuesSource; import org.elasticsearch.search.aggregations.support.ValuesSourceConfig; import org.elasticsearch.search.internal.SearchContext; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsParser.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsParser.java similarity index 75% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsParser.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsParser.java index 0f48d1855ae3e..b521612e58ed1 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsParser.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsParser.java @@ -16,21 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.MultiValueMode; -import org.elasticsearch.search.aggregations.support.ArrayValuesSourceParser.NumericValuesSourceParser; import org.elasticsearch.search.aggregations.support.ValueType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; +import org.opensearch.search.aggregations.support.ArrayValuesSourceAggregationBuilder; +import org.opensearch.search.aggregations.support.ArrayValuesSourceParser; import java.io.IOException; import java.util.Map; -import static org.elasticsearch.search.aggregations.support.ArrayValuesSourceAggregationBuilder.MULTIVALUE_MODE_FIELD; - -public class MatrixStatsParser extends NumericValuesSourceParser { +public class MatrixStatsParser extends ArrayValuesSourceParser.NumericValuesSourceParser { public MatrixStatsParser() { super(true); @@ -39,9 +38,9 @@ public MatrixStatsParser() { @Override protected boolean token(String aggregationName, String currentFieldName, XContentParser.Token token, XContentParser parser, Map otherOptions) throws IOException { - if (MULTIVALUE_MODE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) { + if (ArrayValuesSourceAggregationBuilder.MULTIVALUE_MODE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) { if (token == XContentParser.Token.VALUE_STRING) { - otherOptions.put(MULTIVALUE_MODE_FIELD, parser.text()); + otherOptions.put(ArrayValuesSourceAggregationBuilder.MULTIVALUE_MODE_FIELD, parser.text()); return true; } } @@ -52,7 +51,7 @@ protected boolean token(String aggregationName, String currentFieldName, XConten protected MatrixStatsAggregationBuilder createFactory(String aggregationName, ValuesSourceType valuesSourceType, ValueType targetValueType, Map otherOptions) { MatrixStatsAggregationBuilder builder = new MatrixStatsAggregationBuilder(aggregationName); - String mode = (String)otherOptions.get(MULTIVALUE_MODE_FIELD); + String mode = (String)otherOptions.get(ArrayValuesSourceAggregationBuilder.MULTIVALUE_MODE_FIELD); if (mode != null) { builder.multiValueMode(MultiValueMode.fromString(mode)); } diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsResults.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsResults.java similarity index 99% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsResults.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsResults.java index 9853163ff843d..dac0a20438991 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsResults.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsResults.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/ParsedMatrixStats.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/ParsedMatrixStats.java similarity index 99% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/ParsedMatrixStats.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/ParsedMatrixStats.java index 660ecc930982c..04032466cd22e 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/ParsedMatrixStats.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/ParsedMatrixStats.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ObjectParser; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/RunningStats.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/RunningStats.java similarity index 99% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/RunningStats.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/RunningStats.java index fea55571585fc..4e17b7716fa63 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/RunningStats.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/RunningStats.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSource.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSource.java similarity index 96% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSource.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSource.java index 94bf68c7ae489..2acdc5c04365d 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSource.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSource.java @@ -16,11 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.support; +package org.opensearch.search.aggregations.support; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.search.MultiValueMode; +import org.elasticsearch.search.aggregations.support.ValuesSource; import java.io.IOException; import java.util.Map; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java similarity index 97% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java index 2d644bf629c7f..8fdfe1ec82f91 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.support; +package org.opensearch.search.aggregations.support; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -28,6 +28,9 @@ import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.AggregatorFactories.Builder; import org.elasticsearch.search.aggregations.AggregatorFactory; +import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; +import org.elasticsearch.search.aggregations.support.ValueType; +import org.elasticsearch.search.aggregations.support.ValuesSourceConfig; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java similarity index 95% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java index 220815256a671..c2948df9a8ae0 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java @@ -17,13 +17,15 @@ * under the License. */ -package org.elasticsearch.search.aggregations.support; +package org.opensearch.search.aggregations.support; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.AggregatorFactory; import org.elasticsearch.search.aggregations.CardinalityUpperBound; +import org.elasticsearch.search.aggregations.support.ValuesSource; +import org.elasticsearch.search.aggregations.support.ValuesSourceConfig; import org.elasticsearch.search.internal.SearchContext; import java.io.IOException; @@ -73,7 +75,7 @@ protected abstract Aggregator createUnmapped(SearchContext searchContext, /** * Create the {@linkplain Aggregator} when any of the configured * fields can be resolved to a {@link ValuesSource}. - * + * * @param cardinality Upper bound of the number of {@code owningBucketOrd}s * that the {@link Aggregator} created by this method * will be asked to collect. diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceParser.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceParser.java similarity index 96% rename from modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceParser.java rename to modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceParser.java index 4d935c92c2e1f..5beacc88cace2 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceParser.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceParser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.aggregations.support; +package org.opensearch.search.aggregations.support; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; @@ -25,6 +25,11 @@ import org.elasticsearch.script.Script; import org.elasticsearch.search.aggregations.AggregationBuilder.CommonFields; import org.elasticsearch.search.aggregations.Aggregator; +import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; +import org.elasticsearch.search.aggregations.support.ValueType; +import org.elasticsearch.search.aggregations.support.ValuesSource; +import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder; +import org.elasticsearch.search.aggregations.support.ValuesSourceType; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/aggs-matrix-stats/src/main/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider b/modules/aggs-matrix-stats/src/main/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider deleted file mode 100644 index a2d706a39a60c..0000000000000 --- a/modules/aggs-matrix-stats/src/main/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider +++ /dev/null @@ -1 +0,0 @@ -org.elasticsearch.search.aggregations.matrix.spi.MatrixStatsNamedXContentProvider \ No newline at end of file diff --git a/modules/aggs-matrix-stats/src/main/resources/META-INF/services/org.opensearch.plugins.spi.NamedXContentProvider b/modules/aggs-matrix-stats/src/main/resources/META-INF/services/org.opensearch.plugins.spi.NamedXContentProvider new file mode 100644 index 0000000000000..788ad501c54af --- /dev/null +++ b/modules/aggs-matrix-stats/src/main/resources/META-INF/services/org.opensearch.plugins.spi.NamedXContentProvider @@ -0,0 +1 @@ +org.opensearch.search.aggregations.matrix.spi.MatrixStatsNamedXContentProvider diff --git a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/BaseMatrixStatsTestCase.java b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/BaseMatrixStatsTestCase.java similarity index 96% rename from modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/BaseMatrixStatsTestCase.java rename to modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/BaseMatrixStatsTestCase.java index 091235bf82e03..939f360fd2cc7 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/BaseMatrixStatsTestCase.java +++ b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/BaseMatrixStatsTestCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java similarity index 97% rename from modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java rename to modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java index 70b0f6b2405fa..cae09c3b9d405 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java +++ b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.settings.Settings; @@ -30,8 +30,8 @@ import org.elasticsearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.search.aggregations.matrix.MatrixAggregationPlugin; -import org.elasticsearch.search.aggregations.matrix.stats.InternalMatrixStats.Fields; +import org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin; +import org.opensearch.search.aggregations.matrix.stats.InternalMatrixStats.Fields; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator.PipelineTree; import org.elasticsearch.test.InternalAggregationTestCase; diff --git a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java similarity index 97% rename from modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java rename to modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java index 4223931c4e32c..8be0df209eac5 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java +++ b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -32,7 +32,7 @@ import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.plugins.SearchPlugin; import org.elasticsearch.search.aggregations.AggregatorTestCase; -import org.elasticsearch.search.aggregations.matrix.MatrixAggregationPlugin; +import org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin; import java.util.Arrays; import java.util.Collections; diff --git a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/MultiPassStats.java b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MultiPassStats.java similarity index 99% rename from modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/MultiPassStats.java rename to modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MultiPassStats.java index cd4ee3ee849ee..755aa6cf05be3 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/MultiPassStats.java +++ b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MultiPassStats.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import java.util.HashMap; import java.util.List; diff --git a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/RunningStatsTests.java b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/RunningStatsTests.java similarity index 97% rename from modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/RunningStatsTests.java rename to modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/RunningStatsTests.java index ca22e33e6bc26..1ff1d933b44b5 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/RunningStatsTests.java +++ b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/RunningStatsTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix.stats; +package org.opensearch.search.aggregations.matrix.stats; import java.util.List; diff --git a/modules/aggs-matrix-stats/src/yamlRestTest/java/org/elasticsearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java b/modules/aggs-matrix-stats/src/yamlRestTest/java/org/opensearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java similarity index 96% rename from modules/aggs-matrix-stats/src/yamlRestTest/java/org/elasticsearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java rename to modules/aggs-matrix-stats/src/yamlRestTest/java/org/opensearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java index a5051a40ab098..99655b7bbc9ce 100644 --- a/modules/aggs-matrix-stats/src/yamlRestTest/java/org/elasticsearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java +++ b/modules/aggs-matrix-stats/src/yamlRestTest/java/org/opensearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.aggregations.matrix; +package org.opensearch.search.aggregations.matrix; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;