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: Move adjusting revision to hasher

Browse Source 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
This commit is contained in:
Marek Siarkowicz 2022-05-19 14:10:36 +02:00
parent 2b8dd0de4e
commit 991b429336
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/mvcc/hash.go
View File

@ -42,8 +42,8 @@ func newKVHasher(lower, upper int64, keep map[revision]struct{}) kvHasher {
h.Write(buckets.Key.Name()) h.Write(buckets.Key.Name())
return kvHasher{ return kvHasher{
hash: h, hash: h,
lower: revision{main: lower}, lower: revision{main: lower + 1},
upper: revision{main: upper}, upper: revision{main: upper + 1},
keep: keep, keep: keep,
} }
} }

2
server/mvcc/kvstore.go
View File

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

2
server/mvcc/kvstore_compaction.go
View File

@ -38,7 +38,7 @@ func (s *store) scheduleCompaction(compactMainRev, prevCompactRev int64) (uint32
binary.BigEndian.PutUint64(end, uint64(compactMainRev+1)) binary.BigEndian.PutUint64(end, uint64(compactMainRev+1))
batchNum := s.cfg.CompactionBatchLimit batchNum := s.cfg.CompactionBatchLimit
h := newKVHasher(prevCompactRev+1, compactMainRev+1, keep) h := newKVHasher(prevCompactRev, compactMainRev, keep)
last := make([]byte, 8+1+8) last := make([]byte, 8+1+8)
for { for {
var rev revision var rev revision