Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix study ingestor stream zipping #384

Merged
merged 2 commits into from
Dec 4, 2024
Merged

Fix study ingestor stream zipping #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6db210
Use merge instead of zip study pulling stream
lenguyenthanh Dec 4, 2024
6ed509b
Ony save time when result contains timestamp
lenguyenthanh Dec 4, 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
11 changes: 6 additions & 5 deletions modules/ingestor/src/main/scala/ingestor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ object Ingestor:
.eval(startAt)
.flatMap(repo.watch)
.evalMap: result =>
updateElastic(result, false) *> saveLastIndexedTimestamp(index, result.timestamp)
updateElastic(result, false) *> saveLastIndexedTimestamp(result.timestamp)
.compile
.drain

Expand Down Expand Up @@ -87,7 +87,8 @@ object Ingestor:
.whenA(sources.nonEmpty)
*> Logger[IO].info(s"Indexed ${sources.size} ${index.value}s")

private def saveLastIndexedTimestamp(index: Index, time: Option[Instant]): IO[Unit] =
val savedTime = time.getOrElse(Instant.now())
store.put(index.value, savedTime)
*> Logger[IO].info(s"Stored last indexed time ${savedTime.getEpochSecond} for $index")
private val saveLastIndexedTimestamp: Option[Instant] => IO[Unit] =
_.traverse_(time =>
store.put(index.value, time)
*> Logger[IO].info(s"Stored last indexed time ${time.getEpochSecond} for $index")
)
2 changes: 1 addition & 1 deletion modules/ingestor/src/main/scala/mongo.chapter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,5 @@ object ChapterRepo:
coll
.aggregateWithCodec[StudyData](Query.aggregate(ids))
.all
.flatTap(docs => Logger[IO].debug(s"Received $docs chapters"))
// .flatTap(docs => Logger[IO].debug(s"Received $docs chapters"))
.map(_.map(x => x._id -> x).toMap)
17 changes: 9 additions & 8 deletions modules/ingestor/src/main/scala/mongo.study.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ object StudyRepo:

def fetch(since: Instant, until: Instant): fs2.Stream[IO, Result[StudySource]] =
fs2.Stream.eval(info"Fetching studies from $since to $until") *>
pullAndIndex(since, until)
.zip(pullAndDelete(since, until))
.map((toIndex, toDelete) => Result(toIndex, toDelete, until.some))
pullForIndex(since, until)
.merge(pullForDelete(since, until))
++ fs2.Stream(Result(Nil, Nil, until.some))

def pullAndIndex(since: Instant, until: Instant) =
def pullForIndex(since: Instant, until: Instant): fs2.Stream[IO, Result[StudySource]] =
val filter = range(F.createdAt)(since, until.some)
.or(range(F.updatedAt)(since, until.some))
studies
Expand All @@ -55,10 +55,11 @@ object StudyRepo:
.boundedStream(config.batchSize)
.chunkN(config.batchSize)
.map(_.toList)
.evalTap(_.traverse_(x => debug"received $x"))
// .evalTap(_.traverse_(x => debug"received $x"))
.evalMap(_.toSources)
.map(Result(_, Nil, none))

def pullAndDelete(since: Instant, until: Instant) =
def pullForDelete(since: Instant, until: Instant): fs2.Stream[IO, Result[StudySource]] =
val filter =
Filter
.gte("ts", since.asBsonTimestamp)
Expand All @@ -72,6 +73,7 @@ object StudyRepo:
.chunkN(config.batchSize)
.map(_.toList.flatMap(extractId))
.evalTap(xs => info"Deleting $xs")
.map(Result(Nil, _, none))

def extractId(doc: Document): Option[Id] =
doc.getNestedAs[String](F.oplogId).map(Id.apply)
Expand All @@ -91,8 +93,7 @@ object StudyRepo:
chapters
.byStudyIds(studyIds)
.flatMap: chapters =>
docs
.traverseFilter(_.toSource(chapters))
docs.traverseFilter(_.toSource(chapters))

type StudySourceWithId = (String, StudySource)
extension (doc: Document)
Expand Down
Loading