remove queryGroupId

Signed-off-by: Kiran Prakash <[email protected]>
kiranprakash154 · Jul 31, 2024 · 7cff5af · 7cff5af
1 parent f957a3c
commit 7cff5af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 42 deletions.
diff --git a/server/src/main/java/org/opensearch/wlm/QueryGroupLevelResourceUsageView.java b/server/src/main/java/org/opensearch/wlm/QueryGroupLevelResourceUsageView.java
@@ -8,37 +8,24 @@
 
 package org.opensearch.wlm;
 
-import org.opensearch.common.annotation.ExperimentalApi;
 import org.opensearch.search.ResourceType;
 import org.opensearch.tasks.Task;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * Represents the point in time view of resource usage of a QueryGroup and
  * has a 1:1 relation with a QueryGroup.
- * This class holds the QueryGroup ID, the resource usage data, and the list of active tasks.
+ * This class holds the resource usage data and the list of active tasks.
  */
 public class QueryGroupLevelResourceUsageView {
-
-    private final String queryGroupId;
     // resourceUsage holds the resource usage data for a QueryGroup at a point in time
     private final Map<ResourceType, Long> resourceUsage;
     // activeTasks holds the list of active tasks for a QueryGroup at a point in time
     private final List<Task> activeTasks;
 
-    public QueryGroupLevelResourceUsageView(String queryGroupId) {
-        this.queryGroupId = queryGroupId;
-        this.resourceUsage = new HashMap<>();
-        this.activeTasks = new ArrayList<>();
-    }
-
-    public QueryGroupLevelResourceUsageView(String queryGroupId, Map<ResourceType, Long> resourceUsage, List<Task> activeTasks) {
-        this.queryGroupId = queryGroupId;
+    public QueryGroupLevelResourceUsageView(Map<ResourceType, Long> resourceUsage, List<Task> activeTasks) {
         this.resourceUsage = resourceUsage;
         this.activeTasks = activeTasks;
     }
@@ -60,17 +47,4 @@ public Map<ResourceType, Long> getResourceUsageData() {
     public List<Task> getActiveTasks() {
         return activeTasks;
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        QueryGroupLevelResourceUsageView that = (QueryGroupLevelResourceUsageView) o;
-        return Objects.equals(queryGroupId, that.queryGroupId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(queryGroupId);
-    }
 }
diff --git a/server/src/test/java/org/opensearch/wlm/QueryGroupLevelResourceUsageViewTests.java b/server/src/test/java/org/opensearch/wlm/QueryGroupLevelResourceUsageViewTests.java
@@ -29,23 +29,15 @@ public void setUp() throws Exception {
 
     public void testGetResourceUsageData() {
         QueryGroupLevelResourceUsageView queryGroupLevelResourceUsageView = new QueryGroupLevelResourceUsageView(
-            "1234",
             resourceUsage,
             activeTasks
         );
         Map<ResourceType, Long> resourceUsageData = queryGroupLevelResourceUsageView.getResourceUsageData();
         assertTrue(assertResourceUsageData(resourceUsageData));
     }
 
-    public void testGetResourceUsageDataDefault() {
-        QueryGroupLevelResourceUsageView queryGroupLevelResourceUsageView = new QueryGroupLevelResourceUsageView("1234");
-        Map<ResourceType, Long> resourceUsageData = queryGroupLevelResourceUsageView.getResourceUsageData();
-        assertTrue(resourceUsageData.isEmpty());
-    }
-
     public void testGetActiveTasks() {
         QueryGroupLevelResourceUsageView queryGroupLevelResourceUsageView = new QueryGroupLevelResourceUsageView(
-            "1234",
             resourceUsage,
             activeTasks
         );
@@ -54,12 +46,6 @@ public void testGetActiveTasks() {
         assertEquals(4321, activeTasks.get(0).getId());
     }
 
-    public void testGetActiveTasksDefault() {
-        QueryGroupLevelResourceUsageView queryGroupLevelResourceUsageView = new QueryGroupLevelResourceUsageView("1234");
-        List<Task> activeTasks = queryGroupLevelResourceUsageView.getActiveTasks();
-        assertTrue(activeTasks.isEmpty());
-    }
-
     private boolean assertResourceUsageData(Map<ResourceType, Long> resourceUsageData) {
         return resourceUsageData.get(ResourceType.fromName("memory")) == 34L && resourceUsageData.get(ResourceType.fromName("cpu")) == 12L;
     }