Dragonestia/RoomPicker
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed memory leak

Browse Source
This commit is contained in:
Andrey Terentev 2024-03-15 00:28:58 +07:00 committed by Andrey Terentev
parent cad8f59d30
commit e196242215
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java
View File

@ -10,6 +10,7 @@ import ru.dragonestia.picker.repository.impl.cache.NodeId2PickerModeCache;
import ru.dragonestia.picker.repository.impl.picker.LeastPickedPicker; import ru.dragonestia.picker.repository.impl.picker.LeastPickedPicker;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -19,8 +20,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public class UserRepositoryImpl implements UserRepository { public class UserRepositoryImpl implements UserRepository {
private final NodeId2PickerModeCache nodeId2PickerModeCache; private final NodeId2PickerModeCache nodeId2PickerModeCache;
private final Map<User, Set<Room>> usersMap = new HashMap<>(); private final Map<User, Set<Room>> usersMap = new ConcurrentHashMap<>();
private final Map<NodeRoomPath, Set<User>> roomUsers = new HashMap<>(); private final Map<NodeRoomPath, Set<User>> roomUsers = new ConcurrentHashMap<>();
private final ReadWriteLock lock = new ReentrantReadWriteLock(true); private final ReadWriteLock lock = new ReentrantReadWriteLock(true);
@Override @Override
@ -115,8 +116,10 @@ public class UserRepositoryImpl implements UserRepository {
public void onRemoveRoom(Room room) { public void onRemoveRoom(Room room) {
lock.writeLock().lock(); lock.writeLock().lock();
try { try {
usersMap.forEach((user, set) -> { roomUsers.remove(new NodeRoomPath(room.getNodeIdentifier(), room.getIdentifier())).forEach(user -> {
var set = usersMap.getOrDefault(user, new HashSet<>());
set.remove(room); set.remove(room);
if (set.isEmpty()) { if (set.isEmpty()) {
usersMap.remove(user); usersMap.remove(user);
} }
@ -175,11 +178,11 @@ public class UserRepositoryImpl implements UserRepository {
return map; return map;
} }
private record NodeRoomPath(String node, String bucket) { private record NodeRoomPath(String node, String room) {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(node, bucket); return Objects.hash(node, room);
} }
@Override @Override
@ -187,7 +190,7 @@ public class UserRepositoryImpl implements UserRepository {
if (o == null) return false; if (o == null) return false;
if (o == this) return true; if (o == this) return true;
if (o instanceof NodeRoomPath other) { if (o instanceof NodeRoomPath other) {
return other.node().equals(node()) && other.bucket().equals(bucket()); return other.node().equals(node()) && other.room().equals(room());
} }
return false; return false;
} }