Drop intern package and lift method to parquetquery package

grafana · Nov 4, 2024 · 76876fe · 76876fe
1 parent 09b0809
commit 76876fe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 105 deletions.
diff --git a/pkg/parquetquery/intern/intern.go b/pkg/parquetquery/intern/intern.go
diff --git a/pkg/parquetquery/intern/intern_test.go b/pkg/parquetquery/intern/intern_test.go
diff --git a/pkg/parquetquery/iters.go b/pkg/parquetquery/iters.go
@@ -9,8 +9,8 @@ import (
 	"math"
 	"sync"
 	"sync/atomic"
+	"unique"
 
-	"github.com/grafana/tempo/pkg/parquetquery/intern"
 	"github.com/grafana/tempo/pkg/util"
 	pq "github.com/parquet-go/parquet-go"
 	"go.opentelemetry.io/otel"
@@ -781,7 +781,6 @@ type SyncIteratorOpt func(*SyncIterator)
 func SyncIteratorOptIntern() SyncIteratorOpt {
 	return func(i *SyncIterator) {
 		i.intern = true
-		i.interner = intern.New()
 	}
 }
 
@@ -814,8 +813,7 @@ type SyncIterator struct {
 	currPageN       int
 	at              IteratorResult // Current value pointed at by iterator. Returned by call Next and SeekTo, valid until next call.
 
-	intern   bool
-	interner *intern.Interner
+	intern bool
 }
 
 var _ Iterator = (*SyncIterator)(nil)
@@ -1248,7 +1246,7 @@ func (c *SyncIterator) makeResult(t RowNumber, v *pq.Value) *IteratorResult {
 	// always have length 0 or 1.
 	if len(c.at.Entries) == 1 {
 		if c.intern {
-			c.at.Entries[0].Value = c.interner.UnsafeClone(v)
+			c.at.Entries[0].Value = pqValueIntern(v)
 		} else {
 			c.at.Entries[0].Value = v.Clone()
 		}
@@ -1257,6 +1255,15 @@ func (c *SyncIterator) makeResult(t RowNumber, v *pq.Value) *IteratorResult {
 	return &c.at
 }
 
+func pqValueIntern(v *pq.Value) pq.Value {
+	switch v.Kind() {
+	case pq.ByteArray, pq.FixedLenByteArray:
+		return *unique.Make(v).Value()
+	default:
+		return *v
+	}
+}
+
 func (c *SyncIterator) Close() {
 	c.closeCurrRowGroup()