index original value

Author: parkertimmins

x-pack/plugin/mapper-patterned-text/src/main/java/org/elasticsearch/xpack/patternedtext/PatternedTextDocValues.java

@@ -62,7 +62,7 @@ String lookupOrdAsString(long l) throws IOException {
             var mergedArgs = argsDocValues.lookupOrd(argsDocValues.nextOrd());
             PatternedTextValueProcessor.addRemainingArgs(args, mergedArgs.utf8ToString());
         }
-        return PatternedTextValueProcessor.merge(new PatternedTextValueProcessor.Parts(template, args, null));
+        return PatternedTextValueProcessor.merge(new PatternedTextValueProcessor.Parts(template, args));
     }
 
     @Override

x-pack/plugin/mapper-patterned-text/src/main/java/org/elasticsearch/xpack/patternedtext/PatternedTextFieldMapper.java

@@ -132,8 +132,8 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
         // Parse template and args.
         PatternedTextValueProcessor.Parts parts = PatternedTextValueProcessor.split(value);
 
-        // Add template and args index.
-        context.doc().add(new Field(fieldType().name(), parts.indexed(), fieldType));
+        // Add index on original value
+        context.doc().add(new Field(fieldType().name(), value, fieldType));
 
         // Add template doc_values
         context.doc().add(new SortedSetDocValuesField(fieldType().templateFieldName(), new BytesRef(parts.template())));

x-pack/plugin/mapper-patterned-text/src/main/java/org/elasticsearch/xpack/patternedtext/PatternedTextValueProcessor.java

@@ -16,17 +16,15 @@ public class PatternedTextValueProcessor {
     private static final String DELIMITER = "[\\s\\[\\]]";
     private static final String SPACE = " ";
 
-    record Parts(String template, List<String> args, String indexed) {
+    record Parts(String template, List<String> args) {
     }
 
     static Parts split(String text) {
         StringBuilder template = new StringBuilder();
-        StringBuilder indexed = new StringBuilder();
         List<String> args = new ArrayList<>();
         String[] tokens = text.split(DELIMITER);
         int textIndex = 0;
-        for (int i = 0; i < tokens.length; i++) {
-            String token = tokens[i];
+        for (String token : tokens) {
             if (token.isEmpty()) {
                 if (textIndex < text.length() - 1) {
                     template.append(text.charAt(textIndex++));
@@ -36,10 +34,8 @@ static Parts split(String text) {
             if (isArg(token)) {
                 args.add(token);
                 template.append(TEXT_ARG_PLACEHOLDER);
-                indexed.append(token).append(SPACE);
             } else {
                 template.append(token);
-                indexed.append(token).append(SPACE);
             }
             textIndex += token.length();
             if (textIndex < text.length()) {
@@ -49,7 +45,7 @@ static Parts split(String text) {
         while (textIndex < text.length()) {
             template.append(text.charAt(textIndex++));
         }
-        return new Parts(template.toString(), args, indexed.toString().trim());
+        return new Parts(template.toString(), args);
     }
 
     private static boolean isArg(String text) {