Skip to content

[bugfix] Remove extra primary iter #3903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ie-pham merged 2 commits into from
Jul 24, 2024
Merged

[bugfix] Remove extra primary iter #3903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3304650
remove extra primary iter
ie-pham Jul 24, 2024
4741838
CHANGELOG
ie-pham Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
* [ENHANCEMENT] Add native histograms for internal metrics[#3870](https://github.com/grafana/tempo/pull/3870) (@zalegrala)
* [ENHANCEMENT] Reduce memory consumption of query-frontend[#3888](https://github.com/grafana/tempo/pull/3888) (@joe-elliott)
* [BUGFIX] Fix panic in certain metrics queries using `rate()` with `by` [#3847](https://github.com/grafana/tempo/pull/3847) (@stoewer)
* [BUGFIX] Fix double appending the primary iterator on second pass with event iterator [#3903](https://github.com/grafana/tempo/pull/3903) (@ie-pham)
* [BUGFIX] Fix metrics queries when grouping by attributes that may not exist [#3734](https://github.com/grafana/tempo/pull/3734) (@mdisibio)
* [BUGFIX] Fix frontend parsing error on cached responses [#3759](https://github.com/grafana/tempo/pull/3759) (@mdisibio)
* [BUGFIX] Fix autocomplete of a query using scoped instrinsics [#3865](https://github.com/grafana/tempo/pull/3865) (@mdisibio)
Expand Down
7 changes: 2 additions & 5 deletions tempodb/encoding/vparquet4/block_traceql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,7 @@ func createAllIterator(ctx context.Context, primaryIter parquetquery.Iterator, c
innerIterators = append(innerIterators, primaryIter)
}

eventIter, err := createEventIterator(makeIter, primaryIter, catConditions.event, allConditions, selectAll)
eventIter, err := createEventIterator(makeIter, catConditions.event, allConditions, selectAll)
if err != nil {
return nil, fmt.Errorf("creating event iterator: %w", err)
}
Expand Down Expand Up @@ -1590,7 +1590,7 @@ func createAllIterator(ctx context.Context, primaryIter parquetquery.Iterator, c
return createTraceIterator(makeIter, resourceIter, catConditions.trace, start, end, shardID, shardCount, allConditions, selectAll)
}

func createEventIterator(makeIter makeIterFn, primaryIter parquetquery.Iterator, conditions []traceql.Condition, allConditions bool, selectAll bool) (parquetquery.Iterator, error) {
func createEventIterator(makeIter makeIterFn, conditions []traceql.Condition, allConditions bool, selectAll bool) (parquetquery.Iterator, error) {
if len(conditions) == 0 {
return nil, nil
}
Expand Down Expand Up @@ -1622,9 +1622,6 @@ func createEventIterator(makeIter makeIterFn, primaryIter parquetquery.Iterator,
}

var required []parquetquery.Iterator
if primaryIter != nil {
required = []parquetquery.Iterator{primaryIter}
}

minCount := 0

Expand Down