Fix other Potential Instances Of Usage Of RemoveAll With Lists (#969)

Co-authored-by: Shrinand Thakkar <sthakkar@sthakkar-mn2.linkedin.biz>
linkedin · Oct 31, 2023 · c082369 · c082369
1 parent b31e41a
commit c082369
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ain/java/com/linkedin/datastream/server/assignment/StickyPartitionAssignmentStrategy.java b/...ain/java/com/linkedin/datastream/server/assignment/StickyPartitionAssignmentStrategy.java
@@ -675,7 +675,7 @@ protected void partitionSanityChecks(Map<String, Set<DatastreamTask>> assignedTa
       for (DatastreamTask task : tasksSet) {
         if (datastreamGroupName.equals(task.getTaskPrefix())) {
           total += task.getPartitionsV2().size();
-          unassignedPartitions.removeAll(task.getPartitionsV2());
+          unassignedPartitions.removeAll(new HashSet<>(task.getPartitionsV2()));
         }
       }
     }

diff --git a/datastream-server/src/main/java/com/linkedin/datastream/server/zk/ZkAdapter.java b/datastream-server/src/main/java/com/linkedin/datastream/server/zk/ZkAdapter.java
@@ -966,7 +966,7 @@ private void diffAssignmentNodes(Map<String, List<DatastreamTask>> assignmentsBy
       // find assignments added
       //
       Set<String> added = new HashSet<>(assignmentsNames);
-      added.removeAll(oldAssignmentNames);
+      added.removeAll(new HashSet<>(oldAssignmentNames));
       nodesToAdd.put(instance, added);
     }
   }
@@ -1120,7 +1120,7 @@ public void cleanUpDeadInstanceDataAndOtherUnusedTasks(
     Set<DatastreamTask> unusedTasks = findOldUnusedTasks(previousAssignmentByInstance, newAssignmentsByInstance);
 
     Set<String> deadInstances = previousAssignmentByInstance.keySet();
-    deadInstances.removeAll(liveInstances);
+    deadInstances.removeAll(new HashSet<>(liveInstances));
 
     LOG.debug("unusedTasks before cleanup: {}", unusedTasks.stream()
         .map(DatastreamTask::getDatastreamTaskName)