Address @colings86's comments.

elastic · May 12, 2015 · 8698a26 · 8698a26
1 parent f6fa955
commit 8698a26
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/AggregationContext.java b/src/main/java/org/elasticsearch/search/aggregations/support/AggregationContext.java
@@ -83,7 +83,7 @@ public <VS extends ValuesSource> VS valuesSource(ValuesSourceConfig<VS> config,
                 throw new SearchParseException(searchContext, "Can't deal with unmapped ValuesSource type " + config.valueSourceType, null);
             }
         } else {
-            vs = valuesSourceWithMissingValues(config);
+            vs = originalValuesSource(config);
         }
 
         if (config.missing == null) {
@@ -128,7 +128,10 @@ public <VS extends ValuesSource> VS valuesSource(ValuesSourceConfig<VS> config,
         }
     }
 
-    private <VS extends ValuesSource> VS valuesSourceWithMissingValues(ValuesSourceConfig<VS> config) throws IOException {
+    /**
+     * Return the original values source, before we apply `missing`.
+     */
+    private <VS extends ValuesSource> VS originalValuesSource(ValuesSourceConfig<VS> config) throws IOException {
         if (config.fieldContext == null) {
             if (ValuesSource.Numeric.class.isAssignableFrom(config.valueSourceType)) {
                 return (VS) numericScript(config);