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

Jump to bottom

Filter getBlobbers and getValidators for is_killed and is_shutdown #2316

Merged
merged 15 commits into from
May 4, 2023
Merged

Filter getBlobbers and getValidators for is_killed and is_shutdown #2316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
978b3e3
remove is_killed and is_shutdown
Sriep Apr 19, 2023
c69f313
Merge remote-tracking branch 'origin/staging' into filter_getblobbers
Sriep Apr 21, 2023
a9b7e7f
Merge branch 'staging' into filter_getblobbers
dabasov Apr 23, 2023
a00b6b2
Merge remote-tracking branch 'origin/staging' into filter_getblobbers
Sriep Apr 24, 2023
9ea6038
Merge remote-tracking branch 'origin/filter_getblobbers' into filter_…
Sriep Apr 24, 2023
9975c67
Merge remote-tracking branch 'origin/staging' into filter_getblobbers
Sriep Apr 25, 2023
6b76bd0
Merge branch 'staging' into filter_getblobbers
peterlimg Apr 26, 2023
14ca41d
Merge remote-tracking branch 'origin/staging' into filter_getblobbers
Sriep Apr 26, 2023
f5aa558
Merge remote-tracking branch 'origin/filter_getblobbers' into filter_…
Sriep Apr 26, 2023
e6e6f5c
Merge remote-tracking branch 'origin/staging' into filter_getblobbers
Sriep Apr 27, 2023
d18872e
Merge remote-tracking branch 'origin/staging' into filter_getblobbers
Sriep Apr 28, 2023
a39fbec
Merge remote-tracking branch 'origin/staging' into filter_getblobbers
Sriep May 1, 2023
756c98e
Merge remote-tracking branch 'origin/staging' into filter_getblobbers
Sriep May 2, 2023
c3aae89
Merge remote-tracking branch 'origin/staging' into filter_getblobbers
Sriep May 4, 2023
d1e46b4
Merge branch 'staging' into filter_getblobbers
Kishan-Dhakan May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 15 additions & 8 deletions code/go/0chain.net/smartcontract/dbs/event/blobber.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,13 @@ func (edb *EventDb) GetBlobbers(limit common2.Pagination) ([]Blobber, error) {
var blobbers []Blobber
result := edb.Store.Get().
Preload("Rewards").
Model(&Blobber{}).Offset(limit.Offset).Limit(limit.Limit).Order(clause.OrderByColumn{
Column: clause.Column{Name: "capacity"},
Desc: limit.IsDescending,
}).Find(&blobbers)
Model(&Blobber{}).Offset(limit.Offset).
Where("is_killed = ? AND is_shutdown = ?", false, false).
Limit(limit.Limit).
Order(clause.OrderByColumn{
Column: clause.Column{Name: "capacity"},
Desc: limit.IsDescending,
}).Find(&blobbers)

return blobbers, result.Error
}
Expand All @@ -98,10 +101,13 @@ func (edb *EventDb) GetActiveBlobbers(limit common2.Pagination) ([]Blobber, erro
result := edb.Store.Get().
Preload("Rewards").
Model(&Blobber{}).Offset(limit.Offset).
Where("last_health_check > ?", common.ToTime(now).Add(-ActiveBlobbersTimeLimit).Unix()).Limit(limit.Limit).Order(clause.OrderByColumn{
Column: clause.Column{Name: "capacity"},
Desc: limit.IsDescending,
}).Find(&blobbers)
Where("last_health_check > ? AND is_killed = ? AND is_shutdown = ?",
common.ToTime(now).Add(-ActiveBlobbersTimeLimit).Unix(), false, false).
Limit(limit.Limit).
Order(clause.OrderByColumn{
Column: clause.Column{Name: "capacity"},
Desc: limit.IsDescending,
}).Find(&blobbers)
return blobbers, result.Error
}

Expand All @@ -111,6 +117,7 @@ func (edb *EventDb) GetBlobbersByRank(limit common2.Pagination) ([]string, error
result := edb.Store.Get().
Model(&Blobber{}).
Select("id").
Where("is_killed = ? AND is_shutdown = ?", false, false).
Offset(limit.Offset).Limit(limit.Limit).
Order(clause.OrderByColumn{
Column: clause.Column{Name: "rank_metric"},
Expand Down
8 changes: 6 additions & 2 deletions code/go/0chain.net/smartcontract/dbs/event/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ func (edb *EventDb) GetValidators(pg common2.Pagination) ([]Validator, error) {
result := edb.Store.Get().
Preload("Rewards").
Model(&Validator{}).
Offset(pg.Offset).Limit(pg.Limit).
Where("is_killed = ? AND is_shutdown = ?", false, false).
Offset(pg.Offset).
Limit(pg.Limit).
Order(clause.OrderByColumn{
Column: clause.Column{Name: "id"},
Desc: pg.IsDescending,
Expand All @@ -111,7 +113,9 @@ func (edb *EventDb) GetActiveValidators(pg common2.Pagination) ([]Validator, err
result := edb.Store.Get().
Preload("Rewards").
Model(&Validator{}).
Where("last_health_check > ?", common.ToTime(now).Add(-ActiveBlobbersTimeLimit).Unix()).Limit(pg.Limit).
Where("last_health_check > ? AND is_killed = ? AND is_shutdown = ?",
common.ToTime(now).Add(-ActiveBlobbersTimeLimit).Unix(), false, false).
Limit(pg.Limit).
Order(clause.OrderByColumn{
Column: clause.Column{Name: "id"},
Desc: pg.IsDescending,
Expand Down