honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed merge errors

This commit is contained in:
Colin Goodheart-Smithe 2015-12-09 14:56:19 +00:00
parent 2b5aa09ccf
commit 210be978b1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java
View File

@ -182,7 +182,7 @@ public class StatsAggregator extends NumericMetricsAggregator.MultiValue {
@Override @Override
protected ValuesSourceAggregatorFactory<Numeric> innerReadFrom(String name, ValuesSourceType valuesSourceType, protected ValuesSourceAggregatorFactory<Numeric> innerReadFrom(String name, ValuesSourceType valuesSourceType,
ValueType targetValueType, StreamInput in) { ValueType targetValueType, StreamInput in) {
return new StatsAggegator.Factory(name); return new StatsAggregator.Factory(name);
} }
@Override @Override

8
core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java
View File

@ -19,13 +19,13 @@
package org.elasticsearch.search.aggregations.metrics; package org.elasticsearch.search.aggregations.metrics;
import org.elasticsearch.search.aggregations.metrics.stats.StatsAggegator; import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregator;
public class StatsTests extends AbstractNumericMetricTestCase<StatsAggegator.Factory> { public class StatsTests extends AbstractNumericMetricTestCase<StatsAggregator.Factory> {
@Override @Override
protected StatsAggegator.Factory doCreateTestAggregatorFactory() { protected StatsAggregator.Factory doCreateTestAggregatorFactory() {
return new StatsAggegator.Factory("foo"); return new StatsAggregator.Factory("foo");
} }
} }