[Forwardport main] Fix @timestamp upgrade issue by adding a version check on skip_list param (opensearch-project#19677)

* Fix @timestamp upgrade issue by adding a version check on skip_list param (bwc) (opensearch-project#19671)

Fixes opensearch-project#19660

Signed-off-by: Asim Mahmood <asim.seng@gmail.com>
Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>
Co-authored-by: Sandesh Kumar <sandeshkr419@gmail.com>
(cherry picked from commit 0b6a2c9)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Removed changelog of items part of 3.3.1

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>

---------

Signed-off-by: Asim Mahmood <asim.seng@gmail.com>
Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Sandesh Kumar <sandeshkr419@gmail.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>

Author: 4 people

CHANGELOG.md

@@ -30,7 +30,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix flaky test FieldDataLoadingIT.testIndicesFieldDataCacheSizeSetting ([#19571](https://github.com/opensearch-project/OpenSearch/pull/19571))
 - Avoid primary shard failure caused by merged segment warmer exceptions ([#19436](https://github.com/opensearch-project/OpenSearch/pull/19436))
 - Fix pull-based ingestion out-of-bounds offset scenarios and remove persisted offsets ([#19607](https://github.com/opensearch-project/OpenSearch/pull/19607))
-- [Star Tree] Fix sub-aggregator casting for search with profile=true ([19652](https://github.com/opensearch-project/OpenSearch/pull/19652))
 - Fix issue with updating core with a patch number other than 0 ([#19377](https://github.com/opensearch-project/OpenSearch/pull/19377))
 - [Java Agent] Allow JRT protocol URLs in protection domain extraction ([#19683](https://github.com/opensearch-project/OpenSearch/pull/19683))
 

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

@@ -852,14 +852,15 @@ protected void parseCreateField(ParseContext context) throws IOException {
     }
 
     boolean isSkiplistDefaultEnabled(IndexSortConfig indexSortConfig, String fieldName) {
-        if (!isSkiplistConfigured) {
-            if (indexSortConfig.hasPrimarySortOnField(fieldName)) {
-                return true;
-            }
-            if (DataStreamFieldMapper.Defaults.TIMESTAMP_FIELD.getName().equals(fieldName)) {
-                return true;
+        if (this.indexCreatedVersion.onOrAfter(Version.V_3_3_0)) {
+            if (!isSkiplistConfigured) {
+                if (indexSortConfig.hasPrimarySortOnField(fieldName)) {
+                    return true;
+                }
+                if (DataStreamFieldMapper.Defaults.TIMESTAMP_FIELD.getName().equals(fieldName)) {
+                    return true;
+                }
             }
-
         }
         return false;
     }

server/src/test/java/org/opensearch/index/mapper/DateFieldMapperTests.java

@@ -869,16 +869,25 @@ public void testSkipListIntegrationMappingDefinitionSerialization() throws IOExc
 
     public void testIsSkiplistDefaultEnabled() throws IOException {
         DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "date")));
+        testIsSkiplistEnabled(mapper, true);
+
+    }
+
+    public void testIsSkiplistDefaultDisabledInOlderVersions() throws IOException {
+        DocumentMapper mapper = createDocumentMapper(Version.V_3_2_0, fieldMapping(b -> b.field("type", "date")));
+        testIsSkiplistEnabled(mapper, false);
+    }
+
+    private void testIsSkiplistEnabled(DocumentMapper mapper, boolean expectedValue) throws IOException {
         DateFieldMapper dateFieldMapper = (DateFieldMapper) mapper.mappers().getMapper("field");
 
         // Test with no index sort and non-timestamp field
         IndexMetadata noSortindexMetadata = new IndexMetadata.Builder("index").settings(getIndexSettings()).build();
-        IndexSettings noSolrIndexSettings = new IndexSettings(noSortindexMetadata, getIndexSettings());
         IndexSortConfig noSortConfig = new IndexSortConfig(new IndexSettings(noSortindexMetadata, getIndexSettings()));
         assertFalse(dateFieldMapper.isSkiplistDefaultEnabled(noSortConfig, "field"));
 
         // timestamp field
-        assertTrue(dateFieldMapper.isSkiplistDefaultEnabled(noSortConfig, "@timestamp"));
+        assertEquals(expectedValue, dateFieldMapper.isSkiplistDefaultEnabled(noSortConfig, "@timestamp"));
 
         // Create index settings with an index sort.
         Settings settings = Settings.builder()
@@ -892,8 +901,8 @@ public void testIsSkiplistDefaultEnabled() throws IOException {
         IndexMetadata indexMetadata = new IndexMetadata.Builder("index").settings(settings).build();
         IndexSettings indexSettings = new IndexSettings(indexMetadata, settings);
         IndexSortConfig sortConfig = new IndexSortConfig(indexSettings);
-        assertTrue(dateFieldMapper.isSkiplistDefaultEnabled(sortConfig, "field"));
-        assertTrue(dateFieldMapper.isSkiplistDefaultEnabled(sortConfig, "@timestamp"));
+        assertEquals(expectedValue, dateFieldMapper.isSkiplistDefaultEnabled(sortConfig, "field"));
+        assertEquals(expectedValue, dateFieldMapper.isSkiplistDefaultEnabled(sortConfig, "@timestamp"));
     }
 
     public void testSkipListIntegrationFieldBehaviorConsistency() throws IOException {