Revert "Replace agg_metric_double points with skippers"

This reverts commit 1e8fcef.

Author: romseygeek

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

@@ -214,11 +214,6 @@ public Builder coerce(boolean coerce) {
             return this;
         }
 
-        public Builder index(boolean index) {
-            this.indexed.setValue(index);
-            return this;
-        }
-
         public Builder docValues(boolean hasDocValues) {
             this.hasDocValues.setValue(hasDocValues);
             return this;

x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateMetricDoubleFieldMapper.java

@@ -20,7 +20,6 @@
 import org.elasticsearch.common.time.DateMathParser;
 import org.elasticsearch.common.util.BigArrays;
 import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.fielddata.FieldDataContext;
 import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.ScriptDocValues;
@@ -233,19 +232,13 @@ public AggregateMetricDoubleFieldMapper build(MapperBuilderContext context) {
                         ScriptCompiler.NONE,
                         indexSettings
                     ).allowMultipleValues(false).ignoreMalformed(false).coerce(false);
-                    if (indexSettings.getIndexVersionCreated().onOrAfter(IndexVersions.STANDARD_INDEXES_USE_SKIPPERS)) {
-                        builder.index(false);
-                    }
                 } else {
                     builder = new NumberFieldMapper.Builder(
                         fieldName,
                         NumberFieldMapper.NumberType.DOUBLE,
                         ScriptCompiler.NONE,
                         indexSettings
                     ).allowMultipleValues(false).ignoreMalformed(false).coerce(true);
-                    if (indexSettings.getIndexVersionCreated().onOrAfter(IndexVersions.STANDARD_INDEXES_USE_SKIPPERS)) {
-                        builder.index(false);
-                    }
                 }
                 NumberFieldMapper fieldMapper = builder.build(context);
                 metricMappers.put(m, fieldMapper);

x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateMetricDoubleFieldMapperTests.java

@@ -8,15 +8,10 @@
 
 import org.apache.lucene.search.FieldExistsQuery;
 import org.apache.lucene.search.Query;
-import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.core.CheckedConsumer;
-import org.elasticsearch.index.IndexMode;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.DocumentParsingException;
-import org.elasticsearch.index.mapper.IndexType;
 import org.elasticsearch.index.mapper.LuceneDocument;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
@@ -25,7 +20,6 @@
 import org.elasticsearch.index.mapper.MapperTestCase;
 import org.elasticsearch.index.mapper.ParsedDocument;
 import org.elasticsearch.plugins.Plugin;
-import org.elasticsearch.test.index.IndexVersionUtils;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.json.JsonXContent;
@@ -632,42 +626,6 @@ protected List<SortShortcutSupport> getSortShortcutSupport() {
 
     @Override
     protected boolean supportsDocValuesSkippers() {
-        return false;   // can't configure `index` so normal test doesn't work
-    }
-
-    public void testIndexTypes() throws Exception {
-        {
-            var indexSettings = getIndexSettingsBuilder().put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES.getName())
-                .put(IndexMetadata.INDEX_ROUTING_PATH.getKey(), "dimension_field")
-                .build();
-            MapperService mapperService = createMapperService(indexSettings, fieldMapping(this::minimalMapping));
-            MappedFieldType ft = mapperService.fieldType("field");
-            assertIndexType(ft, IndexType.skippers());
-        }
-        {
-            var oldVersion = IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.STANDARD_INDEXES_USE_SKIPPERS);
-            MapperService mapperService = createMapperService(oldVersion, fieldMapping(this::minimalMapping));
-            MappedFieldType ft = mapperService.fieldType("field");
-            assertIndexType(ft, IndexType.points(true, true));
-        }
-        {
-            MapperService mapperService = createMapperService(
-                IndexVersions.STANDARD_INDEXES_USE_SKIPPERS,
-                fieldMapping(this::minimalMapping)
-            );
-            MappedFieldType ft = mapperService.fieldType("field");
-            assertIndexType(ft, IndexType.skippers());
-        }
-    }
-
-    private void assertIndexType(MappedFieldType ft, IndexType indexType) {
-        assertThat(ft, instanceOf(AggregateMetricDoubleFieldMapper.AggregateMetricDoubleFieldType.class));
-        AggregateMetricDoubleFieldMapper.AggregateMetricDoubleFieldType aft =
-            (AggregateMetricDoubleFieldMapper.AggregateMetricDoubleFieldType) ft;
-        assertThat(aft.indexType(), equalTo(indexType));
-        for (MappedFieldType subField : aft.getMetricFields().values()) {
-            assertThat(subField.indexType(), equalTo(indexType));
-        }
+        return false;
     }
-
 }