Revert "Fix field mapping updates with similarity (#33634)"

This reverts commit 831ddf7.

Author: jimczi

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

@@ -112,6 +112,17 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName) {
     public boolean equals(Object o) {
         if (!super.equals(o)) return false;
         MappedFieldType fieldType = (MappedFieldType) o;
+        // check similarity first because we need to check the name, and it might be null
+        // TODO: SimilarityProvider should have equals?
+        if (similarity == null || fieldType.similarity == null) {
+            if (similarity != fieldType.similarity) {
+                return false;
+            }
+        } else {
+            if (Objects.equals(similarity.name(), fieldType.similarity.name()) == false) {
+                return false;
+            }
+        }
 
         return boost == fieldType.boost &&
             docValues == fieldType.docValues &&
@@ -121,8 +132,7 @@ public boolean equals(Object o) {
             Objects.equals(searchQuoteAnalyzer(), fieldType.searchQuoteAnalyzer()) &&
             Objects.equals(eagerGlobalOrdinals, fieldType.eagerGlobalOrdinals) &&
             Objects.equals(nullValue, fieldType.nullValue) &&
-            Objects.equals(nullValueAsString, fieldType.nullValueAsString) &&
-            Objects.equals(similarity, fieldType.similarity);
+            Objects.equals(nullValueAsString, fieldType.nullValueAsString);
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java

@@ -21,8 +21,6 @@
 
 import org.apache.lucene.search.similarities.Similarity;
 
-import java.util.Objects;
-
 /**
  * Wrapper around a {@link Similarity} and its name.
  */
@@ -50,28 +48,4 @@ public Similarity get() {
         return similarity;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        SimilarityProvider that = (SimilarityProvider) o;
-        /**
-         * We check <code>name</code> only because the <code>similarity</code> is
-         * re-created for each new instance and they don't implement equals.
-         * This is not entirely correct though but we only use equality checks
-         * for similarities inside the same index and names are unique in this case.
-         **/
-        return Objects.equals(name, that.name);
-    }
-
-    @Override
-    public int hashCode() {
-        /**
-         * We use <code>name</code> only because the <code>similarity</code> is
-         * re-created for each new instance and they don't implement equals.
-         * This is not entirely correct though but we only use equality checks
-         * for similarities a single index and names are unique in this case.
-         **/
-        return Objects.hash(name);
-    }
 }

test/framework/src/main/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java

@@ -89,17 +89,6 @@ public void normalizeOther(MappedFieldType other) {
                 other.setIndexAnalyzer(new NamedAnalyzer("foo", AnalyzerScope.INDEX, new StandardAnalyzer()));
             }
         },
-        // check that we can update if the analyzer is unchanged
-        new Modifier("analyzer", true) {
-            @Override
-            public void modify(MappedFieldType ft) {
-                ft.setIndexAnalyzer(new NamedAnalyzer("foo", AnalyzerScope.INDEX, new StandardAnalyzer()));
-            }
-            @Override
-            public void normalizeOther(MappedFieldType other) {
-                other.setIndexAnalyzer(new NamedAnalyzer("foo", AnalyzerScope.INDEX, new StandardAnalyzer()));
-            }
-        },
         new Modifier("search_analyzer", true) {
             @Override
             public void modify(MappedFieldType ft) {
@@ -148,17 +137,6 @@ public void normalizeOther(MappedFieldType other) {
                 other.setSimilarity(new SimilarityProvider("bar", new BM25Similarity()));
             }
         },
-        // check that we can update if the similarity is unchanged
-        new Modifier("similarity", true) {
-            @Override
-            public void modify(MappedFieldType ft) {
-                ft.setSimilarity(new SimilarityProvider("foo", new BM25Similarity()));
-            }
-            @Override
-            public void normalizeOther(MappedFieldType other) {
-                other.setSimilarity(new SimilarityProvider("foo", new BM25Similarity()));
-            }
-        },
         new Modifier("eager_global_ordinals", true) {
             @Override
             public void modify(MappedFieldType ft) {