good bye vParquet!

Author: mdisibio

cmd/tempo-cli/cmd-analyse-block.go

@@ -17,7 +17,6 @@ import (
 	pq "github.com/grafana/tempo/pkg/parquetquery"
 	"github.com/stoewer/parquet-cli/pkg/inspect"
 
-	"github.com/grafana/tempo/tempodb/encoding/vparquet"
 	"github.com/grafana/tempo/tempodb/encoding/vparquet2"
 	"github.com/grafana/tempo/tempodb/encoding/vparquet3"
 
@@ -27,20 +26,6 @@ import (
 )
 
 var (
-	vparquetSpanAttrs = []string{
-		vparquet.FieldSpanAttrVal,
-		// TODO: Dedicated columns only support 'string' values.  We need to add support for other types
-		// vparquet.FieldSpanAttrValInt,
-		// vparquet.FieldSpanAttrValDouble,
-		// vparquet.FieldSpanAttrValBool,
-	}
-	vparquetResourceAttrs = []string{
-		vparquet.FieldResourceAttrVal,
-		// TODO: Dedicated columns only support 'string' values.  We need to add support for other types
-		// vparquet.FieldResourceAttrValInt,
-		// vparquet.FieldResourceAttrValDouble,
-		// vparquet.FieldResourceAttrValBool,
-	}
 	vparquet2SpanAttrs = []string{
 		vparquet2.FieldSpanAttrVal,
 	}
@@ -57,8 +42,6 @@ var (
 
 func spanPathsForVersion(v string) (string, []string) {
 	switch v {
-	case vparquet.VersionString:
-		return vparquet.FieldSpanAttrKey, vparquetSpanAttrs
 	case vparquet2.VersionString:
 		return vparquet2.FieldSpanAttrKey, vparquet2SpanAttrs
 	case vparquet3.VersionString:
@@ -69,8 +52,6 @@ func spanPathsForVersion(v string) (string, []string) {
 
 func resourcePathsForVersion(v string) (string, []string) {
 	switch v {
-	case vparquet.VersionString:
-		return vparquet.FieldResourceAttrKey, vparquetResourceAttrs
 	case vparquet2.VersionString:
 		return vparquet2.FieldResourceAttrKey, vparquet2ResourceAttrs
 	case vparquet3.VersionString:
@@ -138,8 +119,6 @@ func processBlock(r backend.Reader, tenantID, blockID string, maxStartTime, minS
 
 	var reader io.ReaderAt
 	switch meta.Version {
-	case vparquet.VersionString:
-		reader = vparquet.NewBackendReaderAt(context.Background(), r, vparquet.DataFileName, meta)
 	case vparquet2.VersionString:
 		reader = vparquet2.NewBackendReaderAt(context.Background(), r, vparquet2.DataFileName, meta)
 	case vparquet3.VersionString:

cmd/tempo-cli/cmd-convert-block.go

@@ -10,7 +10,7 @@ import (
 	"github.com/parquet-go/parquet-go"
 
 	pq "github.com/grafana/tempo/pkg/parquetquery"
-	"github.com/grafana/tempo/tempodb/encoding/vparquet"
+	"github.com/grafana/tempo/tempodb/encoding/vparquet3"
 )
 
 type listColumnCmd struct {
@@ -32,7 +32,7 @@ func (cmd *listColumnCmd) Run(ctx *globalOptions) error {
 		return err
 	}
 
-	rr := vparquet.NewBackendReaderAt(context.Background(), r, vparquet.DataFileName, meta)
+	rr := vparquet3.NewBackendReaderAt(context.Background(), r, vparquet3.DataFileName, meta)
 	pf, err := parquet.OpenFile(rr, int64(meta.Size))
 	if err != nil {
 		return err

cmd/tempo-cli/cmd-convert-parquet-1to2.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 
 	"github.com/google/uuid"
-	"github.com/grafana/tempo/tempodb/encoding/vparquet"
+	"github.com/grafana/tempo/tempodb/encoding/vparquet3"
 	"github.com/parquet-go/parquet-go"
 )
 
@@ -36,7 +36,7 @@ func (cmd *viewSchemaCmd) Run(ctx *globalOptions) error {
 	fmt.Printf("\n***************     block meta    *********************\n\n\n")
 	fmt.Printf("%+v\n", meta)
 
-	rr := vparquet.NewBackendReaderAt(context.Background(), r, vparquet.DataFileName, meta)
+	rr := vparquet3.NewBackendReaderAt(context.Background(), r, vparquet3.DataFileName, meta)
 	pf, err := parquet.OpenFile(rr, int64(meta.Size))
 	if err != nil {
 		return err

cmd/tempo-cli/cmd-list-column.go

@@ -79,8 +79,6 @@ var cli struct {
 	} `cmd:""`
 
 	Parquet struct {
-		Convert     convertParquet     `cmd:"" help:"convert from an existing file to tempodb parquet schema"`
-		Convert1to2 convertParquet1to2 `cmd:"" help:"convert an existing vParquet file to vParquet2 schema"`
 		Convert2to3 convertParquet2to3 `cmd:"" help:"convert an existing vParquet2 file to vParquet3 block"`
 		Convert3to4 convertParquet3to4 `cmd:"" help:"convert an existing vParquet3 file to vParquet4 block"`
 	} `cmd:""`