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: Pass revision as int

Browse Source 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
This commit is contained in:
Marek Siarkowicz 2022-05-19 14:08:52 +02:00
parent 887e53e61a
commit 19941654fe
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/storage/mvcc/hash.go
View File

@ -22,7 +22,7 @@ import (
"go.etcd.io/etcd/server/v3/storage/schema"
)
func unsafeHashByRev(tx backend.ReadTx, lower, upper revision, keep map[revision]struct{}) (uint32, error) {
func unsafeHashByRev(tx backend.ReadTx, lower, upper int64, keep map[revision]struct{}) (uint32, error) {
h := newKVHasher(lower, upper, keep)
err := tx.UnsafeForEach(schema.Key, func(k, v []byte) error {
h.WriteKeyValue(k, v)
@ -37,13 +37,13 @@ type kvHasher struct {
keep map[revision]struct{}
}
func newKVHasher(lower, upper revision, keep map[revision]struct{}) kvHasher {
func newKVHasher(lower, upper int64, keep map[revision]struct{}) kvHasher {
h := crc32.New(crc32.MakeTable(crc32.Castagnoli))
h.Write(schema.Key.Name())
return kvHasher{
hash: h,
lower: lower,
upper: upper,
lower: revision{main: lower},
upper: revision{main: upper},
keep: keep,
}
}

2
server/storage/mvcc/kvstore.go
View File

@ -191,7 +191,7 @@ func (s *store) HashByRev(rev int64) (hash uint32, currentRev int64, compactRev
tx.RLock()
defer tx.RUnlock()
s.mu.RUnlock()
hash, err = unsafeHashByRev(tx, revision{main: compactRev + 1}, revision{main: rev + 1}, keep)
hash, err = unsafeHashByRev(tx, compactRev+1, rev+1, keep)
hashRevSec.Observe(time.Since(start).Seconds())
return hash, currentRev, compactRev, err
}

2
server/storage/mvcc/kvstore_compaction.go
View File

@ -39,7 +39,7 @@ func (s *store) scheduleCompaction(compactMainRev, prevCompactRev int64) (uint32
batchNum := s.cfg.CompactionBatchLimit
batchInterval := s.cfg.CompactionSleepInterval
h := newKVHasher(revision{main: prevCompactRev + 1}, revision{main: compactMainRev + 1}, keep)
h := newKVHasher(prevCompactRev+1, compactMainRev+1, keep)
last := make([]byte, 8+1+8)
for {
var rev revision