Use dummy TermStatistics when term is not found Closes #10660

Author: s1monw

src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java

@@ -104,9 +104,14 @@ void setFields(Fields termVectorsByField, Set<String> selectedFields, EnumSet<Fl
                 if (flags.contains(Flag.TermStatistics)) {
                     // get the doc frequency
                     if (dfs != null) {
-                        writeTermStatistics(dfs.termStatistics().get(term));
+                        final TermStatistics statistics = dfs.termStatistics().get(term);
+                        writeTermStatistics(statistics == null ? new TermStatistics(termBytesRef, 0, 0) : statistics);
                     } else {
-                        writeTermStatistics(topLevelIterator);
+                        if (foundTerm) {
+                            writeTermStatistics(topLevelIterator);
+                        } else {
+                            writeTermStatistics(new TermStatistics(termBytesRef, 0, 0));
+                        }
                     }
                 }
                 if (useDocsAndPos) {

src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java

@@ -875,7 +875,7 @@ public void testArtificialNoDoc() throws IOException {
         checkBrownFoxTermVector(resp.getFields(), "field1", false);
     }
 
-    @Test @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/10660")
+    @Test
     public void testArtificialNonExistingField() throws Exception {
         // setup indices
         ImmutableSettings.Builder settings = settingsBuilder()