jpe cleanup

Signed-off-by: Joe Elliott <number101010@gmail.com>

tempodb/encoding/backend_block.go

@@ -25,7 +25,7 @@ type BackendBlock struct {
 func NewBackendBlock(meta *backend.BlockMeta, r backend.Reader) (*BackendBlock, error) {
 	var encoding versionedEncoding
 
-	switch meta.Version { // jpe need a way to test this
+	switch meta.Version {
 	case "v0":
 		encoding = v0Encoding{}
 	case "v1":

tempodb/encoding/complete_block.go

@@ -35,7 +35,7 @@ type CompleteBlock struct {
 // NewCompleteBlock creates a new block and takes _ALL_ the parameters necessary to build the ordered, deduped file on disk
 func NewCompleteBlock(cfg *BlockConfig, originatingMeta *backend.BlockMeta, iterator common.Iterator, estimatedObjects int, filepath string, walFilename string) (*CompleteBlock, error) {
 	c := &CompleteBlock{
-		encoding:    latestEncoding(), // jpe - wut
+		encoding:    latestEncoding(),
 		meta:        backend.NewBlockMeta(originatingMeta.TenantID, uuid.New(), currentVersion, cfg.Encoding),
 		bloom:       common.NewWithEstimates(uint(estimatedObjects), cfg.BloomFP),
 		records:     make([]*common.Record, 0),

tempodb/encoding/v1/appender_buffered.go

@@ -9,7 +9,10 @@ import (
 	v0 "github.com/grafana/tempo/tempodb/encoding/v0"
 )
 
-// meteredWriter exists jpe
+// meteredWriter is a struct that is used to count the number of bytes
+// written to a block after compression.  Unfortunately the compression io.Reader
+// returns bytes before compression so this is necessary to know the actual number of
+// byte written.
 type meteredWriter struct {
 	wrappedWriter io.Writer
 	bytesWritten  int

tempodb/encoding/v1/finder_paged.go

@@ -5,10 +5,8 @@ import (
 	v0 "github.com/grafana/tempo/tempodb/encoding/v0"
 )
 
-// jpe comment
-// NewPagedFinder returns a pagedFinder. This finder is used for searching
-//  a set of records and returning an object. If a set of consecutive records has
-//  matching ids they will be combined using the ObjectCombiner.
+// NewPagedFinder returns a v0.pagedFinder.  There are no changes
+// to logic from the v0 finder and all compression changes are handled in the pageReader
 func NewPagedFinder(index common.IndexReader, r common.PageReader, combiner common.ObjectCombiner) common.Finder {
 	return v0.NewPagedFinder(index, r, combiner)
 }

tempodb/encoding/v1/iterator_paged.go

@@ -5,9 +5,8 @@ import (
 	v0 "github.com/grafana/tempo/tempodb/encoding/v0"
 )
 
-// jpe comment
-// NewPagedIterator returns a backendIterator.  This iterator is used to iterate
-//  through objects stored in object storage.
+// NewPagedIterator returns a v0.backendIterator.  There are no changes
+// to logic from the v0 iterator and all compression changes are handled in the pageReader
 func NewPagedIterator(chunkSizeBytes uint32, indexReader common.IndexReader, pageReader common.PageReader) common.Iterator {
 	return v0.NewPagedIterator(chunkSizeBytes, indexReader, pageReader)
 }

tempodb/encoding/versioned.go

@@ -25,7 +25,7 @@ type versionedEncoding interface {
 	appendBlockData(ctx context.Context, w backend.Writer, meta *backend.BlockMeta, tracker backend.AppendTracker, buffer []byte) (backend.AppendTracker, error)
 
 	newPageReader(ra io.ReaderAt, encoding backend.Encoding) (common.PageReader, error)
-	newIndexReader(indexBytes []byte) (common.IndexReader, error) // jpe make this newindexreader
+	newIndexReader(indexBytes []byte) (common.IndexReader, error)
 
 	nameIndex() string
 	nameObjects() string