From 1b87b7148ee7e8937cd3e71e3b97a2fe44cdc3ed Mon Sep 17 00:00:00 2001 From: tgruben Date: Mon, 22 Feb 2021 11:06:55 -0600 Subject: [PATCH 1/2] Update api.go Co-authored-by: Matthew Jaffee --- api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api.go b/api.go index 34976f0df..7c3bc8ceb 100644 --- a/api.go +++ b/api.go @@ -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) From c2da1d267158171338acc74a47a48b0b9195429c Mon Sep 17 00:00:00 2001 From: tgruben Date: Mon, 22 Feb 2021 11:07:41 -0600 Subject: [PATCH 2/2] Update api.go Co-authored-by: Matthew Jaffee --- api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api.go b/api.go index 7c3bc8ceb..3a7dc36cf 100644 --- a/api.go +++ b/api.go @@ -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)