removed locks, switching to WAL for SQLite default
This commit is contained in:
@@ -14,7 +14,6 @@ import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"io"
|
||||
"net/http"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -28,17 +27,15 @@ type DemoParser struct {
|
||||
demoQueue chan *Demo
|
||||
tempDir string
|
||||
db *ent.Client
|
||||
lock *sync.RWMutex
|
||||
}
|
||||
|
||||
type DemoNotFoundError struct {
|
||||
error
|
||||
}
|
||||
|
||||
func (p *DemoParser) Setup(db *ent.Client, lock *sync.RWMutex, worker int) error {
|
||||
func (p *DemoParser) Setup(db *ent.Client, worker int) error {
|
||||
p.demoQueue = make(chan *Demo, 1000)
|
||||
p.db = db
|
||||
p.lock = lock
|
||||
for i := 0; i < worker; i++ {
|
||||
go p.parseWorker()
|
||||
}
|
||||
@@ -70,13 +67,11 @@ func (p *DemoParser) downloadReplay(demo *Demo) (io.Reader, error) {
|
||||
}
|
||||
|
||||
func (p *DemoParser) getDBPlayer(demo *Demo, demoPlayer *common.Player) (*ent.Stats, error) {
|
||||
p.lock.RLock()
|
||||
tMatchPlayer, err := p.db.Stats.Query().WithMatches(func(q *ent.MatchQuery) {
|
||||
q.Where(match.ID(demo.MatchId))
|
||||
}).WithPlayers(func(q *ent.PlayerQuery) {
|
||||
q.Where(player.ID(demoPlayer.SteamID64))
|
||||
}).Only(context.Background())
|
||||
p.lock.RUnlock()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -108,9 +103,7 @@ func (p *DemoParser) parseWorker() {
|
||||
continue
|
||||
}
|
||||
|
||||
p.lock.RLock()
|
||||
tMatch, err := p.db.Match.Get(context.Background(), demo.MatchId)
|
||||
p.lock.RUnlock()
|
||||
if err != nil {
|
||||
log.Errorf("[DP] Unable to get match %d: %v", demo.MatchId, err)
|
||||
continue
|
||||
@@ -139,9 +132,7 @@ func (p *DemoParser) parseWorker() {
|
||||
}
|
||||
downloadTime := time.Now().Sub(startTime)
|
||||
|
||||
p.lock.RLock()
|
||||
tStats, err := tMatch.QueryStats().WithPlayers().All(context.Background())
|
||||
p.lock.RUnlock()
|
||||
if err != nil {
|
||||
log.Errorf("[DP] Failed to find players for match %d: %v", demo.MatchId, err)
|
||||
continue
|
||||
@@ -294,9 +285,7 @@ func (p *DemoParser) parseWorker() {
|
||||
continue
|
||||
}
|
||||
|
||||
p.lock.Lock()
|
||||
err = tMatch.Update().SetMap(demoParser.Header().MapName).SetDemoParsed(true).Exec(context.Background())
|
||||
p.lock.Unlock()
|
||||
if err != nil {
|
||||
log.Errorf("[DP] Unable to update match %d in database: %v", demo.MatchId, err)
|
||||
continue
|
||||
@@ -307,7 +296,6 @@ func (p *DemoParser) parseWorker() {
|
||||
tMatchPlayer.Color = stats.ColorGrey
|
||||
}
|
||||
|
||||
p.lock.Lock()
|
||||
nMatchPLayer, err := tMatchPlayer.Update().
|
||||
SetDmgTeam(tMatchPlayer.DmgTeam).
|
||||
SetDmgEnemy(tMatchPlayer.DmgEnemy).
|
||||
@@ -328,25 +316,20 @@ func (p *DemoParser) parseWorker() {
|
||||
SetDmgTeam(tMatchPlayer.DmgTeam).
|
||||
SetDmgEnemy(tMatchPlayer.DmgEnemy).
|
||||
Save(context.Background())
|
||||
p.lock.Unlock()
|
||||
if err != nil {
|
||||
log.Errorf("[DP] Unable to update stats %d in database: %v", tMatchPlayer.PlayerStats, err)
|
||||
continue
|
||||
}
|
||||
|
||||
for _, eqDmg := range eqMap[tMatchPlayer.PlayerStats] {
|
||||
p.lock.Lock()
|
||||
err := p.db.WeaponStats.Create().SetStat(nMatchPLayer).SetDmg(eqDmg.Dmg).SetVictim(eqDmg.To).SetHitGroup(eqDmg.HitGroup).SetEqType(eqDmg.Eq).Exec(context.Background())
|
||||
p.lock.Unlock()
|
||||
if err != nil {
|
||||
log.Errorf("[DP] Unable to create WeaponStat: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
for _, eco := range ecoMap[tMatchPlayer.PlayerStats] {
|
||||
p.lock.Lock()
|
||||
err := p.db.RoundStats.Create().SetStat(nMatchPLayer).SetRound(uint(eco.Round)).SetBank(uint(eco.Bank)).SetEquipment(uint(eco.EqV)).SetSpent(uint(eco.Spent)).Exec(context.Background())
|
||||
p.lock.Unlock()
|
||||
if err != nil {
|
||||
log.Errorf("[DP] Unable to create RoundStat: %v", err)
|
||||
}
|
||||
|
Reference in New Issue
Block a user