From 5a92dcb3cf10a3eb28813282e7eb5a3444ffeaeb Mon Sep 17 00:00:00 2001 From: Alex Trottier Date: Sat, 1 Feb 2020 15:20:52 -0800 Subject: [PATCH 1/4] chore: update dependencies, adjust use of removed functions, go 1.13 This commit was moved from ipfs/go-ipfs-blockstore@7a4b99e54ea86b4c4cc6d8c04fb617b9187c34cb --- blockstore/blockstore.go | 22 ++++++++++++---------- blockstore/blockstore_test.go | 4 ++++ blockstore/bloom_cache_test.go | 5 +++++ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/blockstore/blockstore.go b/blockstore/blockstore.go index 03004b592..a2eb65c7b 100644 --- a/blockstore/blockstore.go +++ b/blockstore/blockstore.go @@ -119,8 +119,7 @@ func (bs *blockstore) Get(k cid.Cid) (blocks.Block, error) { log.Error("undefined cid in blockstore") return nil, ErrNotFound } - - bdata, err := bs.datastore.Get(dshelp.CidToDsKey(k)) + bdata, err := bs.datastore.Get(dshelp.MultihashToDsKey(k.Hash())) if err == ds.ErrNotFound { return nil, ErrNotFound } @@ -143,7 +142,7 @@ func (bs *blockstore) Get(k cid.Cid) (blocks.Block, error) { } func (bs *blockstore) Put(block blocks.Block) error { - k := dshelp.CidToDsKey(block.Cid()) + k := dshelp.MultihashToDsKey(block.Cid().Hash()) // Has is cheaper than Put, so see if we already have it exists, err := bs.datastore.Has(k) @@ -159,7 +158,7 @@ func (bs *blockstore) PutMany(blocks []blocks.Block) error { return err } for _, b := range blocks { - k := dshelp.CidToDsKey(b.Cid()) + k := dshelp.MultihashToDsKey(b.Cid().Hash()) exists, err := bs.datastore.Has(k) if err == nil && exists { continue @@ -174,11 +173,11 @@ func (bs *blockstore) PutMany(blocks []blocks.Block) error { } func (bs *blockstore) Has(k cid.Cid) (bool, error) { - return bs.datastore.Has(dshelp.CidToDsKey(k)) + return bs.datastore.Has(dshelp.MultihashToDsKey(k.Hash())) } func (bs *blockstore) GetSize(k cid.Cid) (int, error) { - size, err := bs.datastore.GetSize(dshelp.CidToDsKey(k)) + size, err := bs.datastore.GetSize(dshelp.MultihashToDsKey(k.Hash())) if err == ds.ErrNotFound { return -1, ErrNotFound } @@ -186,7 +185,7 @@ func (bs *blockstore) GetSize(k cid.Cid) (int, error) { } func (bs *blockstore) DeleteBlock(k cid.Cid) error { - return bs.datastore.Delete(dshelp.CidToDsKey(k)) + return bs.datastore.Delete(dshelp.MultihashToDsKey(k.Hash())) } // AllKeysChan runs a query for keys from the blockstore. @@ -220,12 +219,15 @@ func (bs *blockstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) { } // need to convert to key.Key using key.KeyFromDsKey. - k, err := dshelp.DsKeyToCid(ds.RawKey(e.Key)) + bk, err := dshelp.BinaryFromDsKey(ds.RawKey(e.Key)) if err != nil { - log.Warningf("error parsing key from DsKey: %s", err) + log.Warning("error pasring key from binary: %s", err) continue } - + k, err := cid.Cast(bk) + if err != nil { + log.Warningf("failed to cast cid: %s", err) + } select { case <-ctx.Done(): return diff --git a/blockstore/blockstore_test.go b/blockstore/blockstore_test.go index b01574a44..44225593a 100644 --- a/blockstore/blockstore_test.go +++ b/blockstore/blockstore_test.go @@ -269,6 +269,10 @@ func (c *queryTestDS) Query(q dsq.Query) (dsq.Results, error) { return c.ds.Query(q) } +func (c *queryTestDS) Sync(key ds.Key) error { + return c.ds.Sync(key) +} + func (c *queryTestDS) Batch() (ds.Batch, error) { return ds.NewBasicBatch(c), nil } diff --git a/blockstore/bloom_cache_test.go b/blockstore/bloom_cache_test.go index fd65c0b28..3b290a0c2 100644 --- a/blockstore/bloom_cache_test.go +++ b/blockstore/bloom_cache_test.go @@ -202,6 +202,11 @@ func (c *callbackDatastore) Query(q dsq.Query) (dsq.Results, error) { return c.ds.Query(q) } +func (c *callbackDatastore) Sync(key ds.Key) error { + c.CallF() + return c.ds.Sync(key) +} + func (c *callbackDatastore) Batch() (ds.Batch, error) { return ds.NewBasicBatch(c), nil } From bb2ba5c09f380093085a2129b6c47d62eb14311e Mon Sep 17 00:00:00 2001 From: Alex Trottier Date: Sat, 1 Feb 2020 15:24:20 -0800 Subject: [PATCH 2/4] fix typo in blockstore.go This commit was moved from ipfs/go-ipfs-blockstore@e62b875f6ff6a9f4230fa569eeef89bf97e7d2b7 --- blockstore/blockstore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockstore/blockstore.go b/blockstore/blockstore.go index a2eb65c7b..a7e8b5daa 100644 --- a/blockstore/blockstore.go +++ b/blockstore/blockstore.go @@ -221,7 +221,7 @@ func (bs *blockstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) { // need to convert to key.Key using key.KeyFromDsKey. bk, err := dshelp.BinaryFromDsKey(ds.RawKey(e.Key)) if err != nil { - log.Warning("error pasring key from binary: %s", err) + log.Warningf("error parsing key from binary: %s", err) continue } k, err := cid.Cast(bk) From 0d1cc0714586d95974d0afc23cccbc2891e5c281 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Sat, 1 Feb 2020 17:01:48 -0800 Subject: [PATCH 3/4] fix: return raw block CIDs instead of V0 CIDs from AllKeysChan V0 CIDs are always "dag-pb". Using the "raw" codec indicates that these blocks are just raw data. This commit was moved from ipfs/go-ipfs-blockstore@5f9214c8db55d92b36a16971d47854e7123f78e7 --- blockstore/blockstore.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/blockstore/blockstore.go b/blockstore/blockstore.go index a7e8b5daa..e815642da 100644 --- a/blockstore/blockstore.go +++ b/blockstore/blockstore.go @@ -224,10 +224,7 @@ func (bs *blockstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) { log.Warningf("error parsing key from binary: %s", err) continue } - k, err := cid.Cast(bk) - if err != nil { - log.Warningf("failed to cast cid: %s", err) - } + k := cid.NewCidV1(cid.Raw, bk) select { case <-ctx.Done(): return From c2d202aeca5f1065e3921deca19bab9c7cde1afa Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 7 Jan 2020 09:34:11 -0800 Subject: [PATCH 4/4] feat: switch to raw multihashes for blocks Part of: https://github.com/ipfs/go-ipfs/issues/6815 This commit was moved from ipfs/go-ipfs-blockstore@8f266cac109a60c25dd62959cc03127329fc2976 --- blockstore/arc_cache.go | 6 +++--- blockstore/blockstore_test.go | 33 ++++++++++++++++++++++++++------- blockstore/bloom_cache.go | 8 ++++---- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/blockstore/arc_cache.go b/blockstore/arc_cache.go index 8e88fa81a..e2b930dca 100644 --- a/blockstore/arc_cache.go +++ b/blockstore/arc_cache.go @@ -59,7 +59,7 @@ func (b *arccache) hasCached(k cid.Cid) (has bool, size int, ok bool) { return false, -1, false } - h, ok := b.arc.Get(k.KeyString()) + h, ok := b.arc.Get(string(k.Hash())) if ok { b.hits.Inc() switch h := h.(type) { @@ -160,11 +160,11 @@ func (b *arccache) HashOnRead(enabled bool) { } func (b *arccache) cacheHave(c cid.Cid, have bool) { - b.arc.Add(c.KeyString(), cacheHave(have)) + b.arc.Add(string(c.Hash()), cacheHave(have)) } func (b *arccache) cacheSize(c cid.Cid, blockSize int) { - b.arc.Add(c.KeyString(), cacheSize(blockSize)) + b.arc.Add(string(c.Hash()), cacheSize(blockSize)) } func (b *arccache) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) { diff --git a/blockstore/blockstore_test.go b/blockstore/blockstore_test.go index 44225593a..a165652f4 100644 --- a/blockstore/blockstore_test.go +++ b/blockstore/blockstore_test.go @@ -53,6 +53,24 @@ func TestPutThenGetBlock(t *testing.T) { } } +func TestCidv0v1(t *testing.T) { + bs := NewBlockstore(ds_sync.MutexWrap(ds.NewMapDatastore())) + block := blocks.NewBlock([]byte("some data")) + + err := bs.Put(block) + if err != nil { + t.Fatal(err) + } + + blockFromBlockstore, err := bs.Get(cid.NewCidV1(cid.DagProtobuf, block.Cid().Hash())) + if err != nil { + t.Fatal(err) + } + if !bytes.Equal(block.RawData(), blockFromBlockstore.RawData()) { + t.Fail() + } +} + func TestPutThenGetSizeBlock(t *testing.T) { bs := NewBlockstore(ds_sync.MutexWrap(ds.NewMapDatastore())) block := blocks.NewBlock([]byte("some data")) @@ -218,18 +236,19 @@ func TestAllKeysRespectsContext(t *testing.T) { } func expectMatches(t *testing.T, expect, actual []cid.Cid) { + t.Helper() if len(expect) != len(actual) { t.Errorf("expect and actual differ: %d != %d", len(expect), len(actual)) } + + actualSet := make(map[string]bool, len(actual)) + for _, k := range actual { + actualSet[string(k.Hash())] = true + } + for _, ek := range expect { - found := false - for _, ak := range actual { - if ek.Equals(ak) { - found = true - } - } - if !found { + if !actualSet[string(ek.Hash())] { t.Error("expected key not found: ", ek) } } diff --git a/blockstore/bloom_cache.go b/blockstore/bloom_cache.go index 6e28ecec6..b4fadc2ef 100644 --- a/blockstore/bloom_cache.go +++ b/blockstore/bloom_cache.go @@ -103,7 +103,7 @@ func (b *bloomcache) build(ctx context.Context) error { atomic.StoreInt32(&b.active, 1) return nil } - b.bloom.AddTS(key.Bytes()) // Use binary key, the more compact the better + b.bloom.AddTS(key.Hash()) // Use binary key, the more compact the better case <-ctx.Done(): b.buildErr = ctx.Err() return b.buildErr @@ -130,7 +130,7 @@ func (b *bloomcache) hasCached(k cid.Cid) (has bool, ok bool) { return false, false } if b.BloomActive() { - blr := b.bloom.HasTS(k.Bytes()) + blr := b.bloom.HasTS(k.Hash()) if !blr { // not contained in bloom is only conclusive answer bloom gives b.hits.Inc() return false, true @@ -163,7 +163,7 @@ func (b *bloomcache) Put(bl blocks.Block) error { // See comment in PutMany err := b.blockstore.Put(bl) if err == nil { - b.bloom.AddTS(bl.Cid().Bytes()) + b.bloom.AddTS(bl.Cid().Hash()) } return err } @@ -178,7 +178,7 @@ func (b *bloomcache) PutMany(bs []blocks.Block) error { return err } for _, bl := range bs { - b.bloom.AddTS(bl.Cid().Bytes()) + b.bloom.AddTS(bl.Cid().Hash()) } return nil }