From bea138d1111376cfb36ed70df5eb566d40c2591c Mon Sep 17 00:00:00 2001 From: "Daniel A. Nagy" Date: Mon, 9 Feb 2015 17:05:33 +0100 Subject: [PATCH] DPA test with deleted memstore, localstore Put with background db access. --- bzz/dbstore.go | 1 - bzz/dpa_test.go | 15 +++++++++++++++ bzz/localstore.go | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/bzz/dbstore.go b/bzz/dbstore.go index f942440dad..a904362ecf 100644 --- a/bzz/dbstore.go +++ b/bzz/dbstore.go @@ -286,7 +286,6 @@ func (s *dbStore) Put(chunk *Chunk) { batch.Put(ikey, idata) s.db.Write(batch) - } // try to find index; if found, update access cnt and return true diff --git a/bzz/dpa_test.go b/bzz/dpa_test.go index 1d12d06428..82dfb40a2c 100644 --- a/bzz/dpa_test.go +++ b/bzz/dpa_test.go @@ -44,4 +44,19 @@ func TestDPA(t *testing.T) { if !bytes.Equal(slice, resultSlice) { t.Errorf("Comparison error.") } + localStore.memStore = newMemStore(dbStore) + resultReader = dpa.Retrieve(key) + for i, _ := range resultSlice { + resultSlice[i] = 0 + } + n, err = resultReader.ReadAt(resultSlice, 0) + if err != nil { + t.Errorf("Retrieve error after removing memStore: %v", err) + } + if n != len(slice) { + t.Errorf("Slice size error after removing memStore got %d, expected %d.", n, len(slice)) + } + if !bytes.Equal(slice, resultSlice) { + t.Errorf("Comparison error after removing memStore.") + } } diff --git a/bzz/localstore.go b/bzz/localstore.go index d5689b5245..6170ddf4c2 100644 --- a/bzz/localstore.go +++ b/bzz/localstore.go @@ -10,7 +10,7 @@ type localStore struct { // its integrity is checked ? func (self *localStore) Put(chunk *Chunk) { self.memStore.Put(chunk) - self.dbStore.Put(chunk) + go self.dbStore.Put(chunk) } // Get(chunk *Chunk) looks up a chunk in the local stores