Skip to content

Commit

Permalink
update to recent axiomhq/hyperloglog due to error in merging and beta
Browse files Browse the repository at this point in the history
  • Loading branch information
seiflotfy authored and asf-stripe committed Oct 5, 2017
1 parent 0a3fca3 commit 1c6e773
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
Expand Down
4 changes: 2 additions & 2 deletions samplers/samplers.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ func (s *Set) Sample(sample string, sampleRate float32) {
func NewSet(Name string, Tags []string) *Set {
// error is only returned if precision is outside the 4-18 range
// TODO: this is the maximum precision, should it be configurable?
Hll, _ := hyperloglog.New(18)
Hll := hyperloglog.New()
return &Set{
Name: Name,
Tags: Tags,
Expand Down Expand Up @@ -264,7 +264,7 @@ func (s *Set) Export() (JSONMetric, error) {

// Combine merges the values seen with another set (marshalled as a byte slice)
func (s *Set) Combine(other []byte) error {
otherHLL, _ := hyperloglog.New(18)
otherHLL := hyperloglog.New()
if err := otherHLL.UnmarshalBinary(other); err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/axiomhq/hyperloglog/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 30 additions & 15 deletions vendor/github.com/axiomhq/hyperloglog/hyperloglog.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/axiomhq/hyperloglog/registers.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions vendor/github.com/axiomhq/hyperloglog/sparse.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions vendor/github.com/axiomhq/hyperloglog/utils.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1c6e773

Please sign in to comment.