Merge branch 'master' into readfrom_roaring32

RoaringBitmap · Jan 25, 2021 · a53842b · a53842b
2 parents df0cdf8 + 6ec715d
commit a53842b
Show file tree

Hide file tree

Showing 29 changed files with 454 additions and 3,830 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,3 @@ roaring-fuzz.zip
 workdir
 coverage.out
 testdata/all3.classic
-testdata/all3.msgp.snappy
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ branches:
   only:
     - master
 script:
-- goveralls -v -service travis-ci -ignore arraycontainer_gen.go,bitmapcontainer_gen.go,rle16_gen.go,rle_gen.go,roaringarray_gen.go,rle.go || go test
+- goveralls -v -service travis-ci -ignore rle16_gen.go,rle_gen.go,rle.go || go test
 - go test -race -run TestConcurrent*
 - go build -tags appengine
 - go test -tags appengine

diff --git a/Makefile b/Makefile
@@ -97,10 +97,6 @@ nuke:
 	rm -rf ./target
 	GOPATH=$(GOPATH) go clean -i ./...
 
-
-ser: 
-	go generate
-
 cover:
 	go test -coverprofile=coverage.out
 	go tool cover -html=coverage.out

diff --git a/arraycontainer.go b/arraycontainer.go
@@ -4,8 +4,6 @@ import (
 	"fmt"
 )
 
-//go:generate msgp -unexported
-
 type arrayContainer struct {
 	content []uint16
 }

diff --git a/arraycontainer_gen.go b/arraycontainer_gen.go
diff --git a/arraycontainer_gen_test.go b/arraycontainer_gen_test.go
diff --git a/bitmapcontainer.go b/bitmapcontainer.go
@@ -5,8 +5,6 @@ import (
 	"unsafe"
 )
 
-//go:generate msgp -unexported
-
 type bitmapContainer struct {
 	cardinality int
 	bitmap      []uint64