From e586dc19df2ad0e87952c158dc00be3b799e0480 Mon Sep 17 00:00:00 2001 From: SimFG <1142838399@qq.com> Date: Thu, 7 Jul 2022 11:43:54 +0800 Subject: [PATCH] lease: Rename `Poll` to `Peek` in the `LeaseExpiredNotifier` `Poll` means that the elements in the heap will be removed. And it is more appropriate to use `Peek` to get the top of the heap. Signed-off-by: SimFG <1142838399@qq.com> --- server/lease/lease_queue.go | 2 +- server/lease/lease_queue_test.go | 8 ++++---- server/lease/lessor.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/lease/lease_queue.go b/server/lease/lease_queue.go index ffb7285ec..b5890ecbd 100644 --- a/server/lease/lease_queue.go +++ b/server/lease/lease_queue.go @@ -96,7 +96,7 @@ func (mq *LeaseExpiredNotifier) Unregister() *LeaseWithTime { return item } -func (mq *LeaseExpiredNotifier) Poll() *LeaseWithTime { +func (mq *LeaseExpiredNotifier) Peek() *LeaseWithTime { if mq.Len() == 0 { return nil } diff --git a/server/lease/lease_queue_test.go b/server/lease/lease_queue_test.go index c12003561..9b9bb772f 100644 --- a/server/lease/lease_queue_test.go +++ b/server/lease/lease_queue_test.go @@ -40,8 +40,8 @@ func TestLeaseQueue(t *testing.T) { } // first element is expired. - if le.leaseExpiredNotifier.Poll().id != LeaseID(1) { - t.Fatalf("first item expected lease ID %d, got %d", LeaseID(1), le.leaseExpiredNotifier.Poll().id) + if le.leaseExpiredNotifier.Peek().id != LeaseID(1) { + t.Fatalf("first item expected lease ID %d, got %d", LeaseID(1), le.leaseExpiredNotifier.Peek().id) } existExpiredEvent := func() { @@ -60,8 +60,8 @@ func TestLeaseQueue(t *testing.T) { t.Fatalf("expected the expired lease to be pushed back to the heap, heap size got %d", le.leaseExpiredNotifier.Len()) } - if le.leaseExpiredNotifier.Poll().id != LeaseID(1) { - t.Fatalf("first item expected lease ID %d, got %d", LeaseID(1), le.leaseExpiredNotifier.Poll().id) + if le.leaseExpiredNotifier.Peek().id != LeaseID(1) { + t.Fatalf("first item expected lease ID %d, got %d", LeaseID(1), le.leaseExpiredNotifier.Peek().id) } } diff --git a/server/lease/lessor.go b/server/lease/lessor.go index 1318552dd..b369bd546 100644 --- a/server/lease/lessor.go +++ b/server/lease/lessor.go @@ -683,7 +683,7 @@ func (le *lessor) expireExists() (l *Lease, ok bool, next bool) { return nil, false, false } - item := le.leaseExpiredNotifier.Poll() + item := le.leaseExpiredNotifier.Peek() l = le.leaseMap[item.id] if l == nil { // lease has expired or been revoked