Refactor AggregationResponse #368
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vanjaftn
force-pushed
the
refactor-aggregation-response
branch
from
16e1780 to
91f0ac2
Compare
dbulaja98
requested changes
Nov 20, 2023
| @@ -449,7 +449,9 @@ object HttpExecutorSpec extends IntegrationSpec { | |||
| .refreshTrue | |||
| ) | |||
| aggregation = | |||
| termsAggregation(name = "aggregationString", field = TestDocument.stringField.keyword) | |||
| termsAggregation(name = "aggregationString", field = TestDocument.stringField.keyword).withSubAgg( | |||
There was a problem hiding this comment.
Please, update name of this test also.
Comment on lines
-196
to
-199
| case str if str.contains("filter#") => | ||
| Some(field -> data.unsafeAs[FilterAggregationResponse](FilterAggregationResponse.decoder)) |
There was a problem hiding this comment.
Why did you remove filter?
Comment on lines
-238
to
-245
| case str if str.contains("filter#") => | ||
| (field.split("#")(1), data.asInstanceOf[FilterAggregationResponse]) |
| private[elasticsearch] object FilterAggregationResponse extends JsonDecoderOps { | ||
| implicit val decoder: JsonDecoder[FilterAggregationResponse] = Obj.decoder.mapOrFail { case Obj(fields) => | ||
| val allFields = fields.flatMap { case (field, data) => | ||
| private[elasticsearch] sealed trait BucketDecoder extends JsonDecoderOps { |
There was a problem hiding this comment.
Can you please add 'JsonDecoderOps' in this sealed trait too?
vanjaftn
force-pushed
the
refactor-aggregation-response
branch
from
03b3938 to
565db38
Compare
dbulaja98
requested changes
Nov 20, 2023
| Some(field -> data.unsafeAs[Int]) | ||
| case _ => | ||
| val objFields = data.unsafeAs[Obj].fields.toMap | ||
| val allFields = BucketDecoder(fields).allFields |
There was a problem hiding this comment.
Because we are using BucketDecoder this way, maybe we don't even need this class to be implicit and then there is no need for sealed trait.
There was a problem hiding this comment.
If we do this, we should probably revert changes about JsonDecoderOps.
dbulaja98
reviewed
Nov 20, 2023
vanjaftn
force-pushed
the
refactor-aggregation-response
branch
from
565db38 to
d1561c0
Compare
dbulaja98
requested changes
Nov 24, 2023
| @@ -118,6 +118,112 @@ private[elasticsearch] object AvgAggregationResponse { | |||
| implicit val decoder: JsonDecoder[AvgAggregationResponse] = DeriveJsonDecoder.gen[AvgAggregationResponse] | |||
| } | |||
|
|
|||
| case class BucketDecoder(fields: Chunk[(String, Json)]) extends JsonDecoderOps { | |||
There was a problem hiding this comment.
Make this case class private.
Comment on lines
270
to
272
| val allFields = BucketDecoder(fields).allFields | ||
| val docCount = allFields("doc_count").asInstanceOf[Int] | ||
| val subAggs = BucketDecoder(fields).subAggs |
There was a problem hiding this comment.
You are creating this two times BucketDecoder(fields). Extract this in val before these three vals.
| } | ||
| } | ||
| }.toMap | ||
| val allFields = BucketDecoder(fields).allFields |
vanjaftn
force-pushed
the
refactor-aggregation-response
branch
from
e0bf016 to
87b054d
Compare
dbulaja98
approved these changes
Dec 2, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.