Fix changelog entry position. Fix types after introduction of spanset…

…MetadataIterator (wrap it instead of spansetIterator)
grafana · Mar 6, 2023 · 529be34 · 529be34
1 parent af37d14
commit 529be34
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * [CHANGE] Update Go to 1.20 [#2079](https://github.com/grafana/tempo/pull/2079) (@scalalang2)
 * [BUGFIX] Retry copy operations during compaction in GCS backend [#2111](https://github.com/grafana/tempo/pull/2111) (@mapno)
 * [BUGFIX] Fix float/int comparisons in TraceQL. [#2139](https://github.com/grafana/tempo/issues/2139) (@joe-elliott)
+* [BUGFIX] Fix not closing WAL block file before attempting to delete the folder. [#2139](https://github.com/grafana/tempo/pull/2152) (@kostya9)
 
 ## v2.0.1 / 2023-03-03
 
@@ -21,7 +22,6 @@
 * [BUGFIX] Unescape query parameters in AWS Lambda to allow TraceQL queries to work. [#2114](https://github.com/grafana/tempo/issues/2114) (@joe-elliott)
 * [CHANGE] Pad leading zeroes in span id to always be 16 chars [#2062](https://github.com/grafana/tempo/pull/2062) (@ie-pham)
 * [BUGFIX] Fix float/int comparisons in TraceQL. [#2139](https://github.com/grafana/tempo/issues/2139) (@joe-elliott)
-* [BUGFIX] Fix not closing WAL block file before attempting to delete the folder. [#2139](https://github.com/grafana/tempo/pull/2152) (@kostya9)
 
 ## v2.0.0 / 2023-01-31
 

diff --git a/tempodb/encoding/vparquet/block_traceql.go b/tempodb/encoding/vparquet/block_traceql.go
@@ -301,10 +301,6 @@ func (i *spansetIterator) Close() {
 	i.iter.Close()
 }
 
-func (i *spansetIterator) Close() {
-	i.iter.Close()
-}
-
 // mergeSpansetIterator iterates through a slice of spansetIterators exhausting them
 // in order
 type mergeSpansetIterator struct {

diff --git a/tempodb/encoding/vparquet/block_traceql_meta.go b/tempodb/encoding/vparquet/block_traceql_meta.go
@@ -197,3 +197,7 @@ func (i *spansetMetadataIterator) Next(ctx context.Context) (*traceql.Spanset, e
 
 	return ss, nil
 }
+
+func (i *spansetMetadataIterator) Close() {
+	i.iter.Close()
+}
diff --git a/tempodb/encoding/vparquet/wal_block.go b/tempodb/encoding/vparquet/wal_block.go
@@ -254,7 +254,7 @@ func (b *pageFile) Close() error {
 }
 
 type pageFileClosingIterator struct {
-	iter     *spansetIterator
+	iter     *spansetMetadataIterator
 	pageFile *pageFile
 }