ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

xp tracker service: fix deadlock acquiring connections

Browse Source
This commit is contained in:
Adam
2018-04-25 15:31:09 -04:00
parent fd32f532ac
commit b0225770ac
1 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
http-service/src/main/java/net/runelite/http/service/xp/XpTrackerService.java
View File

@@ -62,9 +62,9 @@ public class XpTrackerService
{ {
try (Connection con = sql2o.open()) try (Connection con = sql2o.open())
{ {
PlayerEntity playerEntity = findOrCreatePlayer(username); PlayerEntity playerEntity = findOrCreatePlayer(con, username);
XpEntity currentXp = findXpAtTime(username, Instant.now()); XpEntity currentXp = findXpAtTime(con, username, Instant.now());
if (currentXp != null) if (currentXp != null)
{ {
XpData hiscoreData = XpMapper.INSTANCE.hiscoreResultToXpData(hiscoreResult); XpData hiscoreData = XpMapper.INSTANCE.hiscoreResultToXpData(hiscoreResult);
@@ -139,43 +139,45 @@ public class XpTrackerService
} }
} }
private synchronized PlayerEntity findOrCreatePlayer(String username) private synchronized PlayerEntity findOrCreatePlayer(Connection con, String username)
{ {
try (Connection con = sql2o.open()) PlayerEntity playerEntity = con.createQuery("select * from player where name = :name")
.addParameter("name", username)
.executeAndFetchFirst(PlayerEntity.class);
if (playerEntity != null)
{ {
PlayerEntity playerEntity = con.createQuery("select * from player where name = :name")
.addParameter("name", username)
.executeAndFetchFirst(PlayerEntity.class);
if (playerEntity != null)
{
return playerEntity;
}
Instant now = Instant.now();
int id = con.createQuery("insert into player (name, tracked_since) values (:name, :tracked_since)")
.addParameter("name", username)
.addParameter("tracked_since", now)
.executeUpdate()
.getKey(int.class);
playerEntity = new PlayerEntity();
playerEntity.setId(id);
playerEntity.setName(username);
playerEntity.setTracked_since(now);
return playerEntity; return playerEntity;
} }
Instant now = Instant.now();
int id = con.createQuery("insert into player (name, tracked_since) values (:name, :tracked_since)")
.addParameter("name", username)
.addParameter("tracked_since", now)
.executeUpdate()
.getKey(int.class);
playerEntity = new PlayerEntity();
playerEntity.setId(id);
playerEntity.setName(username);
playerEntity.setTracked_since(now);
return playerEntity;
}
private XpEntity findXpAtTime(Connection con, String username, Instant time)
{
return con.createQuery("select * from xp join player on player.id=xp.player where player.name = :username and time <= :time order by time desc limit 1")
.throwOnMappingFailure(false)
.addParameter("username", username)
.addParameter("time", time)
.executeAndFetchFirst(XpEntity.class);
} }
public XpEntity findXpAtTime(String username, Instant time) public XpEntity findXpAtTime(String username, Instant time)
{ {
try (Connection con = sql2o.open()) try (Connection con = sql2o.open())
{ {
return con.createQuery("select * from xp join player on player.id=xp.player where player.name = :username and time <= :time order by time desc limit 1") return findXpAtTime(con, username, time);
.throwOnMappingFailure(false)
.addParameter("username", username)
.addParameter("time", time)
.executeAndFetchFirst(XpEntity.class);
} }
} }
} }