Handle bwc

nik9000 · nik9000 · commit 8855e23366cc · 2020-09-15T16:57:59.000-04:00
diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchDocValuesPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchDocValuesPhase.java
@@ -80,7 +80,8 @@ public FetchSubPhaseProcessor getProcessor(SearchContext context, SearchLookup l
             if (ft == null) {
                 continue;
             }
-            ValueFetcher fetcher = new DocValueFetcher(ft.docValueFormat(fieldAndFormat.format, null), lookup.doc().getForField(ft));
+            String format = USE_DEFAULT_FORMAT.equals(fieldAndFormat.format) ? null : fieldAndFormat.format;
+            ValueFetcher fetcher = new DocValueFetcher(ft.docValueFormat(format, null), lookup.doc().getForField(ft));
             fields.add(new DocValueField(fieldAndFormat.field, fetcher));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ public FetchSubPhaseProcessor getProcessor(SearchContext context, SearchLookup l`
`80`	`80`	`if (ft == null) {`
`81`	`81`	`continue;`
`82`	`82`	`}`
`83`		`- ValueFetcher fetcher = new DocValueFetcher(ft.docValueFormat(fieldAndFormat.format, null), lookup.doc().getForField(ft));`
	`83`	`+ String format = USE_DEFAULT_FORMAT.equals(fieldAndFormat.format) ? null : fieldAndFormat.format;`
	`84`	`+ ValueFetcher fetcher = new DocValueFetcher(ft.docValueFormat(format, null), lookup.doc().getForField(ft));`
`84`	`85`	`fields.add(new DocValueField(fieldAndFormat.field, fetcher));`
`85`	`86`	`}`
`86`	`87`