Cleaned up

Author: Kubik42

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java

@@ -100,7 +100,7 @@ public static class Defaults {
 
     }
 
-    public static class Builder extends BuilderWithSyntheticSourceSupport {
+    public static class Builder extends BuilderWithSyntheticSourceContext {
 
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
 

muted-tests.yml

@@ -555,6 +555,18 @@ tests:
 - class: org.elasticsearch.discovery.DiscoveryDisruptionIT
   method: testElectMasterWithLatestVersion
   issue: https://github.com/elastic/elasticsearch/issues/134748
+- class: org.elasticsearch.xpack.logsdb.patternedtext.PatternedTextIntegrationTests
+  method: testLargeValueIsStored
+  issue: https://github.com/elastic/elasticsearch/issues/134760
+- class: org.elasticsearch.xpack.logsdb.patternedtext.PatternedTextIntegrationTests
+  method: testSourceMatchAllManyValues
+  issue: https://github.com/elastic/elasticsearch/issues/134761
+- class: org.elasticsearch.xpack.logsdb.patternedtext.PatternedTextIntegrationTests
+  method: testQueryResultsSameAsMatchOnlyText
+  issue: https://github.com/elastic/elasticsearch/issues/134762
+- class: org.elasticsearch.xpack.logsdb.patternedtext.PatternedTextIntegrationTests
+  method: testSmallValueNotStored
+  issue: https://github.com/elastic/elasticsearch/issues/134763
 
 # Examples:
 #

plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java

@@ -81,7 +81,7 @@ private static NamedAnalyzer wrapAnalyzer(NamedAnalyzer in) {
         );
     }
 
-    public static class Builder extends BuilderWithSyntheticSourceSupport {
+    public static class Builder extends BuilderWithSyntheticSourceContext {
 
         final Parameter<SimilarityProvider> similarity = TextParams.similarity(m -> builder(m).similarity.getValue());
         final Parameter<String> indexOptions = TextParams.textIndexOptions(m -> builder(m).indexOptions.getValue());
@@ -107,14 +107,12 @@ public Builder(
                 m -> builder(m).analyzers.positionIncrementGap.getValue(),
                 indexCreatedVersion
             );
-            this.store = Parameter.storeParam(m -> builder(m).store.getValue(), this::storeDefault);
-        }
-
-        private boolean storeDefault() {
-            if (TextFieldMapper.keywordMultiFieldsNotStoredWhenIgnoredIndexVersionCheck(indexCreatedVersion())) {
-                return false;
-            }
-            return isSyntheticSourceEnabled() && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
+            this.store = Parameter.storeParam(m -> builder(m).store.getValue(), () -> {
+                if (TextFieldMapper.keywordMultiFieldsNotStoredWhenIgnoredIndexVersionCheck(indexCreatedVersion())) {
+                    return false;
+                }
+                return isSyntheticSourceEnabled() && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
+            });
         }
 
         @Override

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

@@ -1663,13 +1663,13 @@ protected boolean inheritDimensionParameterFromParentObject(MapperBuilderContext
     /**
      * Creates mappers for fields that require additional context for supporting synthetic source.
      */
-    public abstract static class BuilderWithSyntheticSourceSupport extends Builder {
+    public abstract static class BuilderWithSyntheticSourceContext extends Builder {
 
         private final IndexVersion indexCreatedVersion;
         private final boolean isSyntheticSourceEnabled;
         private final boolean isWithinMultiField;
 
-        protected BuilderWithSyntheticSourceSupport(
+        protected BuilderWithSyntheticSourceContext(
             String name,
             IndexVersion indexCreatedVersion,
             boolean isSyntheticSourceEnabled,

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

@@ -11,6 +11,9 @@
 
 import java.util.Map;
 
+/**
+ * This is a quality of life class that adds synthetic source context for text fields that need it.
+ */
 public abstract class TextFamilyFieldType extends StringFieldType {
 
     private final boolean isSyntheticSourceEnabled;

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

@@ -237,7 +237,7 @@ private static FielddataFrequencyFilter parseFrequencyFilter(String name, Mappin
         return new FielddataFrequencyFilter(minFrequency, maxFrequency, minSegmentSize);
     }
 
-    public static class Builder extends BuilderWithSyntheticSourceSupport {
+    public static class Builder extends BuilderWithSyntheticSourceContext {
 
         private final Parameter<Boolean> store;
         private final Parameter<Boolean> norms;

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/MatchOnlyTextRollingUpgradeIT.java

@@ -1,8 +1,10 @@
 /*
  * 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; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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.upgrades;

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patternedtext/PatternedTextFieldMapper.java

@@ -73,7 +73,7 @@ public static class Defaults {
         }
     }
 
-    public static class Builder extends BuilderWithSyntheticSourceSupport {
+    public static class Builder extends BuilderWithSyntheticSourceContext {
 
         private final IndexSettings indexSettings;
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();