Merge branch 'main' into tasks/rcs-rm-isCrossClusterSearchEnabled

Author: JeremyDahlgren

build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/settings.gradle

@@ -13,6 +13,7 @@ include ":distribution:bwc:bugfix"
 include ":distribution:bwc:bugfix2"
 include ":distribution:bwc:bugfix3"
 include ":distribution:bwc:bugfix4"
+include ":distribution:bwc:bugfix5"
 include ":distribution:bwc:minor"
 include ":distribution:bwc:major"
 include ":distribution:bwc:staged"

build.gradle

@@ -329,6 +329,7 @@ allprojects {
       dependsOn ":distribution:bwc:bugfix2:buildBwcLinuxTar"
       dependsOn ":distribution:bwc:bugfix3:buildBwcLinuxTar"
       dependsOn ":distribution:bwc:bugfix4:buildBwcLinuxTar"
+      dependsOn ":distribution:bwc:bugfix5:buildBwcLinuxTar"
       dependsOn ":distribution:bwc:minor:buildBwcLinuxTar"
       dependsOn ":distribution:bwc:staged:buildBwcLinuxTar"
       dependsOn ":distribution:bwc:staged2:buildBwcLinuxTar"

distribution/bwc/bugfix5/build.gradle

@@ -530,6 +530,21 @@ tests:
 - class: org.elasticsearch.xpack.test.rest.XPackRestIT
   method: test {p0=transform/transforms_crud/Test transform where source query is invalid}
   issue: https://github.com/elastic/elasticsearch/issues/132111
+- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
+  method: testDenseVectorMappingUpdate {initialType=bbq_flat updateType=bbq_hnsw}
+  issue: https://github.com/elastic/elasticsearch/issues/132112
+- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
+  method: testDenseVectorMappingUpdate {initialType=hnsw updateType=int4_hnsw}
+  issue: https://github.com/elastic/elasticsearch/issues/132113
+- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
+  method: testDenseVectorMappingUpdate {initialType=hnsw updateType=bbq_hnsw}
+  issue: https://github.com/elastic/elasticsearch/issues/132115
+- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
+  method: testDenseVectorMappingUpdate {initialType=int8_flat updateType=int8_hnsw}
+  issue: https://github.com/elastic/elasticsearch/issues/132116
+- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
+  method: testDenseVectorMappingUpdate {initialType=int4_flat updateType=int8_hnsw}
+  issue: https://github.com/elastic/elasticsearch/issues/132117
 
 # Examples:
 #

muted-tests.yml

@@ -80,6 +80,7 @@ List projects = [
   'distribution:bwc:bugfix2',
   'distribution:bwc:bugfix3',
   'distribution:bwc:bugfix4',
+  'distribution:bwc:bugfix5',
   'distribution:bwc:maintenance',
   'distribution:bwc:minor',
   'distribution:bwc:staged',

settings.gradle

@@ -33,8 +33,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.elasticsearch.index.IndexSettings.USE_DOC_VALUES_SKIPPER;
-
 /**
  * A {@link FieldMapper} that assigns every document the same value.
  */
@@ -62,25 +60,12 @@ public static class Builder extends FieldMapper.Builder {
         private final IndexSettings indexSettings;
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
         private final TextParams.Analyzers analyzers;
-        private final boolean enableDocValuesSkipper;
 
         public Builder(String name, MappingParserContext context) {
-            this(
-                name,
-                context.indexVersionCreated(),
-                context.getIndexSettings(),
-                context.getIndexAnalyzers(),
-                USE_DOC_VALUES_SKIPPER.get(context.getSettings())
-            );
+            this(name, context.indexVersionCreated(), context.getIndexSettings(), context.getIndexAnalyzers());
         }
 
-        public Builder(
-            String name,
-            IndexVersion indexCreatedVersion,
-            IndexSettings indexSettings,
-            IndexAnalyzers indexAnalyzers,
-            boolean enableDocValuesSkipper
-        ) {
+        public Builder(String name, IndexVersion indexCreatedVersion, IndexSettings indexSettings, IndexAnalyzers indexAnalyzers) {
             super(name);
             this.indexCreatedVersion = indexCreatedVersion;
             this.indexSettings = indexSettings;
@@ -90,7 +75,6 @@ public Builder(
                 m -> ((PatternedTextFieldMapper) m).positionIncrementGap,
                 indexCreatedVersion
             );
-            this.enableDocValuesSkipper = enableDocValuesSkipper;
         }
 
         @Override
@@ -120,8 +104,8 @@ public PatternedTextFieldMapper build(MapperBuilderContext context) {
                 patternedTextFieldType.templateIdFieldName(),
                 indexSettings.getMode(),
                 indexCreatedVersion,
-                enableDocValuesSkipper
-            ).build(context);
+                true
+            ).indexed(false).build(context);
             return new PatternedTextFieldMapper(leafName(), patternedTextFieldType, builderParams, this, templateIdMapper);
         }
     }
@@ -132,7 +116,6 @@ public PatternedTextFieldMapper build(MapperBuilderContext context) {
     private final IndexAnalyzers indexAnalyzers;
     private final IndexSettings indexSettings;
     private final NamedAnalyzer indexAnalyzer;
-    private final boolean enableDocValuesSkipper;
     private final int positionIncrementGap;
     private final FieldType fieldType;
     private final KeywordFieldMapper templateIdMapper;
@@ -152,7 +135,6 @@ private PatternedTextFieldMapper(
         this.indexAnalyzers = builder.analyzers.indexAnalyzers;
         this.indexAnalyzer = builder.analyzers.getIndexAnalyzer();
         this.indexSettings = builder.indexSettings;
-        this.enableDocValuesSkipper = builder.enableDocValuesSkipper;
         this.positionIncrementGap = builder.analyzers.positionIncrementGap.getValue();
         this.templateIdMapper = templateIdMapper;
     }
@@ -164,7 +146,7 @@ public Map<String, NamedAnalyzer> indexAnalyzers() {
 
     @Override
     public FieldMapper.Builder getMergeBuilder() {
-        return new Builder(leafName(), indexCreatedVersion, indexSettings, indexAnalyzers, enableDocValuesSkipper).init(this);
+        return new Builder(leafName(), indexCreatedVersion, indexSettings, indexAnalyzers).init(this);
     }
 
     @Override

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

@@ -24,7 +24,6 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.Tuple;
-import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.mapper.DateFieldMapper;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.KeywordFieldMapper;
@@ -131,10 +130,7 @@ protected void minimalStoreMapping(XContentBuilder b) throws IOException {
     }
 
     public void testDefaults() throws IOException {
-        boolean enabledDocValuesSkipper = randomBoolean();
-        var indexSettings = getIndexSettingsBuilder().put(IndexSettings.USE_DOC_VALUES_SKIPPER.getKey(), enabledDocValuesSkipper).build();
-
-        DocumentMapper mapper = createMapperService(indexSettings, fieldMapping(this::minimalMapping)).documentMapper();
+        DocumentMapper mapper = createMapperService(fieldMapping(this::minimalMapping)).documentMapper();
         assertEquals(Strings.toString(fieldMapping(this::minimalMapping)), mapper.mappingSource().toString());
 
         ParsedDocument doc = mapper.parse(source(b -> b.field("field", "1234")));
@@ -162,7 +158,7 @@ public void testDefaults() throws IOException {
             assertThat(fieldType.omitNorms(), equalTo(true));
             assertFalse(fieldType.tokenized());
             assertFalse(fieldType.stored());
-            assertThat(fieldType.indexOptions(), equalTo(enabledDocValuesSkipper ? IndexOptions.NONE : IndexOptions.DOCS));
+            assertThat(fieldType.indexOptions(), equalTo(IndexOptions.NONE));
             assertThat(fieldType.storeTermVectors(), equalTo(false));
             assertThat(fieldType.storeTermVectorOffsets(), equalTo(false));
             assertThat(fieldType.storeTermVectorPositions(), equalTo(false));