From 991b429336846c7e7c8b19d06d00577c2ede5636 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Thu, 19 May 2022 14:10:36 +0200 Subject: [PATCH] server: Move adjusting revision to hasher Signed-off-by: Marek Siarkowicz --- server/mvcc/hash.go | 4 ++-- server/mvcc/kvstore.go | 2 +- server/mvcc/kvstore_compaction.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/mvcc/hash.go b/server/mvcc/hash.go index 16dcb13f1..91550e327 100644 --- a/server/mvcc/hash.go +++ b/server/mvcc/hash.go @@ -42,8 +42,8 @@ func newKVHasher(lower, upper int64, keep map[revision]struct{}) kvHasher { h.Write(buckets.Key.Name()) return kvHasher{ hash: h, - lower: revision{main: lower}, - upper: revision{main: upper}, + lower: revision{main: lower + 1}, + upper: revision{main: upper + 1}, keep: keep, } } diff --git a/server/mvcc/kvstore.go b/server/mvcc/kvstore.go index 290deee28..cdc318894 100644 --- a/server/mvcc/kvstore.go +++ b/server/mvcc/kvstore.go @@ -189,7 +189,7 @@ func (s *store) HashByRev(rev int64) (hash uint32, currentRev int64, compactRev tx.RLock() defer tx.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()) return hash, currentRev, compactRev, err } diff --git a/server/mvcc/kvstore_compaction.go b/server/mvcc/kvstore_compaction.go index b4091c7ff..7b8d2fef6 100644 --- a/server/mvcc/kvstore_compaction.go +++ b/server/mvcc/kvstore_compaction.go @@ -38,7 +38,7 @@ func (s *store) scheduleCompaction(compactMainRev, prevCompactRev int64) (uint32 binary.BigEndian.PutUint64(end, uint64(compactMainRev+1)) batchNum := s.cfg.CompactionBatchLimit - h := newKVHasher(prevCompactRev+1, compactMainRev+1, keep) + h := newKVHasher(prevCompactRev, compactMainRev, keep) last := make([]byte, 8+1+8) for { var rev revision