Implement geo API in test executor #446
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
mijicd
reviewed
Sep 20, 2021
Comment on lines
124
to
125
| val key = input.head.asString | ||
| val unit = input.last.asString match { |
| orWrongType(isSortedSet(key))( | ||
| for { | ||
| scoreMap <- sortedSets.getOrElse(key, Map.empty) | ||
| hashes = members collect scoreMap |
There was a problem hiding this comment.
Please don't use functions as operators.
Comment on lines
162
to
165
| hashOption.map { hash => | ||
| val geoHash = Hash.asGeoHash(hash.toLong) | ||
| RespValue.bulkString(geoHash) | ||
| }.getOrElse(RespValue.NullBulkString) |
There was a problem hiding this comment.
Prefer fold to map + getOrElse. Less important, avoid long expressions in yield. You can calculate the array contents before.
Comment on lines
179
to
186
| hashes.map { hashOption => | ||
| hashOption.map { hash => | ||
| val longLat = Hash.decodeHash(hash.toLong) | ||
| RespValue.array( | ||
| RespValue.bulkString(longLat.longitude.toString), | ||
| RespValue.bulkString(longLat.latitude.toString) | ||
| ) | ||
| }.getOrElse(RespValue.NullArray) |
| ) | ||
|
|
||
| case api.Geo.GeoPos => | ||
| val key = input.head.asString |
| case api.Geo.GeoRadius => | ||
| val stringInput = input.map(_.asString) | ||
|
|
||
| val key = stringInput.head |
Comment on lines
203
to
205
| val withCoord = stringInput.find(_ == "WITHCOORD") | ||
| val withDist = stringInput.find(_ == "WITHDIST") | ||
| val withHash = stringInput.find(_ == "WITHHASH") |
There was a problem hiding this comment.
WithCoord, WithDist and WithHash have stringify methods. Use it instead of raw values. Technically speaking it's less efficient but it reduces the amount of magic values roaming around the code.
Comment on lines
206
to
219
| val count = stringInput.toList.sliding(2) collectFirst { case "COUNT" :: count :: _ => | ||
| count.toInt | ||
| } | ||
| val order = stringInput collectFirst { | ||
| case "ASC" => Order.Ascending | ||
| case "DESC" => Order.Descending | ||
| } | ||
| val store = stringInput.toList.sliding(2) collectFirst { case "STORE" :: key :: _ => | ||
| key | ||
| } | ||
| val storeDist = stringInput.toList.sliding(2) collectFirst { case "STOREDIST" :: key :: _ => | ||
| key | ||
| } | ||
|
|
There was a problem hiding this comment.
Please don't use functions as operators. Also, take care of the "magic" values.
| case api.Geo.GeoRadiusByMember => | ||
| val stringInput = input.map(_.asString) | ||
|
|
||
| val key = stringInput.head |
Comment on lines
292
to
307
| val withCoord = stringInput.find(_ == "WITHCOORD") | ||
| val withDist = stringInput.find(_ == "WITHDIST") | ||
| val withHash = stringInput.find(_ == "WITHHASH") | ||
| val count = stringInput.toList.sliding(2) collectFirst { case "COUNT" :: count :: _ => | ||
| count.toInt | ||
| } | ||
| val order = stringInput collectFirst { | ||
| case "ASC" => Order.Ascending | ||
| case "DESC" => Order.Descending | ||
| } | ||
| val store = stringInput.toList.sliding(2) collectFirst { case "STORE" :: key :: _ => | ||
| key | ||
| } | ||
| val storeDist = stringInput.toList.sliding(2) collectFirst { case "STOREDIST" :: key :: _ => | ||
| key | ||
| } |
There was a problem hiding this comment.
Checkout the remarks given above.
mijicd
approved these changes
Sep 29, 2021
Comment on lines
+2417
to
+2437
| private[this] def orMissingParameter2[A, B](paramA: Option[A], paramB: Option[B])( | ||
| program: (A, B) => USTM[RespValue] | ||
| ): USTM[RespValue] = | ||
| apply(apply(Some(program.curried))(paramA))(paramB).getOrElse(STM.succeedNow(Replies.Error)) | ||
|
|
||
| private[this] def orMissingParameter3[A, B, C](paramA: Option[A], paramB: Option[B], paramC: Option[C])( | ||
| program: (A, B, C) => USTM[RespValue] | ||
| ): USTM[RespValue] = | ||
| apply(apply(apply(Some(program.curried))(paramA))(paramB))(paramC).getOrElse(STM.succeedNow(Replies.Error)) | ||
|
|
||
| private[this] def orMissingParameter4[A, B, C, D]( | ||
| paramA: Option[A], | ||
| paramB: Option[B], | ||
| paramC: Option[C], | ||
| paramD: Option[D] | ||
| )( | ||
| program: (A, B, C, D) => USTM[RespValue] | ||
| ): USTM[RespValue] = | ||
| apply(apply(apply(apply(Some(program.curried))(paramA))(paramB))(paramC))(paramD) | ||
| .getOrElse(STM.succeedNow(Replies.Error)) | ||
|
|
There was a problem hiding this comment.
As discussed, we can later replace this apply reimplementation with the existing stuff present in zio-prelude.
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.
Resolves #191