Skip to content

Commit 3612a0b

Browse files
author
Joseph Smith
committed
Log timing after future completes
1 parent 7dabe4a commit 3612a0b

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

media-api/app/lib/elasticsearch/ElasticSearch.scala

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,8 @@ class ElasticSearch(
352352
// Assigning to vals here eagerly starts both requests, so they run in
353353
// parallel. The for-comprehension below only sequences the *combination*
354354
// of their results, not their execution.
355-
val lexicalSearchResponse = executeAndLog(withSearchQueryTimeout(lexicalSearchRequest), "lexical")
356-
val semanticSearchResponse = executeAndLog(withSearchQueryTimeout(semanticSearchRequest), "semantic")
355+
val lexicalSearchResponse = executeAndLog(withSearchQueryTimeout(lexicalSearchRequest), "lexical-fill-scores")
356+
val semanticSearchResponse = executeAndLog(withSearchQueryTimeout(semanticSearchRequest), "semantic-fill-scores")
357357

358358
for {
359359
lexical <- lexicalSearchResponse
@@ -397,11 +397,14 @@ class ElasticSearch(
397397

398398
if (fillScores) {
399399
val searchResults = fillScoresSearch(query, queryEmbeddingDouble, k, numCandidates, vecWeight, filterOpt)
400-
val elapsed = stopwatch.elapsed
401-
logger.info(
402-
combineMarkers(logMarker, elapsed),
403-
s"hybrid search (fill scores) completed in ${elapsed.toMillis} ms"
404-
)
400+
searchResults.foreach { _ =>
401+
val elapsed = stopwatch.elapsed
402+
logger.info(
403+
combineMarkers(logMarker, elapsed),
404+
s"hybrid search (fill scores) completed in ${elapsed.toMillis} ms"
405+
)
406+
}
407+
405408
searchResults
406409
} else {
407410
for {

0 commit comments

Comments
 (0)