cleanups/optimizations

Author: markjhoy

server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java

@@ -130,23 +130,9 @@ public IndexOptions getIndexOptions() {
         return this.indexOptions;
     }
 
-    private static SparseVectorFieldMapper.IndexOptions getDefaultIndexOptions(MappingParserContext context) {
-        if (context.indexVersionCreated().before(SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_VERSION)) {
-            // don't set defaults if this index was created before
-            // we added this functionality in, so it will
-            // not change current index behaviour
-            return new IndexOptions(false, null);
-        }
-
-        // index options are not set - for new indices,
-        // if this is null, in the query will use the
-        // proper defaults
-        return null;
-    }
-
     private static SparseVectorFieldMapper.IndexOptions parseIndexOptions(MappingParserContext context, Object propNode) {
         if (propNode == null) {
-            return getDefaultIndexOptions(context);
+            return null;
         }
 
         Map<String, Object> indexOptionsMap = XContentMapValues.nodeMapValue(propNode, SPARSE_VECTOR_INDEX_OPTIONS);
@@ -155,7 +141,7 @@ private static SparseVectorFieldMapper.IndexOptions parseIndexOptions(MappingPar
         TokenPruningConfig pruningConfig = IndexOptions.parseIndexOptionsPruningConfig(prune, indexOptionsMap);
 
         if (prune == null && pruningConfig == null) {
-            return getDefaultIndexOptions(context);
+            return null;
         }
 
         return new SparseVectorFieldMapper.IndexOptions(prune, pruningConfig);
@@ -175,8 +161,7 @@ public static final class SparseVectorFieldType extends MappedFieldType {
         private final IndexOptions indexOptions;
 
         public SparseVectorFieldType(String name, boolean isStored, Map<String, String> meta) {
-            super(name, true, isStored, false, TextSearchInfo.SIMPLE_MATCH_ONLY, meta);
-            this.indexOptions = null;
+            this(name, isStored, meta, null);
         }
 
         public SparseVectorFieldType(
@@ -482,17 +467,15 @@ public final int hashCode() {
 
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-            if (prune == null && pruningConfig == null) {
-                return builder;
-            }
-
             builder.startObject();
+
             if (prune != null) {
                 builder.field(PRUNE_FIELD_NAME, prune);
             }
             if (pruningConfig != null) {
                 builder.field(PRUNING_CONFIG_FIELD_NAME, pruningConfig);
             }
+
             builder.endObject();
             return builder;
         }
@@ -516,18 +499,10 @@ public static TokenPruningConfig parseIndexOptionsPruningConfig(Boolean prune, M
                 return null;
             }
 
-            if (prune == null) {
+            if (prune == null || prune == false) {
                 throw new MapperParsingException("[index_options] field [pruning_config] should only be set if [prune] is set to true");
             }
 
-            if ((pruningConfiguration instanceof Map) == false) {
-                throw new MapperParsingException("[index_options] field [pruning_config] should be a map");
-            }
-
-            if (prune == false) {
-                throw new MapperParsingException("[index_options] field [pruning_config] should not be set if [prune] is false");
-            }
-
             Map<String, Object> pruningConfigurationMap = XContentMapValues.nodeMapValue(pruningConfiguration, PRUNING_CONFIG_FIELD_NAME);
 
             return TokenPruningConfig.parseFromMap(pruningConfigurationMap);

server/src/test/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapperTests.java

@@ -301,7 +301,7 @@ public void testPruningConfigurationIsMap() {
             b.field("pruning_config", "this_is_not_a_map");
             b.endObject();
         })));
-        assertThat(e.getMessage(), containsString("index_options] field [pruning_config] should be a map"));
+        assertThat(e.getMessage(), containsString("pruning_config should be a map but was of type:"));
     }
 
     public void testWithIndexOptionsPruningConfigPruneRequired() throws Exception {
@@ -318,7 +318,7 @@ public void testWithIndexOptionsPruningConfigPruneRequired() throws Exception {
         })));
         assertThat(
             eTestPruneIsFalse.getMessage(),
-            containsString("Failed to parse mapping: [index_options] field [pruning_config] should not be set if [prune] is false")
+            containsString("[index_options] field [pruning_config] should only be set if [prune] is set to true")
         );
 
         Exception eTestPruneIsMissing = expectThrows(MapperParsingException.class, () -> createMapperService(fieldMapping(b -> {

x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/50_sparse_vector.yml

@@ -321,7 +321,7 @@ teardown:
       features: headers
 
   - do:
-      catch: /\[index_options\] field \[pruning_config\] should not be set if \[prune\] is false/
+      catch: /\[index_options\] field \[pruning_config\] should only be set if \[prune\] is set to true/
       headers:
         Authorization: "Basic dGVzdF91c2VyOngtcGFjay10ZXN0LXBhc3N3b3Jk" #test_user credentials
         Content-Type: application/json

x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/50_sparse_vector.yml

@@ -320,7 +320,7 @@ teardown:
       features: headers
 
   - do:
-      catch: /\[index_options\] field \[pruning_config\] should not be set if \[prune\] is false/
+      catch: /\[index_options\] field \[pruning_config\] should only be set if \[prune\] is set to true/
       headers:
         Authorization: "Basic dGVzdF91c2VyOngtcGFjay10ZXN0LXBhc3N3b3Jk" #test_user credentials
         Content-Type: application/json

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/sparse_vector_search.yml

@@ -651,7 +651,7 @@ teardown:
       features: headers
 
   - do:
-      catch: /\[index_options\] field \[pruning_config\] should not be set if \[prune\] is false/
+      catch: /\[index_options\] field \[pruning_config\] should only be set if \[prune\] is set to true/
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser
         Content-Type: application/json