From bb232f2e119acc8bac1d15b319eed3ec0f6d627d Mon Sep 17 00:00:00 2001
From: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
Date: Mon, 8 Jan 2024 11:31:24 -0800
Subject: [PATCH] Changing cacheEntity function name and removing volatile with
 concurrentHashMap

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
---
 .../org/opensearch/indices/IndicesRequestCache.java    | 10 +++++-----
 .../java/org/opensearch/indices/IndicesService.java    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/src/main/java/org/opensearch/indices/IndicesRequestCache.java b/server/src/main/java/org/opensearch/indices/IndicesRequestCache.java
index bba6217c504a9..48306792efcf9 100644
--- a/server/src/main/java/org/opensearch/indices/IndicesRequestCache.java
+++ b/server/src/main/java/org/opensearch/indices/IndicesRequestCache.java
@@ -116,7 +116,7 @@ public final class IndicesRequestCache implements RemovalListener<IndicesRequest
     private final ByteSizeValue size;
     private final TimeValue expire;
     private final Cache<Key, BytesReference> cache;
-    private final Function<ShardId, CacheEntity> cacheEntityFunction;
+    private final Function<ShardId, CacheEntity> cacheEntityLookup;
 
     IndicesRequestCache(Settings settings, Function<ShardId, CacheEntity> cacheEntityFunction) {
         this.size = INDICES_CACHE_QUERY_SIZE.get(settings);
@@ -130,7 +130,7 @@ public final class IndicesRequestCache implements RemovalListener<IndicesRequest
             cacheBuilder.setExpireAfterAccess(expire);
         }
         cache = cacheBuilder.build();
-        this.cacheEntityFunction = cacheEntityFunction;
+        this.cacheEntityLookup = cacheEntityFunction;
     }
 
     @Override
@@ -145,7 +145,7 @@ void clear(CacheEntity entity) {
 
     @Override
     public void onRemoval(RemovalNotification<Key, BytesReference> notification) {
-        cacheEntityFunction.apply(notification.getKey().shardId).onRemoval(notification);
+        cacheEntityLookup.apply(notification.getKey().shardId).onRemoval(notification);
     }
 
     BytesReference getOrCompute(
@@ -379,10 +379,10 @@ synchronized void cleanCache() {
         if (!currentKeysToClean.isEmpty() || !currentFullClean.isEmpty()) {
             for (Iterator<Key> iterator = cache.keys().iterator(); iterator.hasNext();) {
                 Key key = iterator.next();
-                if (currentFullClean.contains(cacheEntityFunction.apply(key.shardId).getCacheIdentity())) {
+                if (currentFullClean.contains(cacheEntityLookup.apply(key.shardId).getCacheIdentity())) {
                     iterator.remove();
                 } else {
-                    if (currentKeysToClean.contains(new CleanupKey(cacheEntityFunction.apply(key.shardId), key.readerCacheKeyId))) {
+                    if (currentKeysToClean.contains(new CleanupKey(cacheEntityLookup.apply(key.shardId), key.readerCacheKeyId))) {
                         iterator.remove();
                     }
                 }
diff --git a/server/src/main/java/org/opensearch/indices/IndicesService.java b/server/src/main/java/org/opensearch/indices/IndicesService.java
index 635fe2a07ed2d..4b2f823014f82 100644
--- a/server/src/main/java/org/opensearch/indices/IndicesService.java
+++ b/server/src/main/java/org/opensearch/indices/IndicesService.java
@@ -333,7 +333,7 @@ public class IndicesService extends AbstractLifecycleComponent
     private final ScriptService scriptService;
     private final ClusterService clusterService;
     private final Client client;
-    private volatile Map<String, IndexService> indices = new ConcurrentHashMap<>();
+    private Map<String, IndexService> indices = new ConcurrentHashMap<>();
     private final Map<Index, List<PendingDelete>> pendingDeletes = new HashMap<>();
     private final AtomicInteger numUncompletedDeletes = new AtomicInteger();
     private final OldShardsStats oldShardsStats = new OldShardsStats();