stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-29 04:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't rehydrate refs all the time locally

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-07-10 16:41:17 +02:00
parent c5025e3f58
commit bf212fd8a7
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObject.java
View File

@@ -114,12 +114,13 @@ public class JObject<T extends JObjectData> implements Serializable, Comparable<
_resolver.hydrateRefs(this);
}
private void resolveDataPart() {
private void tryRemoteResolve() {
if (_dataPart.get() == null) {
_lock.writeLock().lock();
try {
tryLocalResolve();
if (_dataPart.get() == null) {
var res = _resolver.resolveData(this);
var res = _resolver.resolveDataRemote(this);
_metaPart.narrowClass(res.getClass());
_dataPart.set(res);
hydrateRefs();
@@ -177,8 +178,7 @@ public class JObject<T extends JObjectData> implements Serializable, Comparable<
}
public <R> R runReadLocked(ResolutionStrategy resolutionStrategy, ObjectFnRead<T, R> fn) {
if (resolutionStrategy == ResolutionStrategy.LOCAL_ONLY) tryLocalResolve();
else if (resolutionStrategy == ResolutionStrategy.REMOTE) resolveDataPart();
tryResolve(resolutionStrategy);
_lock.readLock().lock();
try {
@@ -207,8 +207,7 @@ public class JObject<T extends JObjectData> implements Serializable, Comparable<
public <R> R runWriteLocked(ResolutionStrategy resolutionStrategy, ObjectFnWrite<T, R> fn) {
_lock.writeLock().lock();
try {
if (resolutionStrategy == ResolutionStrategy.LOCAL_ONLY) tryLocalResolve();
else if (resolutionStrategy == ResolutionStrategy.REMOTE) resolveDataPart();
tryResolve(resolutionStrategy);
var dataHash = _metaPart.dataHash();
var metaHash = Objects.hash(_metaPart.metaHash(), dataHash);
@@ -259,10 +258,8 @@ public class JObject<T extends JObjectData> implements Serializable, Comparable<
}
public boolean tryResolve(ResolutionStrategy resolutionStrategy) {
assertRWLock();
if (resolutionStrategy == ResolutionStrategy.LOCAL_ONLY) tryLocalResolve();
else if (resolutionStrategy == ResolutionStrategy.REMOTE) resolveDataPart();
else if (resolutionStrategy == ResolutionStrategy.REMOTE) tryRemoteResolve();
return _dataPart.get() != null;
}

6
server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectResolver.java
View File

@@ -140,11 +140,7 @@ public class JObjectResolver {
return Optional.empty();
}
public <T extends JObjectData> T resolveData(JObject<T> jObject) {
jObject.assertRWLock();
var local = resolveDataLocal(jObject);
if (local.isPresent()) return local.get();
public <T extends JObjectData> T resolveDataRemote(JObject<T> jObject) {
var obj = remoteObjectServiceClient.getObject(jObject);
jObjectWriteback.markDirty(jObject);
invalidationQueueService.pushInvalidationToAll(jObject.getName());