opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-30 18:13:54 +08:00
Code Issues Projects Releases Wiki Activity

fix(bitswap/message) impl with map to ensure no duplicate blocks

Browse Source 
comes at the cost of O(n) Blocks() method.
This commit is contained in:
Brian Tiger Chow
2014-10-27 06:16:11 -07:00
parent 2c4fefb9d6
commit caedb64697
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
exchange/bitswap/message/message.go
View File

@ -26,15 +26,15 @@ type Exportable interface {
ToNet(p peer.Peer) (nm.NetMessage, error) ToNet(p peer.Peer) (nm.NetMessage, error)
} }
// message wraps a proto message for convenience
type impl struct { type impl struct {
wantlist map[u.Key]struct{} wantlist map[u.Key]struct{}
blocks []blocks.Block blocks map[u.Key]blocks.Block
} }
func New() BitSwapMessage { func New() BitSwapMessage {
return &impl{ return &impl{
wantlist: make(map[u.Key]struct{}), wantlist: make(map[u.Key]struct{}),
blocks: make(map[u.Key]blocks.Block),
} }
} }
@ -61,7 +61,11 @@ func (m *impl) Wantlist() []u.Key {
// TODO(brian): convert these into blocks // TODO(brian): convert these into blocks
func (m *impl) Blocks() []blocks.Block { func (m *impl) Blocks() []blocks.Block {
return m.blocks bs := make([]blocks.Block, 0)
for _, block := range m.blocks {
bs = append(bs, block)
}
return bs
} }
func (m *impl) AddWanted(k u.Key) { func (m *impl) AddWanted(k u.Key) {
@ -69,7 +73,7 @@ func (m *impl) AddWanted(k u.Key) {
} }
func (m *impl) AppendBlock(b blocks.Block) { func (m *impl) AppendBlock(b blocks.Block) {
m.blocks = append(m.blocks, b) m.blocks[b.Key()] = b
} }
func FromNet(nmsg netmsg.NetMessage) (BitSwapMessage, error) { func FromNet(nmsg netmsg.NetMessage) (BitSwapMessage, error) {