Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

server: Extract kvHash struct

Browse Source 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
This commit is contained in:
Marek Siarkowicz 2022-05-17 15:11:32 +02:00
parent 3f26995f99
commit f5ed371885
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/mvcc/hash.go
View File

@ -15,6 +15,7 @@
package mvcc package mvcc
import ( import (
"hash"
"hash/crc32" "hash/crc32"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/mvcc/backend"
@ -22,9 +23,7 @@ import (
) )
func unsafeHashByRev(tx backend.ReadTx, lower, upper revision, keep map[revision]struct{}) (uint32, error) { func unsafeHashByRev(tx backend.ReadTx, lower, upper revision, keep map[revision]struct{}) (uint32, error) {
h := crc32.New(crc32.MakeTable(crc32.Castagnoli)) h := newKVHasher()
h.Write(buckets.Key.Name())
err := tx.UnsafeForEach(buckets.Key, func(k, v []byte) error { err := tx.UnsafeForEach(buckets.Key, func(k, v []byte) error {
kr := bytesToRev(k) kr := bytesToRev(k)
if !upper.GreaterThan(kr) { if !upper.GreaterThan(kr) {
@ -37,9 +36,27 @@ func unsafeHashByRev(tx backend.ReadTx, lower, upper revision, keep map[revision
return nil return nil
} }
} }
h.Write(k) h.WriteKeyValue(k, v)
h.Write(v)
return nil return nil
}) })
return h.Sum32(), err return h.Hash(), err
}
type hasher struct {
h hash.Hash32
}
func newKVHasher() hasher {
h := crc32.New(crc32.MakeTable(crc32.Castagnoli))
h.Write(buckets.Key.Name())
return hasher{h}
}
func (h *hasher) WriteKeyValue(k, v []byte) {
h.h.Write(k)
h.h.Write(v)
}
func (h *hasher) Hash() uint32 {
return h.h.Sum32()
} }