Soft immutability for VSConfig (#52729)

not-napoleon · web-flow · commit 678164ba464f · 2020-02-26T09:32:53.000-05:00
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/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java
@@ -53,7 +53,7 @@ public Aggregator createInternal(SearchContext searchContext,
         HashMap<String, ValuesSource> valuesSources = new HashMap<>();
 
         for (Map.Entry<String, ValuesSourceConfig> config : configs.entrySet()) {
-            ValuesSource vs = config.getValue().toValuesSource(queryShardContext);
+            ValuesSource vs = config.getValue().toValuesSource();
             if (vs != null) {
                 valuesSources.put(config.getKey(), vs);
             }
diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ChildrenAggregationBuilder.java b/modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ChildrenAggregationBuilder.java
@@ -25,7 +25,6 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.fielddata.plain.SortedSetDVOrdinalsIndexFieldData;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.query.QueryShardContext;
 import org.elasticsearch.join.mapper.ParentIdFieldMapper;
@@ -34,7 +33,6 @@
 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.FieldContext;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
@@ -109,23 +107,19 @@ protected ValuesSourceAggregatorFactory innerBuild(QueryShardContext queryShardC
 
     @Override
     protected ValuesSourceConfig resolveConfig(QueryShardContext queryShardContext) {
-        ValuesSourceConfig config = new ValuesSourceConfig(CoreValuesSourceType.BYTES);
-        joinFieldResolveConfig(queryShardContext, config);
-        return config;
-    }
-
-    private void joinFieldResolveConfig(QueryShardContext queryShardContext, ValuesSourceConfig config) {
+        ValuesSourceConfig config;
         ParentJoinFieldMapper parentJoinFieldMapper = ParentJoinFieldMapper.getMapper(queryShardContext.getMapperService());
         ParentIdFieldMapper parentIdFieldMapper = parentJoinFieldMapper.getParentIdFieldMapper(childType, false);
         if (parentIdFieldMapper != null) {
             parentFilter = parentIdFieldMapper.getParentFilter();
             childFilter = parentIdFieldMapper.getChildFilter(childType);
             MappedFieldType fieldType = parentIdFieldMapper.fieldType();
-            final SortedSetDVOrdinalsIndexFieldData fieldData = queryShardContext.getForField(fieldType);
-            config.fieldContext(new FieldContext(fieldType.name(), fieldData, fieldType));
+            config = ValuesSourceConfig.resolveFieldOnly(fieldType, queryShardContext);
         } else {
-            config.unmapped(true);
+            // Unmapped field case
+            config = ValuesSourceConfig.resolveUnmapped(defaultValueSourceType(), queryShardContext);
         }
+        return config;
     }
 
     @Override
diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ParentAggregationBuilder.java b/modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ParentAggregationBuilder.java
@@ -25,7 +25,6 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.fielddata.plain.SortedSetDVOrdinalsIndexFieldData;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.query.QueryShardContext;
 import org.elasticsearch.join.mapper.ParentIdFieldMapper;
@@ -34,7 +33,6 @@
 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.FieldContext;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
@@ -109,23 +107,19 @@ protected ValuesSourceAggregatorFactory innerBuild(QueryShardContext queryShardC
 
     @Override
     protected ValuesSourceConfig resolveConfig(QueryShardContext queryShardContext) {
-        ValuesSourceConfig config = new ValuesSourceConfig(CoreValuesSourceType.BYTES);
-        joinFieldResolveConfig(queryShardContext, config);
-        return config;
-    }
-
-    private void joinFieldResolveConfig(QueryShardContext queryShardContext, ValuesSourceConfig config) {
+        ValuesSourceConfig config;
         ParentJoinFieldMapper parentJoinFieldMapper = ParentJoinFieldMapper.getMapper(queryShardContext.getMapperService());
         ParentIdFieldMapper parentIdFieldMapper = parentJoinFieldMapper.getParentIdFieldMapper(childType, false);
         if (parentIdFieldMapper != null) {
             parentFilter = parentIdFieldMapper.getParentFilter();
             childFilter = parentIdFieldMapper.getChildFilter(childType);
             MappedFieldType fieldType = parentIdFieldMapper.fieldType();
-            final SortedSetDVOrdinalsIndexFieldData fieldData = queryShardContext.getForField(fieldType);
-            config.fieldContext(new FieldContext(fieldType.name(), fieldData, fieldType));
+            config = ValuesSourceConfig.resolveFieldOnly(fieldType, queryShardContext);
         } else {
-            config.unmapped(true);
+            // unmapped case
+            config = ValuesSourceConfig.resolveUnmapped(defaultValueSourceType(), queryShardContext);
         }
+        return config;
     }
 
     @Override
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java
@@ -26,6 +26,7 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.query.QueryShardContext;
 import org.elasticsearch.script.Script;
+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.ValuesSourceConfig;
@@ -277,7 +278,7 @@ protected abstract CompositeValuesSourceConfig innerBuild(QueryShardContext quer
 
     public final CompositeValuesSourceConfig build(QueryShardContext queryShardContext) throws IOException {
         ValuesSourceConfig config = ValuesSourceConfig.resolve(queryShardContext,
-            valueType, field, script, null, timeZone(), format, name());
+            valueType, field, script, null, timeZone(), format, CoreValuesSourceType.BYTES, name());
         return innerBuild(queryShardContext, config);
     }
 
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java
@@ -252,7 +252,7 @@ public DateHistogramValuesSourceBuilder offset(long offset) {
     @Override
     protected CompositeValuesSourceConfig innerBuild(QueryShardContext queryShardContext, ValuesSourceConfig config) throws IOException {
         Rounding rounding = dateHistogramInterval.createRounding(timeZone(), offset);
-        ValuesSource orig = config.toValuesSource(queryShardContext);
+        ValuesSource orig = config.toValuesSource();
         if (orig == null) {
             orig = ValuesSource.Numeric.EMPTY;
         }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/GeoTileGridValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/GeoTileGridValuesSourceBuilder.java
@@ -129,7 +129,7 @@ public boolean equals(Object obj) {
 
     @Override
     protected CompositeValuesSourceConfig innerBuild(QueryShardContext queryShardContext, ValuesSourceConfig config) throws IOException {
-        ValuesSource orig = config.toValuesSource(queryShardContext);
+        ValuesSource orig = config.toValuesSource();
         if (orig == null) {
             orig = ValuesSource.GeoPoint.EMPTY;
         }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java
@@ -111,7 +111,7 @@ public HistogramValuesSourceBuilder interval(double interval) {
 
     @Override
     protected CompositeValuesSourceConfig innerBuild(QueryShardContext queryShardContext, ValuesSourceConfig config) throws IOException {
-        ValuesSource orig = config.toValuesSource(queryShardContext);
+        ValuesSource orig = config.toValuesSource();
         if (orig == null) {
             orig = ValuesSource.Numeric.EMPTY;
         }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java
@@ -71,7 +71,7 @@ public String type() {
 
     @Override
     protected CompositeValuesSourceConfig innerBuild(QueryShardContext queryShardContext, ValuesSourceConfig config) throws IOException {
-        ValuesSource vs = config.toValuesSource(queryShardContext);
+        ValuesSource vs = config.toValuesSource();
         if (vs == null) {
             // The field is unmapped so we use a value source that can parse any type of values.
             // This is needed because the after values are parsed even when there are no values to process.
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSource.java
@@ -39,7 +39,7 @@ public NumericMultiValuesSource(Map<String, ValuesSourceConfig> valuesSourceConf
                                         QueryShardContext context) {
             values = new HashMap<>(valuesSourceConfigs.size());
             for (Map.Entry<String, ValuesSourceConfig> entry : valuesSourceConfigs.entrySet()) {
-                final ValuesSource valuesSource = entry.getValue().toValuesSource(context);
+                final ValuesSource valuesSource = entry.getValue().toValuesSource();
                 if (valuesSource instanceof ValuesSource.Numeric == false) {
                     throw new AggregationExecutionException("ValuesSource type " + valuesSource.toString() +
                         "is not supported for multi-valued aggregation");
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java
@@ -44,7 +44,7 @@ public ValuesSourceAggregatorFactory(String name, ValuesSourceConfig config, Que
     @Override
     public Aggregator createInternal(SearchContext searchContext, Aggregator parent, boolean collectsFromSingleBucket,
                                      List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException {
-        ValuesSource vs = config.toValuesSource(queryShardContext);
+        ValuesSource vs = config.toValuesSource();
         if (vs == null) {
             return createUnmapped(searchContext, parent, pipelineAggregators, metaData);
         }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java
diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java
diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregatorFactory.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregatorFactory.java
diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityAggregatorTests.java

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public Aggregator createInternal(SearchContext searchContext,`
`53`	`53`	`HashMap<String, ValuesSource> valuesSources = new HashMap<>();`
`54`	`54`
`55`	`55`	`for (Map.Entry<String, ValuesSourceConfig> config : configs.entrySet()) {`
`56`		`- ValuesSource vs = config.getValue().toValuesSource(queryShardContext);`
	`56`	`+ ValuesSource vs = config.getValue().toValuesSource();`
`57`	`57`	`if (vs != null) {`
`58`	`58`	`valuesSources.put(config.getKey(), vs);`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public DateHistogramValuesSourceBuilder offset(long offset) {`
`252`	`252`	`@Override`
`253`	`253`	`protected CompositeValuesSourceConfig innerBuild(QueryShardContext queryShardContext, ValuesSourceConfig config) throws IOException {`
`254`	`254`	`Rounding rounding = dateHistogramInterval.createRounding(timeZone(), offset);`
`255`		`- ValuesSource orig = config.toValuesSource(queryShardContext);`
	`255`	`+ ValuesSource orig = config.toValuesSource();`
`256`	`256`	`if (orig == null) {`
`257`	`257`	`orig = ValuesSource.Numeric.EMPTY;`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public boolean equals(Object obj) {`
`129`	`129`
`130`	`130`	`@Override`
`131`	`131`	`protected CompositeValuesSourceConfig innerBuild(QueryShardContext queryShardContext, ValuesSourceConfig config) throws IOException {`
`132`		`- ValuesSource orig = config.toValuesSource(queryShardContext);`
	`132`	`+ ValuesSource orig = config.toValuesSource();`
`133`	`133`	`if (orig == null) {`
`134`	`134`	`orig = ValuesSource.GeoPoint.EMPTY;`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public HistogramValuesSourceBuilder interval(double interval) {`
`111`	`111`
`112`	`112`	`@Override`
`113`	`113`	`protected CompositeValuesSourceConfig innerBuild(QueryShardContext queryShardContext, ValuesSourceConfig config) throws IOException {`
`114`		`- ValuesSource orig = config.toValuesSource(queryShardContext);`
	`114`	`+ ValuesSource orig = config.toValuesSource();`
`115`	`115`	`if (orig == null) {`
`116`	`116`	`orig = ValuesSource.Numeric.EMPTY;`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ValuesSourceAggregatorFactory(String name, ValuesSourceConfig config, Que`
`44`	`44`	`@Override`
`45`	`45`	`public Aggregator createInternal(SearchContext searchContext, Aggregator parent, boolean collectsFromSingleBucket,`
`46`	`46`	`List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException {`
`47`		`- ValuesSource vs = config.toValuesSource(queryShardContext);`
	`47`	`+ ValuesSource vs = config.toValuesSource();`
`48`	`48`	`if (vs == null) {`
`49`	`49`	`return createUnmapped(searchContext, parent, pipelineAggregators, metaData);`
`50`	`50`	`}`