Implement sorting functionality and add total_supply for Universe Ass… #485
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
guggero
reviewed
Sep 5, 2023
tapdb/sqlc/queries/universe.sql
Outdated
| WHEN sqlc.narg('sort_by') = 'genesis_height' THEN asset_info.genesis_height | ||
| ELSE NULL | ||
| END | ||
| CASE WHEN sqlc.narg('sort_by') = 'asset_id' AND sqlc.narg('sort_direction') = 0 THEN asset_info.asset_id END ASC, |
There was a problem hiding this comment.
Can we unify the formatting here a bit so it's easier to read on narrow terminals? We aim at ~80 characters for those who like to have many rows of vim open.
Also, the ASC is kind of superfluous as it's the default.
My suggestion:
ORDER BY
CASE WHEN sqlc.narg('sort_by') = 'asset_id' AND sqlc.narg('sort_direction') = 0 THEN
asset_info.asset_id END,
CASE WHEN sqlc.narg('sort_by') = 'asset_id' AND sqlc.narg('sort_direction') = 1 THEN
asset_info.asset_id END DESC ,
CASE WHEN sqlc.narg('sort_by') = 'asset_name' AND sqlc.narg('sort_direction') = 0 THEN
asset_info.asset_name END,
CASE WHEN sqlc.narg('sort_by') = 'asset_name' AND sqlc.narg('sort_direction') = 1 THEN
asset_info.asset_name END DESC ,
CASE WHEN sqlc.narg('sort_by') = 'asset_type' AND sqlc.narg('sort_direction') = 0 THEN
asset_info.asset_type END,
CASE WHEN sqlc.narg('sort_by') = 'asset_type' AND sqlc.narg('sort_direction') = 1 THEN
asset_info.asset_type END DESC,
CASE WHEN sqlc.narg('sort_by') = 'total_syncs' AND sqlc.narg('sort_direction') = 0 THEN
universe_stats.total_asset_syncs END,
CASE WHEN sqlc.narg('sort_by') = 'total_syncs' AND sqlc.narg('sort_direction') = 1 THEN
universe_stats.total_asset_syncs END DESC,
CASE WHEN sqlc.narg('sort_by') = 'total_proofs' AND sqlc.narg('sort_direction') = 0 THEN
universe_stats.total_asset_proofs END,
CASE WHEN sqlc.narg('sort_by') = 'total_proofs' AND sqlc.narg('sort_direction') = 1 THEN
universe_stats.total_asset_proofs END DESC,
CASE WHEN sqlc.narg('sort_by') = 'genesis_height' AND sqlc.narg('sort_direction') = 0 THEN
asset_info.genesis_height END,
CASE WHEN sqlc.narg('sort_by') = 'genesis_height' AND sqlc.narg('sort_direction') = 1 THEN
asset_info.genesis_height END DESC,
CASE WHEN sqlc.narg('sort_by') = 'total_supply' AND sqlc.narg('sort_direction') = 0 THEN
asset_supply END,
CASE WHEN sqlc.narg('sort_by') = 'total_supply' AND sqlc.narg('sort_direction') = 1 THEN
asset_supply END DESC
LIMIT @num_limit OFFSET @num_offset;
tapdb/universe_stats_test.go
Outdated
| @@ -247,81 +247,247 @@ func TestUniverseQuerySyncStatsSorting(t *testing.T) { | |||
|
|
|||
| // sortCheck is used to generate an IsSorted func bound to the | |||
| // response, for each sort type below. | |||
| type sortCheck func([]universe.AssetSyncSnapshot) func(i, j int) bool | |||
| type sortCheck func([]universe.AssetSyncSnapshot, universe.SortDirection) func(i, j int) bool | |||
There was a problem hiding this comment.
nit: line length, break before universe.SortDirection.
tapdb/universe_stats_test.go
Outdated
|
|
||
| return func(i, j int) bool { | ||
| return s[i].AssetName < s[j].AssetName | ||
| if d == universe.SortAscending { |
There was a problem hiding this comment.
We could extract all of these individual isSortedFunc into a single one, now that they have become a bit more complicated.
For example:
isSorted := func(s []universe.AssetSyncSnapshot,
t universe.SyncStatsSort,
d universe.SortDirection) func(i, j int) bool {
asc := d == universe.SortAscending
desc := d == universe.SortDescending
return func(i, j int) bool {
switch {
case t == universe.SortByAssetName && asc:
return s[i].AssetName < s[j].AssetName
case t == universe.SortByAssetName && desc:
return s[i].AssetName > s[j].AssetName
...
}
}
}
|
Thanks very much for the PR! @jamaljsr will test shortly |
|
tACK. I tested the functionality. LGTM 👌 |
guggero
approved these changes
Sep 6, 2023
|
Hey @ben2077 we'd love to get this PR in by the 14th, do you think that's possible? |
|
no problem. |
ben2077
force-pushed
the
opt_sort_by_assset
branch
from
4876be9 to
9760697
Compare
…et Stats - Introduced ascending and descending sorting options for the Universe Asset Stats query. - Added 'total_supply' field to Universe Asset Stats, enhancing the available dataset. - Enhanced TestUniverseQuerySyncStatsSortingDirection to validate new sorting mechanisms and the inclusion of total_supply. - Optimized SQL for efficient sorting based on user-selected parameters.
ben2077
force-pushed
the
opt_sort_by_assset
branch
from
017003e to
280012c
Compare
Roasbeef
approved these changes
Sep 12, 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.
Implement sorting functionality and add total_supply for Universe Asset Stats