From 3df30b9c7f8b64f7517be66eda02a050b13f288b Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 30 Apr 2018 13:57:40 -0700 Subject: [PATCH] mvcc: fix "unconvert" warnings Signed-off-by: Gyuho Lee --- mvcc/backend/backend.go | 2 +- mvcc/kvstore_txn.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mvcc/backend/backend.go b/mvcc/backend/backend.go index 2c16b5d4a..3438e6780 100644 --- a/mvcc/backend/backend.go +++ b/mvcc/backend/backend.go @@ -45,7 +45,7 @@ var ( plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "mvcc/backend") // minSnapshotWarningTimeout is the minimum threshold to trigger a long running snapshot warning. - minSnapshotWarningTimeout = time.Duration(30 * time.Second) + minSnapshotWarningTimeout = 30 * time.Second ) type Backend interface { diff --git a/mvcc/kvstore_txn.go b/mvcc/kvstore_txn.go index 8896fb86d..d568d8a2e 100644 --- a/mvcc/kvstore_txn.go +++ b/mvcc/kvstore_txn.go @@ -83,14 +83,14 @@ func (tw *storeTxnWrite) Range(key, end []byte, ro RangeOptions) (r *RangeResult func (tw *storeTxnWrite) DeleteRange(key, end []byte) (int64, int64) { if n := tw.deleteRange(key, end); n != 0 || len(tw.changes) > 0 { - return n, int64(tw.beginRev + 1) + return n, tw.beginRev + 1 } - return 0, int64(tw.beginRev) + return 0, tw.beginRev } func (tw *storeTxnWrite) Put(key, value []byte, lease lease.LeaseID) int64 { tw.put(key, value, lease) - return int64(tw.beginRev + 1) + return tw.beginRev + 1 } func (tw *storeTxnWrite) End() { @@ -120,7 +120,7 @@ func (tr *storeTxnRead) rangeKeys(key, end []byte, curRev int64, ro RangeOptions return &RangeResult{KVs: nil, Count: -1, Rev: 0}, ErrCompacted } - revpairs := tr.s.kvindex.Revisions(key, end, int64(rev)) + revpairs := tr.s.kvindex.Revisions(key, end, rev) if len(revpairs) == 0 { return &RangeResult{KVs: nil, Count: 0, Rev: curRev}, nil }