option to index a given number of games

joeyksclark · Sep 2, 2015 · 636fc18 · 636fc18
1 parent d29254f
commit 636fc18
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/modules/gameSearch/src/main/Env.scala b/modules/gameSearch/src/main/Env.scala
@@ -39,7 +39,8 @@ final class Env(
  import akka.pattern.ask
  private implicit def timeout = makeTimeout minutes 60
  def process = {
- case "game" :: "search" :: "reset" :: Nil => api.reset inject "done"
+ case "game" :: "search" :: "reset" :: Nil => api.reset(none) inject "done"
+ case "game" :: "search" :: "reset" :: nb :: Nil => api.reset(parseIntOption(nb)) inject "done"
  }
  }
 }

diff --git a/modules/gameSearch/src/main/GameSearchApi.scala b/modules/gameSearch/src/main/GameSearchApi.scala
@@ -49,7 +49,7 @@ final class GameSearchApi(client: ESClient) extends SearchReadApi[Game, Query] {
  Fields.blackUser -> game.blackPlayer.userId
  ).noNull
 
- def reset = client.putMapping >> {
+ def reset(max: Option[Int]) = client.putMapping >> {
  import lila.db.api._
  import lila.game.tube.gameTube
  var nb = 0
@@ -58,7 +58,7 @@ final class GameSearchApi(client: ESClient) extends SearchReadApi[Game, Query] {
  for {
  size <- $count($select.all)
  batchSize = 2000
- limit = Int.MaxValue
+ limit = max | Int.MaxValue
  _ <- $enumerate.bulk[Option[Game]]($query.all, batchSize, limit) { gameOptions =>
  val games = gameOptions.flatten filter storable
  val nbGames = games.size
@@ -72,7 +72,7 @@ final class GameSearchApi(client: ESClient) extends SearchReadApi[Game, Query] {
  nbSkipped = nbSkipped + gameOptions.size - nbGames
  val perS = (batchSize * 1000) / math.max(1, (nowMillis - started))
  started = nowMillis
- loginfo("[game search] Indexed %d of %d, skipped %d, at %d/s".format(nb, size, nbSkipped, perS))
+ loginfo("[game search] Indexed %d of %d, skipped %d, at %d/s".format(nb + nbSkipped, size, nbSkipped, perS))
  }
  }
  } yield ()