optimize and cache simul count - also remove dangling debug

lichess-org · Jun 12, 2023 · 00c5b58 · 00c5b58
1 parent 562dade
commit 00c5b58
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/mashup/UserInfo.scala b/app/mashup/UserInfo.scala
@@ -125,7 +125,7 @@ object UserInfo:
  postApi.nbByUser(user.id).mon(_.user segment "nbForumPosts") zip
  (withUblog ?? ublogApi.userBlogPreviewFor(user, 3, ctx.me)) zip
  studyRepo.countByOwner(user.id).recoverDefault.mon(_.user segment "nbStudies") zip
- simulApi.nbHostedByUser(user.id).mon(_.user segment "nbSimuls").thenPp zip
+ simulApi.countHostedByUser.get(user.id).mon(_.user segment "nbSimuls") zip
  userApi.getTrophiesAndAwards(user).mon(_.user segment "trophies") zip
  teamApi.joinedTeamIdsOfUserAsSeenBy(user, ctx.me).mon(_.user segment "teamIds") zip
  coachApi.isListedCoach(user).mon(_.user segment "coach") zip

diff --git a/modules/simul/src/main/SimulApi.scala b/modules/simul/src/main/SimulApi.scala
@@ -234,7 +234,10 @@ final class SimulApi(
  maxPerPage = MaxPerPage(20)
  )
 
- def nbHostedByUser(userId: UserId): Fu[Int] = repo.byHostAdapter(userId).nbResults
+ object countHostedByUser:
+ private val cache = cacheApi[UserId, Int](1024, "simul.nb.hosted"):
+ _.expireAfterWrite(10 minutes).buildAsyncFuture(repo.countByHost)
+ export cache.get
 
  private def makeGame(simul: Simul, host: User)(
  pairing: SimulPairing,

diff --git a/modules/simul/src/main/SimulRepo.scala b/modules/simul/src/main/SimulRepo.scala
@@ -73,7 +73,7 @@ final private[simul] class SimulRepo(val coll: Coll)(using Executor):
  .listAll()
 
  def byHostAdapter(hostId: UserId) =
- new lila.db.paginator.Adapter[Simul](
+ lila.db.paginator.Adapter[Simul](
  collection = coll,
  selector = finishedSelect ++ $doc("hostId" -> hostId),
  projection = none,
@@ -84,6 +84,8 @@ final private[simul] class SimulRepo(val coll: Coll)(using Executor):
  def hostId(id: SimulId): Fu[Option[UserId]] =
  coll.primitiveOne[UserId]($id(id), "hostId")
 
+ def countByHost(hostId: UserId) = coll.countSel($doc("hostId" -> hostId))
+
  private val featurableSelect = $doc("featurable" -> true)
 
  def allCreatedFeaturable: Fu[List[Simul]] =