Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-14 03:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-166] added locking for runtime storage

Browse Source
This commit is contained in:
Sheldan
2020-11-22 14:43:42 +01:00
parent 448d555dba
commit 1d9f2595db
7 changed files with 110 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/job/ExperiencePersistingJob.java
View File

@@ -2,6 +2,7 @@ package dev.sheldan.abstracto.experience.job;
import dev.sheldan.abstracto.experience.models.ServerExperience;
import dev.sheldan.abstracto.experience.service.AUserExperienceService;
import dev.sheldan.abstracto.experience.service.RunTimeExperienceService;
import lombok.extern.slf4j.Slf4j;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
@@ -30,17 +31,27 @@ public class ExperiencePersistingJob extends QuartzJobBean {
@Autowired
private AUserExperienceService userExperienceService;
@Autowired
private RunTimeExperienceService runTimeExperienceService;
@Override
protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
Map<Long, List<ServerExperience>> runtimeExperience = userExperienceService.getRuntimeExperience();
log.info("Running experience persisting job.");
Long pastMinute = (Instant.now().getEpochSecond() / 60) - 1;
if(runtimeExperience.containsKey(pastMinute)) {
List<ServerExperience> foundServers = runtimeExperience.get(pastMinute);
log.info("Found experience from {} servers to persist.", foundServers.size());
userExperienceService.handleExperienceGain(foundServers).thenAccept(aVoid ->
runtimeExperience.remove(pastMinute)
);
runTimeExperienceService.takeLock();
try {
Map<Long, List<ServerExperience>> runtimeExperience = runTimeExperienceService.getRuntimeExperience();
log.info("Running experience persisting job.");
Long pastMinute = (Instant.now().getEpochSecond() / 60) - 1;
if(runtimeExperience.containsKey(pastMinute)) {
List<ServerExperience> foundServers = runtimeExperience.get(pastMinute);
log.info("Found experience from {} servers to persist.", foundServers.size());
userExperienceService.handleExperienceGain(foundServers).thenAccept(aVoid -> {
runTimeExperienceService.takeLock();
runTimeExperienceService.getRuntimeExperience().remove(pastMinute);
runTimeExperienceService.releaseLock();
});
}
} finally {
runTimeExperienceService.releaseLock();
}
}

48
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java
View File

@@ -88,35 +88,35 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
*/
@Override
public void addExperience(AUserInAServer userInAServer) {
Long minute = Instant.now().getEpochSecond() / 60;
Map<Long, List<ServerExperience>> runtimeExperience = runTimeExperienceService.getRuntimeExperience();
if(runtimeExperience.containsKey(minute)) {
log.trace("Minute {} already tracked, adding user {} in server {}.",
minute, userInAServer.getUserReference().getId(), userInAServer.getServerReference().getId());
List<ServerExperience> existing = runtimeExperience.get(minute);
for (ServerExperience server : existing) {
if (server.getServerId().equals(userInAServer.getServerReference().getId()) && server.getUserInServerIds().stream().noneMatch(userInAServer1 -> userInAServer.getUserInServerId().equals(userInAServer1))) {
server.getUserInServerIds().add(userInAServer.getUserInServerId());
break;
runTimeExperienceService.takeLock();
try {
Long minute = Instant.now().getEpochSecond() / 60;
Map<Long, List<ServerExperience>> runtimeExperience = runTimeExperienceService.getRuntimeExperience();
if(runtimeExperience.containsKey(minute)) {
log.trace("Minute {} already tracked, adding user {} in server {}.",
minute, userInAServer.getUserReference().getId(), userInAServer.getServerReference().getId());
List<ServerExperience> existing = runtimeExperience.get(minute);
for (ServerExperience server : existing) {
if (server.getServerId().equals(userInAServer.getServerReference().getId()) && server.getUserInServerIds().stream().noneMatch(userInAServer1 -> userInAServer.getUserInServerId().equals(userInAServer1))) {
server.getUserInServerIds().add(userInAServer.getUserInServerId());
break;
}
}
} else {
log.trace("Minute {} did not exist yet. Creating new entry for user {} in server {}.", minute, userInAServer.getUserReference().getId(), userInAServer.getServerReference().getId());
ServerExperience serverExperience = ServerExperience
.builder()
.serverId(userInAServer.getServerReference().getId())
.build();
serverExperience.getUserInServerIds().add(userInAServer.getUserInServerId());
runtimeExperience.put(minute, new ArrayList<>(Arrays.asList(serverExperience)));
}
} else {
log.trace("Minute {} did not exist yet. Creating new entry for user {} in server {}.", minute, userInAServer.getUserReference().getId(), userInAServer.getServerReference().getId());
ServerExperience serverExperience = ServerExperience
.builder()
.serverId(userInAServer.getServerReference().getId())
.build();
serverExperience.getUserInServerIds().add(userInAServer.getUserInServerId());
runtimeExperience.put(minute, new ArrayList<>(Arrays.asList(serverExperience)));
} finally {
runTimeExperienceService.releaseLock();
}
}
@Override
public Map<Long, List<ServerExperience>> getRuntimeExperience() {
return runTimeExperienceService.getRuntimeExperience();
}
/**
* Calculates the level of the given {@link AUserExperience} according to the given {@link AExperienceLevel} list

12
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/RunTimeExperienceService.java
View File

@@ -6,13 +6,23 @@ import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@Component
public class RunTimeExperienceService {
private Map<Long, List<ServerExperience>> runtimeExperience = new HashMap<>();
private static final Lock lock = new ReentrantLock();
public Map<Long, List<ServerExperience>> getRuntimeExperience() {
return runtimeExperience;
}
public void takeLock() {
lock.lock();
}
public void releaseLock() {
lock.unlock();
}
}