Fix clickbench queries with wildcard queries to work work with binary doc values.

Author: martijnvg

server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java

@@ -53,12 +53,16 @@
 import org.elasticsearch.index.fielddata.FieldData;
 import org.elasticsearch.index.fielddata.FieldDataContext;
 import org.elasticsearch.index.fielddata.IndexFieldData;
+import org.elasticsearch.index.fielddata.IndexFieldDataCache;
 import org.elasticsearch.index.fielddata.SourceValueFetcherSortedBinaryIndexFieldData;
 import org.elasticsearch.index.fielddata.StoredFieldSortedBinaryIndexFieldData;
+import org.elasticsearch.index.fielddata.plain.BinaryIndexFieldData;
 import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData;
 import org.elasticsearch.index.query.AutomatonQueryWithDescription;
 import org.elasticsearch.index.query.SearchExecutionContext;
 import org.elasticsearch.index.similarity.SimilarityProvider;
+import org.elasticsearch.indices.breaker.CircuitBreakerService;
+import org.elasticsearch.script.BinaryDocValuesStringFieldScript;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptCompiler;
 import org.elasticsearch.script.SortedSetDocValuesStringFieldScript;
@@ -956,7 +960,10 @@ protected BytesRef storedToBytesRef(Object stored) {
             );
         }
 
-        private SortedSetOrdinalsIndexFieldData.Builder fieldDataFromDocValues() {
+        private IndexFieldData.Builder fieldDataFromDocValues() {
+            if (useBinaryDocValues) {
+                return new BinaryIndexFieldData.Builder(name(), CoreValuesSourceType.KEYWORD);
+            }
             return new SortedSetOrdinalsIndexFieldData.Builder(
                 name(),
                 CoreValuesSourceType.KEYWORD,
@@ -1041,7 +1048,9 @@ public Query wildcardQuery(
                 }
                 return new StringScriptFieldWildcardQuery(
                     new Script(""),
-                    ctx -> new SortedSetDocValuesStringFieldScript(name(), context.lookup(), ctx),
+                    ctx -> useBinaryDocValues
+                        ? new BinaryDocValuesStringFieldScript(name(), context.lookup(), ctx)
+                        : new SortedSetDocValuesStringFieldScript(name(), context.lookup(), ctx),
                     name(),
                     value,
                     caseInsensitive

server/src/main/java/org/elasticsearch/script/BinaryDocValuesStringFieldScript.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.script;
+
+import org.apache.lucene.index.BinaryDocValues;
+import org.apache.lucene.index.DocValues;
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.index.mapper.OnScriptError;
+import org.elasticsearch.search.lookup.SearchLookup;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class BinaryDocValuesStringFieldScript extends StringFieldScript {
+    private final BinaryDocValues binaryDocValues;
+
+    boolean hasValue = false;
+
+    public BinaryDocValuesStringFieldScript(String fieldName, SearchLookup searchLookup, LeafReaderContext ctx) {
+        super(fieldName, Map.of(), searchLookup, OnScriptError.FAIL, ctx);
+        try {
+            binaryDocValues = DocValues.getBinary(ctx.reader(), fieldName);
+        } catch (IOException e) {
+            throw new IllegalStateException("Cannot load doc values", e);
+        }
+    }
+
+    @Override
+    public void setDocument(int docID) {
+        try {
+            hasValue = binaryDocValues.advanceExact(docID);
+        } catch (IOException e) {
+            throw new IllegalStateException("Cannot load doc values", e);
+        }
+    }
+
+    @Override
+    public void execute() {
+        try {
+            if (hasValue) {
+                BytesRef bytesRef = binaryDocValues.binaryValue();
+                emit(bytesRef.utf8ToString());
+            }
+        } catch (IOException e) {
+            throw new IllegalStateException("Cannot load doc values", e);
+        }
+    }
+}