Merge pull request #4 from hurd54/main

fix for deleting the last element

ring.go

@@ -329,19 +329,27 @@ func (r *Ring) deletePoint(tree avl.Tree, p *point) (_ avl.Tree, removed bool) {
 	return tree, true
 }
 
-func (r *Ring) magicFactor() int {
+func (r *Ring) magicFactor() float64 {
 	if m := r.MagicFactor; m > 0 {
-		return m
+		return float64(m)
 	}
 	return DefaultMagicFactor
 }
 
 // r.mu must be held.
-func (r *Ring) rebuild() {
-	numPoints := line(
-		r.maxWeight, float64(r.magicFactor()),
-		r.minWeight, math.Ceil(float64(r.magicFactor())*(r.minWeight/r.maxWeight)),
+func (r *Ring) numPoints() func(float64) int {
+	if r.maxWeight == 0 {
+		return func(float64) int { return 0 }
+	}
+	return line(
+		r.maxWeight, r.magicFactor(),
+		r.minWeight, math.Ceil(r.magicFactor())*(r.minWeight/r.maxWeight),
 	)
+}
+
+// r.mu must be held.
+func (r *Ring) rebuild() {
+	numPoints := r.numPoints()
 
 	r.ringMu.RLock()
 	root := r.ring

ring_test.go

@@ -321,6 +321,29 @@ func TestRingDeleteNotExisting(t *testing.T) {
 	}
 }
 
+func TestRingInsertDeleteSequence(t *testing.T) {
+	var r Ring
+	x := StringItem("foo")
+	if err := r.Insert(x, 1); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if err := r.Delete(x); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if item := r.Get(x); item != nil {
+		t.Fatalf("unexpected item from empty ring")
+	}
+	if err := r.Insert(x, 1); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if item := r.Get(x); item == nil {
+		t.Fatalf("want item, but return empty")
+	}
+	if err := r.Delete(x); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+}
+
 func TestRingUpdateNotExisting(t *testing.T) {
 	var r Ring
 	x := StringItem("foo")