Skip to content
This repository has been archived by the owner on Sep 25, 2024. It is now read-only.

clean(managers): Split run method of DataManager into saveAndRemoveAl… #48

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

clean(managers): Split run method of DataManager into saveAndRemoveAl… #48

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb4027f
clean(managers): Split run method of DataManager into saveAndRemoveAl…
Trip-kun Jan 14, 2024
2b14ce6
fix(managers): Java doesn't have default args here
Trip-kun Jan 14, 2024
3de250b
fix(managers): Remove race condition with explicit synchronized call
Trip-kun Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 91 additions & 83 deletions src/main/java/wtf/triplapeeck/oatmeal/managers/DataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,67 +85,37 @@ public synchronized MemberData getMemberData(String id) {
memberData.request();
return memberData;
}
public synchronized void saveAll() {
public synchronized void saveAll(boolean remove) {
temp.addAll(guildCache.keySet());
for (String key: temp) {
saveGuildData(key, false);
saveGuildData(key, remove);
}
temp.clear();
temp.addAll(userCache.keySet());
for (String key: temp) {
saveUserData(key, false);
saveUserData(key, remove);
}
temp.clear();
temp.addAll(channelCache.keySet());
for (String key: temp) {
saveChannelData(key, false);
saveChannelData(key, remove);
}
temp.clear();
temp.addAll(memberCache.keySet());
for (String key: temp) {
saveMemberData(key, false);
saveMemberData(key, remove);
}
temp.clear();
}
@Override
public void run() {
while(true) {
if (requestToEnd) {
while (Main.threadManager.getState()!=State.TERMINATED) {
try {
sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}
temp.addAll(guildCache.keySet());
for (String key: temp) {
saveGuildData(key, true);
}
temp.clear();
temp.addAll(userCache.keySet());
for (String key: temp) {
saveUserData(key, true);
}
temp.clear();
temp.addAll(channelCache.keySet());
for (String key: temp) {
saveChannelData(key, true);
}
temp.clear();
temp.addAll(memberCache.keySet());
for (String key: temp) {
saveMemberData(key, true);
}
temp.clear();
break;
}

try {
sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
for (String key: guildCache.keySet()) {
GuildData guildData = guildCache.get(key);
if (guildData.getEpoch()!=0 && guildData.getAccessCount()==0) {
if (!guildData.getSaved() ) {
public synchronized void saveAll() {
saveAll(false);
}
public synchronized void saveAndRemoveAllGuildDatas() {
for (String key: guildCache.keySet()) {
GuildData guildData = guildCache.get(key);
synchronized (guildData) {
if (guildData.getEpoch() != 0 && guildData.getAccessCount() == 0) {
if (!guildData.getSaved()) {
saveGuildData(key, false);
guildData.saved();
}
Expand All @@ -156,72 +126,110 @@ public void run() {
guildData.resetEpoch();
}
}
for (String key: temp) {
GuildData guildData = guildCache.get(key);
if (guildData.getAccessCount()==0) {
saveGuildData(key, true);
}
}
for (String key: temp) {
GuildData guildData = guildCache.get(key);
if (guildData.getAccessCount()==0) {
saveGuildData(key, true);
}
temp.clear();
for (String key: userCache.keySet()) {
UserData userData = userCache.get(key);
if (userData.getEpoch()!=0 && userData.getAccessCount()==0) {
}
temp.clear();
}
public synchronized void saveAndRemoveAllUserDatas() {
for (String key: userCache.keySet()) {
UserData userData = userCache.get(key);
synchronized(userData) {
if (userData.getEpoch() != 0 && userData.getAccessCount() == 0) {
if (!userData.getSaved()) {
saveUserData(key, false);
userData.saved();
}
if (Instant.now().getEpochSecond()>30 + userData.getEpoch()) {
if (Instant.now().getEpochSecond() > 30 + userData.getEpoch()) {
temp.add(key);
}
} else {
userData.resetEpoch();
}
}
for (String key: temp) {
UserData userData = userCache.get(key);
if (userData.getAccessCount()==0) {
saveUserData(key, true);
}
}
for (String key: temp) {
UserData userData = userCache.get(key);
if (userData.getAccessCount()==0) {
saveUserData(key, true);
}
temp.clear();
for (String key: channelCache.keySet()) {
ChannelData channelData = channelCache.get(key);
if (channelData.getEpoch()!=0 && channelData.getAccessCount()==0) {
}
temp.clear();
}
public synchronized void saveAndRemoveAllChannelDatas() {
for (String key: channelCache.keySet()) {
ChannelData channelData = channelCache.get(key);
synchronized (channelData) {
if (channelData.getEpoch() != 0 && channelData.getAccessCount() == 0) {
if (!channelData.getSaved()) {
saveChannelData(key, false);
channelData.saved();
}
if (Instant.now().getEpochSecond()>30 + channelData.getEpoch()) {
if (Instant.now().getEpochSecond() > 30 + channelData.getEpoch()) {
temp.add(key);
}
}
}
for (String key: temp) {
ChannelData channelData = channelCache.get(key);
if (channelData.getAccessCount()==0) {
saveChannelData(key, true);
}
}
for (String key: temp) {
ChannelData channelData = channelCache.get(key);
if (channelData.getAccessCount()==0) {
saveChannelData(key, true);
}
temp.clear();
for (String key: memberCache.keySet()) {
MemberData memberData = memberCache.get(key);
if (memberData.getEpoch()!=0 && memberData.getAccessCount()==0) {
}
temp.clear();
}
public synchronized void saveAndRemoveAllMemberDatas() {
for (String key: memberCache.keySet()) {
MemberData memberData = memberCache.get(key);
synchronized (memberData) {
if (memberData.getEpoch() != 0 && memberData.getAccessCount() == 0) {
if (!memberData.getSaved()) {
saveMemberData(key, false);
memberData.saved();
}
if (Instant.now().getEpochSecond()>30 + memberData.getEpoch()) {
if (Instant.now().getEpochSecond() > 30 + memberData.getEpoch()) {
temp.add(key);
}
}
}
for (String key: temp) {
MemberData memberData = memberCache.get(key);
if (memberData.getAccessCount()==0) {
saveMemberData(key, true);
}
for (String key: temp) {
MemberData memberData = memberCache.get(key);
if (memberData.getAccessCount()==0) {
saveMemberData(key, true);
}
}
temp.clear();
}
@Override
public void run() {
while(true) {
if (requestToEnd) {
while (Main.threadManager.getState()!=State.TERMINATED) {
try {
sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}
saveAll(true);
break;
}

try {
sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
temp.clear();
saveAndRemoveAllGuildDatas();
saveAndRemoveAllUserDatas();
saveAndRemoveAllChannelDatas();
saveAndRemoveAllMemberDatas();
//TODO: REPEAT FOR ALL ENTITY TYPES
}
}
Expand Down
Loading