Revert "Add fieldType to AbstractQueryBuilder and SortBuilder (opensearch-project#15328)"

This reverts commit 839ba0b.

Signed-off-by: Ankit Jain <[email protected]>

Author: jainankitk

CHANGELOG.md

@@ -38,7 +38,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [Workload Management] Add rejection logic for co-ordinator and shard level requests ([#15428](https://github.com/opensearch-project/OpenSearch/pull/15428)))
 - Adding translog durability validation in index templates ([#15494](https://github.com/opensearch-project/OpenSearch/pull/15494))
 - Add index creation using the context field ([#15290](https://github.com/opensearch-project/OpenSearch/pull/15290))
-- Add fieldType to AbstractQueryBuilder and FieldSortBuilder ([#15328](https://github.com/opensearch-project/OpenSearch/pull/15328)))
 - [Reader Writer Separation] Add searchOnly replica routing configuration ([#15410](https://github.com/opensearch-project/OpenSearch/pull/15410))
 - [Range Queries] Add new approximateable query framework to short-circuit range queries ([#13788](https://github.com/opensearch-project/OpenSearch/pull/13788))
 - [Workload Management] Add query group level failure tracking ([#15227](https://github.com/opensearch-project/OpenSearch/pull/15527))

modules/mapper-extras/src/main/java/org/opensearch/index/query/RankFeatureQueryBuilder.java

@@ -400,11 +400,6 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         builder.endObject();
     }
 
-    @Override
-    public final String fieldName() {
-        return getDefaultFieldName();
-    }
-
     @Override
     protected Query doToQuery(QueryShardContext context) throws IOException {
         final MappedFieldType ft = context.fieldMapper(field);

modules/parent-join/src/main/java/org/opensearch/join/query/HasChildQueryBuilder.java

@@ -264,11 +264,6 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         builder.endObject();
     }
 
-    @Override
-    public final String fieldName() {
-        return getDefaultFieldName();
-    }
-
     public static HasChildQueryBuilder fromXContent(XContentParser parser) throws IOException {
         float boost = AbstractQueryBuilder.DEFAULT_BOOST;
         String childType = null;

modules/parent-join/src/main/java/org/opensearch/join/query/HasParentQueryBuilder.java

@@ -233,11 +233,6 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         builder.endObject();
     }
 
-    @Override
-    public final String fieldName() {
-        return getDefaultFieldName();
-    }
-
     public static HasParentQueryBuilder fromXContent(XContentParser parser) throws IOException {
         float boost = AbstractQueryBuilder.DEFAULT_BOOST;
         String parentType = null;

modules/parent-join/src/main/java/org/opensearch/join/query/ParentIdQueryBuilder.java

@@ -130,11 +130,6 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         builder.endObject();
     }
 
-    @Override
-    public final String fieldName() {
-        return getDefaultFieldName();
-    }
-
     public static ParentIdQueryBuilder fromXContent(XContentParser parser) throws IOException {
         float boost = AbstractQueryBuilder.DEFAULT_BOOST;
         String type = null;

modules/percolator/src/main/java/org/opensearch/percolator/PercolateQueryBuilder.java

@@ -356,11 +356,6 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         builder.endObject();
     }
 
-    @Override
-    public final String fieldName() {
-        return getDefaultFieldName();
-    }
-
     private static final ConstructingObjectParser<PercolateQueryBuilder, Void> PARSER = new ConstructingObjectParser<>(NAME, args -> {
         String field = (String) args[0];
         BytesReference document = (BytesReference) args[1];

server/src/main/java/org/opensearch/index/mapper/FieldTypeLookup.java

@@ -101,8 +101,7 @@ class FieldTypeLookup implements Iterable<MappedFieldType> {
     }
 
     /**
-     * Returns the {@link MappedFieldType} for the given field name
-     * or null if the field name is not found.
+     * Returns the mapped field type for the given field name.
      */
     public MappedFieldType get(String field) {
         String concreteField = aliasToConcreteName.getOrDefault(field, field);

server/src/main/java/org/opensearch/index/mapper/MapperService.java

@@ -632,8 +632,7 @@ public DocumentMapperForType documentMapperWithAutoCreate() {
     }
 
     /**
-     * Given the full name of a field, returns its {@link MappedFieldType}
-     * or null if the field is not found.
+     * Given the full name of a field, returns its {@link MappedFieldType}.
      */
     public MappedFieldType fieldType(String fullName) {
         return this.mapper == null ? null : this.mapper.fieldTypes().get(fullName);

server/src/main/java/org/opensearch/index/query/AbstractQueryBuilder.java

@@ -74,7 +74,6 @@ public abstract class AbstractQueryBuilder<QB extends AbstractQueryBuilder<QB>>
     public static final ParseField BOOST_FIELD = new ParseField("boost");
 
     protected String queryName;
-    protected String fieldType;
     protected float boost = DEFAULT_BOOST;
 
     protected AbstractQueryBuilder() {
@@ -113,27 +112,6 @@ protected void printBoostAndQueryName(XContentBuilder builder) throws IOExceptio
         }
     }
 
-    /**
-     * Returns field name as String.
-     * Abstract method to be implemented by all child classes.
-     */
-    public abstract String fieldName();
-
-    /**
-     * Default method for child classes which do not have a custom {@link #fieldName()} implementation.
-     */
-    protected static String getDefaultFieldName() {
-        return null;
-    };
-
-    /**
-     * Returns field type as String for QueryBuilder classes which have a defined fieldName.
-     * Else returns null.
-     */
-    public final String getFieldType() {
-        return fieldType;
-    };
-
     @Override
     public final Query toQuery(QueryShardContext context) throws IOException {
         Query query = doToQuery(context);
@@ -147,7 +125,6 @@ public final Query toQuery(QueryShardContext context) throws IOException {
                 context.addNamedQuery(queryName, query);
             }
         }
-        fieldType = context.getFieldTypeString(fieldName());
         return query;
     }
 

server/src/main/java/org/opensearch/index/query/BoolQueryBuilder.java

@@ -270,11 +270,6 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         builder.endObject();
     }
 
-    @Override
-    public final String fieldName() {
-        return getDefaultFieldName();
-    }
-
     private static void doXArrayContent(ParseField field, List<QueryBuilder> clauses, XContentBuilder builder, Params params)
         throws IOException {
         if (clauses.isEmpty()) {