Merge branch 'cleanup' of github.com:tgruben/privilosa into cleanup

This commit is contained in:
Todd Gruben 2021-02-22 11:38:02 -06:00
commit 8e27e55459

4
api.go
View file

@ -425,7 +425,7 @@ func importWorker(importWork chan importJob) {
data := viewData
if fileMagic != roaring.MagicNumber {
// if the view data arrives is in the "standard" roaring format, we must
// make a copy of data in order allow for the convertion to the pilosa roaring run format
// make a copy of data in order allow for the conversion to the pilosa roaring run format
// in field.importRoaring
data = make([]byte, len(viewData))
copy(data, viewData)
@ -465,7 +465,7 @@ func importWorker(importWork chan importJob) {
}
}
// merge all rows to singled existence row
// combineForExistence unions all rows in the fragment to be imported into a single row to update the existence field. TODO: It would probably be more efficient to only unmarshal the input data once, and use the calculated existence Bitmap directly rather than returning it to bytes, but most of our ingest paths update existence separately, so it's more important that this just be obviously correct at the moment.
func combineForExistence(inputRoaringData []byte) ([]byte, error) {
rowSize := uint64(1 << shardVsContainerExponent)
rit, err := roaring.NewRoaringIterator(inputRoaringData)