Made modification to last_index_request_timestamp similar to creation timestamp

Signed-off-by: Sriram Ganesh <[email protected]>

Author: Sriram Ganesh

server/src/internalClusterTest/java/org/opensearch/indices/stats/IndexStatsIT.java

@@ -297,21 +297,21 @@ public void testLastIndexRequestTimestamp() throws Exception {
                 .setMapping("field", "type=text,fielddata=true")
                 .get()
         );
-        assertAcked(client().admin().indices().prepareCreate(index).setSettings(settingsBuilder()).get());
-        ensureGreen(index);
+        assertAcked(client().admin().indices().prepareCreate("test").setSettings(settingsBuilder()).get());
+        ensureGreen();
 
         // Index a document
-        client().prepareIndex(index).setId("1").setSource("field", "value1").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
-        IndicesStatsResponse statsResponse = client().admin().indices().prepareStats(index).get();
-        IndexStats stats = statsResponse.getIndex(index);
+        client().prepareIndex("test").setId("1").setSource("field", "value1").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
+        IndicesStatsResponse statsResponse = client().admin().indices().prepareStats("test").get();
+        IndexStats stats = statsResponse.getIndex("test");
         long ts1 = stats.getLastIndexRequestTimestamp();
         assertTrue("Timestamp should be set after first write", ts1 > 0);
 
         // Wait and index another document
         Thread.sleep(1000);
-        client().prepareIndex(index).setId("2").setSource("field", "value2").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
-        statsResponse = client().admin().indices().prepareStats(index).get();
-        long ts2 = statsResponse.getIndex(index).getLastIndexRequestTimestamp();
+        client().prepareIndex("test").setId("2").setSource("field", "value2").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
+        statsResponse = client().admin().indices().prepareStats("test").get();
+        long ts2 = statsResponse.getIndex("test").getLastIndexRequestTimestamp();
         assertTrue("Timestamp should increase after another write", ts2 > ts1);
     }
 

server/src/main/java/org/opensearch/action/admin/indices/stats/IndexStats.java

@@ -35,8 +35,8 @@
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
-import java.io.IOException;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;

server/src/main/java/org/opensearch/action/admin/indices/stats/ShardStats.java

@@ -71,6 +71,15 @@ public class ShardStats implements Writeable, ToXContentFragment {
     @Nullable
     private PollingIngestStats pollingIngestStats;
 
+    /**
+     * Gets the current retention lease stats.
+     *
+     * @return the current retention lease stats
+     */
+    public RetentionLeaseStats getRetentionLeaseStats() {
+        return retentionLeaseStats;
+    }
+
     private String dataPath;
     private String statePath;
     private boolean isCustomDataPath;

server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java

@@ -425,7 +425,14 @@ protected Table getTableWithHeader(final RestRequest request, final PageToken pa
 
         table.addCell("creation.date", "alias:cd;default:false;desc:index creation date (millisecond value)");
         table.addCell("creation.date.string", "alias:cds;default:false;desc:index creation date (as string)");
-        table.addCell("last_index_request_timestamp", "alias:lirt;default:false;desc:timestamp of last index request processed (UTC ISO 8601 string)");
+        table.addCell(
+            "last_index_request_timestamp",
+            "alias:lirt;default:false;desc:timestamp of last index request processed (ms since epoch)"
+        );
+        table.addCell(
+            "last_index_request_timestamp.string",
+            "alias:lirts;default:false;desc:timestamp of last index request processed (as string)"
+        );
 
         table.addCell("store.size", "sibling:pri;alias:ss,storeSize;text-align:right;desc:store size of primaries & replicas");
         table.addCell("pri.store.size", "text-align:right;desc:store size of primaries");
@@ -856,7 +863,12 @@ protected Table buildTable(
             ZonedDateTime creationTime = ZonedDateTime.ofInstant(Instant.ofEpochMilli(indexMetadata.getCreationDate()), ZoneOffset.UTC);
             table.addCell(STRICT_DATE_TIME_FORMATTER.format(creationTime));
             Long lastIndexRequestTs = (indexStats == null ? null : indexStats.getLastIndexRequestTimestamp());
-            table.addCell((lastIndexRequestTs == null || lastIndexRequestTs <= 0) ? null : STRICT_DATE_TIME_FORMATTER.format(ZonedDateTime.ofInstant(Instant.ofEpochMilli(lastIndexRequestTs), ZoneOffset.UTC)));
+            table.addCell(lastIndexRequestTs);
+            table.addCell(
+                (lastIndexRequestTs == null || lastIndexRequestTs <= 0)
+                    ? null
+                    : STRICT_DATE_TIME_FORMATTER.format(ZonedDateTime.ofInstant(Instant.ofEpochMilli(lastIndexRequestTs), ZoneOffset.UTC))
+            );
 
             table.addCell(totalStats.getStore() == null ? null : totalStats.getStore().size());
             table.addCell(primaryStats.getStore() == null ? null : primaryStats.getStore().size());