From 3767837aa4c6a54501e8245c575a8113107e87ce Mon Sep 17 00:00:00 2001
From: Aaron Raddon <araddon@gmail.com>
Date: Fri, 27 Jun 2014 11:28:57 -0700
Subject: [PATCH 1/2] add json persistence to store/restore

---
 cardinality.go      | 38 ++++++++++++++++++++++++++++++++++++++
 cardinality_test.go | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/cardinality.go b/cardinality.go
index 1423724..fa8cc76 100644
--- a/cardinality.go
+++ b/cardinality.go
@@ -1,6 +1,7 @@
 package probably
 
 import (
+	"encoding/json"
 	"math"
 )
 
@@ -104,3 +105,40 @@ func (h *HyperLogLog) Merge(from *HyperLogLog) {
 		}
 	}
 }
+
+func (h *HyperLogLog) MarshalJSON() ([]byte, error) {
+	m := map[string]interface{}{
+		"m":       h.m,
+		"k":       h.k,
+		"k_comp":  h.k_comp,
+		"alpha_m": h.alpha_m,
+		"bits":    h.bits,
+	}
+	if by, err := json.Marshal(m); err != nil {
+		return nil, err
+	} else {
+		return by, nil
+	}
+}
+
+func (h *HyperLogLog) UnmarshalJSON(by []byte) error {
+
+	data := struct {
+		M      uint    `json:"m"`
+		K      float64 `json:"k"`
+		KComp  int     `json:"k_comp"`
+		AlphaM float64 `json:"alpha_m"`
+		Bits   []uint8 `json:"bits"`
+	}{}
+
+	err := json.Unmarshal(by, &data)
+	if err != nil {
+		return err
+	}
+	h.m = data.M
+	h.k = data.K
+	h.k_comp = data.KComp
+	h.alpha_m = data.AlphaM
+	h.bits = data.Bits
+	return nil
+}
diff --git a/cardinality_test.go b/cardinality_test.go
index d9f3548..880c69c 100644
--- a/cardinality_test.go
+++ b/cardinality_test.go
@@ -1,6 +1,7 @@
 package probably
 
 import (
+	"encoding/json"
 	"hash/crc32"
 	"testing"
 )
@@ -436,6 +437,37 @@ func TestCardinality(t *testing.T) {
 	}
 }
 
+func TestCardinalityJson(t *testing.T) {
+	hll := NewHyperLogLog(0.001)
+	for _, w := range words {
+		h := crc32.ChecksumIEEE([]byte(w))
+		hll.Add(h)
+	}
+	t.Logf("Word list is %v words, estimate is %v", len(words), hll.Count())
+	if hll.Count() != 2334 {
+		t.Fatalf("Expected estimate of 2,334, got %v", hll.Count())
+	}
+	by, err := json.Marshal(hll)
+	if err != nil {
+		t.Fatalf("Must not error on json serialization: %v", err)
+	}
+	var llJson HyperLogLog
+	err = json.Unmarshal(by, &llJson)
+	if err != nil {
+		t.Fatalf("Must not error on json deserialization: %v", err)
+	}
+	if llJson.Count() != 2334 {
+		t.Fatalf("2 Expected estimate of 2,334, got %v", llJson.Count())
+	}
+	for _, w := range words {
+		h := crc32.ChecksumIEEE([]byte(w))
+		llJson.Add(h)
+	}
+	if llJson.Count() != 2334 {
+		t.Fatalf("3 Expected estimate of 2,334, got %v", llJson.Count())
+	}
+}
+
 func TestCardinalityMerging(t *testing.T) {
 	counters := make([]*HyperLogLog, 10)
 	for i := 0; i < 10; i++ {

From 3e975b4aacc0f79ac2604492ded22b65bb85f9a9 Mon Sep 17 00:00:00 2001
From: Aaron Raddon <araddon@gmail.com>
Date: Fri, 27 Jun 2014 11:36:57 -0700
Subject: [PATCH 2/2] un-needed err check

---
 cardinality.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cardinality.go b/cardinality.go
index fa8cc76..2790c5c 100644
--- a/cardinality.go
+++ b/cardinality.go
@@ -114,11 +114,7 @@ func (h *HyperLogLog) MarshalJSON() ([]byte, error) {
 		"alpha_m": h.alpha_m,
 		"bits":    h.bits,
 	}
-	if by, err := json.Marshal(m); err != nil {
-		return nil, err
-	} else {
-		return by, nil
-	}
+	return json.Marshal(m)
 }
 
 func (h *HyperLogLog) UnmarshalJSON(by []byte) error {