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

Set track_total_hits to false when without sort #233

Merged
merged 6 commits into from
May 30, 2023
Merged

Set track_total_hits to false when without sort #233

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80de3dc
Set track_total_hits to false without sort
mvelimir May 30, 2023
48ef5c9
Use toJson extension method for elastic primitives
mvelimir May 30, 2023
f41b03d
Return a more specific error
mvelimir May 30, 2023
e015532
Remove unused import
mvelimir May 30, 2023
579e1d5
Add full stop at the end of the exception message
mvelimir May 30, 2023
df66ae6
Format code
mvelimir May 30, 2023
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
2 changes: 1 addition & 1 deletion modules/library/src/main/scala/zio/elasticsearch/executor/HttpExecutor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ private[elasticsearch] final class HttpExecutor private (esConfig: ElasticConfig

val sortsJson =
if (r.sortBy.isEmpty) {
Obj("sort" -> Arr(ShardDoc.toJson))
Obj("sort" -> Arr(ShardDoc.toJson), "track_total_hits" -> false.toJson)
} else {
Obj("sort" -> Arr(r.sortBy.map(_.toJson)))
}
Expand Down
2 changes: 1 addition & 1 deletion modules/library/src/main/scala/zio/elasticsearch/executor/response/Hits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import zio.Chunk
import zio.json.{DeriveJsonDecoder, JsonDecoder, jsonField}

private[elasticsearch] final case class Hits(
total: Total,
total: Option[Total],
@jsonField("max_score")
maxScore: Option[Double] = None,
hits: Chunk[Hit]
Expand Down
11 changes: 9 additions & 2 deletions modules/library/src/main/scala/zio/elasticsearch/result/ElasticResult.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ final class SearchResult private[elasticsearch] (

lazy val response: UIO[SearchWithAggregationsResponse] = ZIO.succeed(fullResponse)

lazy val total: UIO[Long] = ZIO.succeed(fullResponse.hits.total.value)
lazy val total: IO[ElasticException, Long] = ZIO
.fromOption(fullResponse.hits.total)
.map(_.value)
.mapError(_ => new ElasticException("Total hits are not being tracked."))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you put ZIO in next line to be consistent with other changes?

}

final class SearchAndAggregateResult private[elasticsearch] (
Expand Down Expand Up @@ -104,5 +107,9 @@ final class SearchAndAggregateResult private[elasticsearch] (

lazy val response: UIO[SearchWithAggregationsResponse] = ZIO.succeed(fullResponse)

lazy val total: UIO[Long] = ZIO.succeed(fullResponse.hits.total.value)
lazy val total: IO[ElasticException, Long] =
ZIO
.fromOption(fullResponse.hits.total)
.map(_.value)
.mapError(_ => new ElasticException("Total hits are not being tracked."))
}