Add an extra filplus counter

This commit is contained in:
Peter Rabbitson 2020-12-04 17:59:47 +00:00 committed by Peter Rabbitson
parent 2514c96cff
commit d9e3cc0374

View File

@ -34,12 +34,14 @@ type competitionTotalOutput struct {
Payload competitionTotal `json:"payload"` Payload competitionTotal `json:"payload"`
} }
type competitionTotal struct { type competitionTotal struct {
UniqueCids int `json:"total_unique_cids"` UniqueCids int `json:"total_unique_cids"`
UniqueProviders int `json:"total_unique_providers"` UniqueProviders int `json:"total_unique_providers"`
UniqueProjects int `json:"total_unique_projects"` UniqueProjects int `json:"total_unique_projects"`
UniqueClients int `json:"total_unique_clients"` UniqueClients int `json:"total_unique_clients"`
TotalDeals int `json:"total_num_deals"` TotalDeals int `json:"total_num_deals"`
TotalBytes int64 `json:"total_stored_data_size"` TotalBytes int64 `json:"total_stored_data_size"`
FilplusTotalDeals int `json:"filplus_total_num_deals"`
FilplusTotalBytes int64 `json:"filplus_total_stored_data_size"`
seenProject map[string]bool seenProject map[string]bool
seenClient map[address.Address]bool seenClient map[address.Address]bool
@ -271,6 +273,11 @@ var rollupDealStatsCmd = &cli.Command{
unfilteredGrandTotals.seenPieceCid[dealInfo.Proposal.PieceCID] = true unfilteredGrandTotals.seenPieceCid[dealInfo.Proposal.PieceCID] = true
unfilteredGrandTotals.TotalDeals++ unfilteredGrandTotals.TotalDeals++
if dealInfo.Proposal.VerifiedDeal {
unfilteredGrandTotals.FilplusTotalDeals++
unfilteredGrandTotals.FilplusTotalBytes += int64(dealInfo.Proposal.PieceSize)
}
// perl -E 'say scalar gmtime ( 166560 * 30 + 1598306400 )' // perl -E 'say scalar gmtime ( 166560 * 30 + 1598306400 )'
// Wed Oct 21 18:00:00 2020 // Wed Oct 21 18:00:00 2020
if dealInfo.Proposal.StartEpoch <= 166560 { if dealInfo.Proposal.StartEpoch <= 166560 {
@ -325,6 +332,11 @@ var rollupDealStatsCmd = &cli.Command{
projStatEntry.NumDeals++ projStatEntry.NumDeals++
clientStatEntry.NumDeals++ clientStatEntry.NumDeals++
if dealInfo.Proposal.VerifiedDeal {
grandTotals.FilplusTotalDeals++
grandTotals.FilplusTotalBytes += int64(dealInfo.Proposal.PieceSize)
}
payloadCid := "unknown" payloadCid := "unknown"
if c, err := cid.Parse(dealInfo.Proposal.Label); err == nil { if c, err := cid.Parse(dealInfo.Proposal.Label); err == nil {
payloadCid = c.String() payloadCid = c.String()