Просмотр исходного кода

leaes: remove unnecessary O(log N) operation when nothing is expiry

Since heap is already sorted, we can just check first element
to see if anything is expiry, rather than popping and pushing
it back. If nothing is expiry, pop operation is unnecessary.

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 лет назад
Родитель
Сommit
9c62d7b2d1
2 измененных файлов с 8 добавлено и 4 удалено
  1. 4 0
      lease/lease_queue_test.go
  2. 4 4
      lease/lessor.go

+ 4 - 0
lease/lease_queue_test.go

@@ -52,4 +52,8 @@ func TestLeaseQueue(t *testing.T) {
 	if more {
 	if more {
 		t.Fatal("expect no more expiry lease")
 		t.Fatal("expect no more expiry lease")
 	}
 	}
+
+	if le.leaseHeap.Len() != 49 {
+		t.Fatalf("expected lease heap pop, got %d", le.leaseHeap.Len())
+	}
 }
 }

+ 4 - 4
lease/lessor.go

@@ -522,30 +522,30 @@ func (le *lessor) runLoop() {
 }
 }
 
 
 // expireExists returns true if expiry items exist.
 // expireExists returns true if expiry items exist.
-// It pops "first" expired item from heap.
-// If it's not expired yet, add it back.
+// It pops only when expiry item exists.
 // "next" is true, to indicate that it may exist in next attempt.
 // "next" is true, to indicate that it may exist in next attempt.
 func (le *lessor) expireExists() (l *Lease, ok bool, next bool) {
 func (le *lessor) expireExists() (l *Lease, ok bool, next bool) {
 	if le.leaseHeap.Len() == 0 {
 	if le.leaseHeap.Len() == 0 {
 		return nil, false, false
 		return nil, false, false
 	}
 	}
 
 
-	item := heap.Pop(&le.leaseHeap).(*LeaseWithTime) // O(log N)
+	item := le.leaseHeap[0]
 	l = le.leaseMap[item.id]
 	l = le.leaseMap[item.id]
 	if l == nil {
 	if l == nil {
 		// lease has expired or been revoked
 		// lease has expired or been revoked
 		// no need to revoke (nothing is expiry)
 		// no need to revoke (nothing is expiry)
+		heap.Pop(&le.leaseHeap) // O(log N)
 		return nil, false, true
 		return nil, false, true
 	}
 	}
 
 
 	if time.Now().UnixNano() < item.expiration {
 	if time.Now().UnixNano() < item.expiration {
 		// Candidate expirations are caught up, reinsert this item
 		// Candidate expirations are caught up, reinsert this item
 		// and no need to revoke (nothing is expiry)
 		// and no need to revoke (nothing is expiry)
-		heap.Push(&le.leaseHeap, item) // O(log N)
 		return l, false, false
 		return l, false, false
 	}
 	}
 	// if the lease is actually expired, add to the removal list. If it is not expired, we can ignore it because another entry will have been inserted into the heap
 	// if the lease is actually expired, add to the removal list. If it is not expired, we can ignore it because another entry will have been inserted into the heap
 
 
+	heap.Pop(&le.leaseHeap) // O(log N)
 	return l, true, false
 	return l, true, false
 }
 }