Add unit tests to check threshold

src/sketches/bloom.go

@@ -28,7 +28,11 @@ func (d *BloomSketch) Add(values [][]byte) (bool, error) {
 	success := true
 	dict := make(map[string]uint)
 	if d.threshold != nil {
-		d.threshold.Add(values)
+		s, err := d.threshold.Add(values)
+		success = s
+		if err != nil {
+			return false, err
+		}
 		if !d.threshold.IsFull() {
 			return true, nil
 		}

src/sketches/bloom_test.go

@@ -1,13 +1,14 @@
 package sketches
 
 import (
+	"fmt"
 	"strconv"
 	"testing"
 
 	"datamodel"
 	pb "datamodel/protobuf"
-	"utils"
 	"testutils"
+	"utils"
 )
 
 func TestAddBloom(t *testing.T) {
@@ -51,17 +52,65 @@ func TestAddBloom(t *testing.T) {
 	} else {
 		tmp := res.(*pb.MembershipResult)
 		mres := tmp.GetMemberships()
+		// FIXME: Flatten to avoid O(n^2) complexity
 		for key := range check {
 			for i := 0; i < len(mres); i++ {
 				if mres[i].GetValue() == key &&
 					mres[i].GetIsMember() != check[key] {
+					// FIXME: Use t.Errorf (using + is ugly)
 					t.Error("expected member == "+strconv.FormatBool(check[key])+", got", mres[i].GetIsMember())
 				}
 			}
 		}
 	}
 }
 
+func TestAddBloomThreshold(t *testing.T) {
+	testutils.SetupTests()
+	defer testutils.TearDownTests()
+
+	info := datamodel.NewEmptyInfo()
+	info.Properties.MaxUniqueItems = utils.Int64p(1024)
+	info.Name = utils.Stringp("marvel")
+	sketch, err := NewBloomSketch(info)
+
+	if err != nil {
+		t.Error("expected avengers to have no error, got", err)
+	}
+
+	var rValues [][]byte
+	thresholdSize := int64(sketch.threshold.size)
+	for i := int64(0); i < info.GetProperties().GetMaxUniqueItems()/3; i++ {
+		value := fmt.Sprintf("value-%d", i)
+		values := [][]byte{
+			[]byte(value),
+		}
+		if _, err := sketch.Add(values); err != nil {
+			t.Error("expected no errors, got", err)
+		}
+
+		rValues = append(rValues, []byte(value))
+
+		// Threshold should be nil once more than 10% is filled
+		if sketch.threshold != nil && i >= thresholdSize {
+			t.Error("expected threshold == nil for i ==", i)
+		}
+
+		if res, err := sketch.Get(rValues); err != nil {
+			t.Error("expected no errors, got", err)
+		} else {
+			tmp := res.(*pb.MembershipResult)
+			mres := tmp.GetMemberships()
+			for i := 0; i < len(mres); i++ {
+				if !mres[i].GetIsMember() {
+					t.Fatalf("expected %s ==> member == true, got false", mres[i].GetValue())
+					break
+				}
+			}
+		}
+	}
+}
+
 func TestStressBloom(t *testing.T) {
 	testutils.SetupTests()
 	defer testutils.TearDownTests()