query: always return the size

fix #75
ipfs · Dec 2, 2019 · 1485448 · 1485448
1 parent 537179a
commit 1485448
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/datastore.go b/datastore.go
@@ -618,7 +618,7 @@ func (t *txn) query(q dsq.Query) (dsq.Results, error) {
 
 			matches := true
 			check := func(value []byte) error {
-				e := dsq.Entry{Key: string(item.Key()), Value: value}
+				e := dsq.Entry{Key: string(item.Key()), Value: value, Size:len(value)}
 
 				// Only calculate expirations if we need them.
 				if q.ReturnExpirations {
@@ -663,9 +663,11 @@ func (t *txn) query(q dsq.Query) (dsq.Results, error) {
 					result = dsq.Result{Error: err}
 				} else {
 					e.Value = b
+					e.Size = len(b)
 					result = dsq.Result{Entry: e}
 				}
 			} else {
+				e.Size = int(item.ValueSize())
 				result = dsq.Result{Entry: e}
 			}
 

diff --git a/go.mod b/go.mod
@@ -2,9 +2,9 @@ module github.com/ipfs/go-ds-badger
 
 require (
 	github.com/dgraph-io/badger v1.6.0
-	github.com/ipfs/go-datastore v0.1.1
+	github.com/ipfs/go-datastore v0.2.0
 	github.com/ipfs/go-log v0.0.1
-	github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8
+	github.com/jbenet/goprocess v0.1.3
 )
 
 go 1.12
diff --git a/go.sum b/go.sum
@@ -27,13 +27,16 @@ github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/ipfs/go-datastore v0.1.1 h1:F4k0TkTAZGLFzBOrVKDAvch6JZtuN4NHkfdcEZL50aI=
-github.com/ipfs/go-datastore v0.1.1/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
+github.com/ipfs/go-datastore v0.2.0 h1:5Wjw6YXzZmtqU1MSrlws64+oLmSqea7gEajTcJickh8=
+github.com/ipfs/go-datastore v0.2.0/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
 github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
 github.com/ipfs/go-log v0.0.1 h1:9XTUN/rW64BCG1YhPK9Hoy3q8nr4gOmHHBpgFdfw6Lc=
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
+github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
 github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8 h1:bspPhN+oKYFk5fcGNuQzp6IGzYQSenLEgH3s6jkXrWw=
 github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod h1:Ly/wlsjFq/qrU3Rar62tu1gASgGw6chQbSh/XgIIXCY=
+github.com/jbenet/goprocess v0.1.3 h1:YKyIEECS/XvcfHtBzxtjBBbWK+MbvA6dG8ASiqwvr10=
+github.com/jbenet/goprocess v0.1.3/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=