From 625ef26022af0ca0a9c5bea977cc41acca224e51 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 30 Jun 2019 10:31:49 -0700 Subject: [PATCH 1/2] datastore: simplify Has, GetSize --- datastore.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/datastore.go b/datastore.go index ca1248b..ef140b4 100644 --- a/datastore.go +++ b/datastore.go @@ -69,20 +69,12 @@ func (d *Datastore) Get(key datastore.Key) ([]byte, error) { // Has returns whether the key is present in our datastore func (d *Datastore) Has(key datastore.Key) (bool, error) { - data, err := d.Get(key) - if err != nil { - return false, err - } - return data != nil, nil + return datastore.GetBackedHas(d, key) } // GetSize returns the size of the value referenced by key func (d *Datastore) GetSize(key datastore.Key) (int, error) { - data, err := d.Get(key) - if err != nil { - return 0, err - } - return len(data), nil + return datastore.GetBackedSize(d, key) } // Query performs a complex search query on the underlying datastore From 8b4abd93df7d245910a41f216dd822c58ee86c1f Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 30 Jun 2019 10:35:13 -0700 Subject: [PATCH 2/2] datastore: revert usage of BackedHas since BoltDB mechanics are diff --- datastore.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/datastore.go b/datastore.go index ef140b4..6a15f75 100644 --- a/datastore.go +++ b/datastore.go @@ -69,7 +69,11 @@ func (d *Datastore) Get(key datastore.Key) ([]byte, error) { // Has returns whether the key is present in our datastore func (d *Datastore) Has(key datastore.Key) (bool, error) { - return datastore.GetBackedHas(d, key) + data, err := d.Get(key) + if err != nil { + return false, err + } + return data != nil, nil } // GetSize returns the size of the value referenced by key