stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-28 20:47:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Server: fix incorrect mutator usages

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-10-13 20:53:06 +02:00
parent f9042721f0
commit 7c1cbe3eb6
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTreeManager.java
View File

@@ -139,13 +139,13 @@ public class JKleppmannTreeManager {
_persistentData.get().mutate(new JMutator<JKleppmannTreePersistentData>() {
@Override
public boolean mutate(JKleppmannTreePersistentData object) {
_persistentData.get().getData().getQueues().get(host).pollFirstEntry();
object.getQueues().get(host).pollFirstEntry();
return true;
}
@Override
public void revert(JKleppmannTreePersistentData object) {
_persistentData.get().getData().getQueues().get(host).put(jop.getOp().timestamp(), jop.getOp());
object.getQueues().get(host).put(jop.getOp().timestamp(), jop.getOp());
}
});
@@ -241,16 +241,17 @@ public class JKleppmannTreeManager {
public void recordOp(OpMove<Long, UUID, JKleppmannTreeNodeMeta, String> op) {
_persistentData.get().assertRwLock();
_persistentData.get().tryResolve(JObjectManager.ResolutionStrategy.LOCAL_ONLY);
var hostUuds = persistentPeerDataService.getHostUuids().stream().toList();
_persistentData.get().mutate(new JMutator<JKleppmannTreePersistentData>() {
@Override
public boolean mutate(JKleppmannTreePersistentData object) {
object.recordOp(persistentPeerDataService.getHostUuids(), op);
object.recordOp(hostUuds, op);
return true;
}
@Override
public void revert(JKleppmannTreePersistentData object) {
object.removeOp(persistentPeerDataService.getHostUuids(), op);
object.removeOp(hostUuds, op);
}
});
opSender.push(JKleppmannTree.this);

8
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentPeerDataService.java
View File

@@ -315,13 +315,13 @@ public class PersistentPeerDataService {
peerDirectoryLocal.get().local().mutate(new JMutator<PeerDirectoryLocal>() {
@Override
public boolean mutate(PeerDirectoryLocal object) {
peerDirectoryLocal.get().getData().getInitialOpSyncDone().add(connectedHost);
object.getInitialOpSyncDone().add(connectedHost);
return true;
}
@Override
public void revert(PeerDirectoryLocal object) {
peerDirectoryLocal.get().getData().getInitialOpSyncDone().remove(connectedHost);
object.getInitialOpSyncDone().remove(connectedHost);
}
});
return !contained;
@@ -342,13 +342,13 @@ public class PersistentPeerDataService {
peerDirectoryLocal.get().local().mutate(new JMutator<PeerDirectoryLocal>() {
@Override
public boolean mutate(PeerDirectoryLocal object) {
peerDirectoryLocal.get().getData().getInitialObjSyncDone().add(connectedHost);
object.getInitialObjSyncDone().add(connectedHost);
return true;
}
@Override
public void revert(PeerDirectoryLocal object) {
peerDirectoryLocal.get().getData().getInitialObjSyncDone().remove(connectedHost);
object.getInitialObjSyncDone().remove(connectedHost);
}
});
return !contained;