Update regex & remove extra reference

Author: seanzatzdev

server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java

@@ -100,7 +100,7 @@ public final class DataStream implements SimpleDiffable<DataStream>, ToXContentO
     public static final DateFormatter DATE_FORMATTER = DateFormatter.forPattern("uuuu.MM.dd");
     public static final String TIMESTAMP_FIELD_NAME = "@timestamp";
     public static final Pattern DS_BACKING_PATTERN = Pattern.compile(
-        "^(.*?" + BACKING_INDEX_PREFIX + ")(.+)-(\\d{4}.\\d{2}.\\d{2})(-[\\d]+)?$"
+        "^(.*?" + BACKING_INDEX_PREFIX + ")(.+)-(\\d{4}.\\d{2}.\\d{2})(-[\\d]+)$"
     );
 
     // Timeseries indices' leaf readers should be sorted by desc order of their timestamp field, as it allows search time optimizations

server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java

@@ -2715,21 +2715,28 @@ public void testGetEffectiveIndexTemplateDataStreamMappingsOnly() throws IOExcep
         assertThat(dataStream.getEffectiveIndexTemplate(projectMetadataBuilder.build()), equalTo(expectedEffectiveTemplate));
     }
 
-    public void testGetDataStreamNameFromValidBackingIndex() {
+    public void testGetDataStreamNameFromValidBackingIndices() {
         // Test a valid backing index name with correct format: .ds-<data-stream>-<yyyy.MM.dd>-<generation>
         String indexName = ".ds-my-service-logs-2024.02.05-000001";
         String dataStreamName = DataStream.getDataStreamNameFromIndex(indexName);
 
         assertEquals("my-service-logs", dataStreamName);
+
+        // Test valid backing index with extra '-' dash in the name
+        indexName = ".ds-my-service-logs-two-2024.02.05-000001";
+        dataStreamName = DataStream.getDataStreamNameFromIndex(indexName);
+
+        assertEquals("my-service-logs-two", dataStreamName);
+
     }
 
     public void testGetDataStreamNameFromInvalidBackingIndex() {
         // Test cases that should not be recognized as valid backing indices
         String[] invalidNames = {
             "not-a-backing-index", // No .ds- prefix
             ".ds-", // Missing data stream name
-            ".ds-logs", // Missing date and generation
-            ".ds-logs-2024.02.05", // Missing generation
+            ".ds-my-service-logs", // Missing date and generation
+            ".ds-my-service-logs-2024.02.05", // Missing generation
         };
 
         for (String invalidName : invalidNames) {

server/src/test/java/org/elasticsearch/search/SearchHitTests.java

@@ -482,52 +482,60 @@ public void testShardTargetSetsDataStreamName() {
         // Create a SearchHit
         SearchHit hit = new SearchHit(1);
 
-        // Create a backing index name following the pattern: .ds-<data-stream>-<yyyy.MM.dd>-<generation>
-        String backingIndexName = ".ds-my-service-logs-2024.02.05-000001";
-        String nodeId = "node1";
-        int shardId = 0;
-        String clusterAlias = null;
-
-        // Create SearchShardTarget with the backing index name
-        SearchShardTarget target = new SearchShardTarget(
-            nodeId,
-            new ShardId(new Index(backingIndexName, IndexMetadata.INDEX_UUID_NA_VALUE), shardId),
-            clusterAlias
-        );
-
-        // Set the shard target
-        hit.shard(target);
-
-        // Verify the data-stream field is set correctly
-        assertEquals("my-service-logs", hit.getDataStream());
-        assertEquals(backingIndexName, hit.getIndex());
-        assertNull(hit.getClusterAlias());
+        try {
+            // Create a backing index name following the pattern: .ds-<data-stream>-<yyyy.MM.dd>-<generation>
+            String backingIndexName = ".ds-my-service-logs-2024.02.05-000001";
+            String nodeId = "node1";
+            int shardId = 0;
+            String clusterAlias = null;
+
+            // Create SearchShardTarget with the backing index name
+            SearchShardTarget target = new SearchShardTarget(
+                nodeId,
+                new ShardId(new Index(backingIndexName, IndexMetadata.INDEX_UUID_NA_VALUE), shardId),
+                clusterAlias
+            );
+
+            // Set the shard target
+            hit.shard(target);
+
+            // Verify the data-stream field is set correctly
+            assertEquals("my-service-logs", hit.getDataStream());
+            assertEquals(backingIndexName, hit.getIndex());
+            assertNull(hit.getClusterAlias());
+        } finally {
+            hit.decRef();
+        }
     }
 
     public void testShardTargetWithNonDataStreamIndex() {
         // Create a SearchHit
         SearchHit hit = new SearchHit(1);
 
-        // Create a regular index name (not a backing index)
-        String regularIndexName = "regular-index";
-        String nodeId = "node1";
-        int shardId = 0;
-        String clusterAlias = null;
-
-        // Create SearchShardTarget with a non-data-stream-backed index name
-        SearchShardTarget target = new SearchShardTarget(
-            nodeId,
-            new ShardId(new Index(regularIndexName, IndexMetadata.INDEX_UUID_NA_VALUE), shardId),
-            clusterAlias
-        );
-
-        // Set the shard target
-        hit.shard(target);
-
-        // Verify the data-stream field is null for non-backing indices
-        assertNull(hit.getDataStream());
-        assertEquals(regularIndexName, hit.getIndex());
-        assertNull(hit.getClusterAlias());
+        try {
+            // Create a regular index name (not a backing index)
+            String regularIndexName = "regular-index";
+            String nodeId = "node1";
+            int shardId = 0;
+            String clusterAlias = null;
+
+            // Create SearchShardTarget with a non-data-stream-backed index name
+            SearchShardTarget target = new SearchShardTarget(
+                nodeId,
+                new ShardId(new Index(regularIndexName, IndexMetadata.INDEX_UUID_NA_VALUE), shardId),
+                clusterAlias
+            );
+
+            // Set the shard target
+            hit.shard(target);
+
+            // Verify the data-stream field is null for non-backing indices
+            assertNull(hit.getDataStream());
+            assertEquals(regularIndexName, hit.getIndex());
+            assertNull(hit.getClusterAlias());
+        } finally {
+            hit.decRef();
+        }
     }
 
 }