Commit b9787060 authored by Steven Allen's avatar Steven Allen

Merge branch 'feat/ds-bytes'

parents 21f067c8 1de65d35
1.3.3: QmPMRquZA1WiRMQ5ZE2V1kHtnPaq2X5Qtz7Wgwwo2tjLyS 1.4.0: QmRa2HJZNKkkkbNVPkZu9VCzst4B3JmxoaR97EUFhWcK6m
...@@ -124,12 +124,10 @@ func recordLatency(h metrics.Histogram, start time.Time) { ...@@ -124,12 +124,10 @@ func recordLatency(h metrics.Histogram, start time.Time) {
h.Observe(elapsed.Seconds()) h.Observe(elapsed.Seconds())
} }
func (m *measure) Put(key datastore.Key, value interface{}) error { func (m *measure) Put(key datastore.Key, value []byte) error {
defer recordLatency(m.putLatency, time.Now()) defer recordLatency(m.putLatency, time.Now())
m.putNum.Inc() m.putNum.Inc()
if b, ok := value.([]byte); ok { m.putSize.Observe(float64(len(value)))
m.putSize.Observe(float64(len(b)))
}
err := m.backend.Put(key, value) err := m.backend.Put(key, value)
if err != nil { if err != nil {
m.putErr.Inc() m.putErr.Inc()
...@@ -137,16 +135,14 @@ func (m *measure) Put(key datastore.Key, value interface{}) error { ...@@ -137,16 +135,14 @@ func (m *measure) Put(key datastore.Key, value interface{}) error {
return err return err
} }
func (m *measure) Get(key datastore.Key) (value interface{}, err error) { func (m *measure) Get(key datastore.Key) (value []byte, err error) {
defer recordLatency(m.getLatency, time.Now()) defer recordLatency(m.getLatency, time.Now())
m.getNum.Inc() m.getNum.Inc()
value, err = m.backend.Get(key) value, err = m.backend.Get(key)
if err != nil { if err != nil {
m.getErr.Inc() m.getErr.Inc()
} else { } else {
if b, ok := value.([]byte); ok { m.getSize.Observe(float64(len(value)))
m.getSize.Observe(float64(len(b)))
}
} }
return value, err return value, err
} }
...@@ -263,12 +259,9 @@ func (m *measure) Batch() (datastore.Batch, error) { ...@@ -263,12 +259,9 @@ func (m *measure) Batch() (datastore.Batch, error) {
}, nil }, nil
} }
func (mt *measuredBatch) Put(key datastore.Key, val interface{}) error { func (mt *measuredBatch) Put(key datastore.Key, val []byte) error {
mt.puts++ mt.puts++
valb, ok := val.([]byte) mt.m.putSize.Observe(float64(len(val)))
if ok {
mt.m.putSize.Observe(float64(len(valb)))
}
return mt.putts.Put(key, val) return mt.putts.Put(key, val)
} }
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
}, },
{ {
"author": "jbenet", "author": "jbenet",
"hash": "QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i", "hash": "QmVG5gxteQNEMhrS8prJSmU2C9rebtFuTd3SYZ5kE3YZ5k",
"name": "go-datastore", "name": "go-datastore",
"version": "2.4.1" "version": "3.0.0"
} }
], ],
"gxVersion": "0.8.0", "gxVersion": "0.8.0",
...@@ -25,6 +25,6 @@ ...@@ -25,6 +25,6 @@
"license": "", "license": "",
"name": "go-ds-measure", "name": "go-ds-measure",
"releaseCmd": "git commit -a -m \"gx publish $VERSION\"", "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
"version": "1.3.3" "version": "1.4.0"
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment