cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

cache cid strings in sort

Browse Source 
so as to avoid making a gazillion of strings
This commit is contained in:
vyzo 2021-07-06 07:26:13 +03:00
parent 525a2c71dd
commit 0659235e21
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
blockstore/splitstore/splitstore.go
View File

@ -1323,6 +1323,18 @@ func (s *SplitStore) moveColdBlocks(cold []cid.Cid) error {
} }
func (s *SplitStore) sortObjects(cids []cid.Cid) error { func (s *SplitStore) sortObjects(cids []cid.Cid) error {
// we cache the keys to avoid making a gazillion of strings
keys := make(map[cid.Cid]string)
key := func(c cid.Cid) string {
s, ok := keys[c]
if !ok {
s = string(c.Hash())
keys[c] = s
}
return s
}
// compute sorting weights as the cumulative number of DAG links
weight := make(map[string]int) weight := make(map[string]int)
for _, c := range cids { for _, c := range cids {
switch c.Prefix().Codec { switch c.Prefix().Codec {
@ -1334,7 +1346,7 @@ func (s *SplitStore) sortObjects(cids []cid.Cid) error {
w := 0 w := 0
err := s.walkObjectRaw(c, cid.NewSet(), err := s.walkObjectRaw(c, cid.NewSet(),
func(c cid.Cid) error { func(c cid.Cid) error {
wc, ok := weight[string(c.Hash())] wc, ok := weight[key(c)]
if ok { if ok {
w += wc w += wc
return errStopWalk return errStopWalk
@ -1348,12 +1360,13 @@ func (s *SplitStore) sortObjects(cids []cid.Cid) error {
return xerrors.Errorf("error determining cold object weight: %w", err) return xerrors.Errorf("error determining cold object weight: %w", err)
} }
weight[string(c.Hash())] = w weight[key(c)] = w
} }
// sort!
sort.Slice(cids, func(i, j int) bool { sort.Slice(cids, func(i, j int) bool {
wi := weight[string(cids[i].Hash())] wi := weight[key(cids[i])]
wj := weight[string(cids[j].Hash())] wj := weight[key(cids[j])]
if wi == wj { if wi == wj {
return bytes.Compare(cids[i].Hash(), cids[j].Hash()) > 0 return bytes.Compare(cids[i].Hash(), cids[j].Hash()) > 0
} }