mirror of
https://github.com/prometheus/prometheus.git
synced 2024-11-09 23:24:05 -08:00
66dfb951c4
* Add errors and Warnings to SeriesSet Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Change Querier interface and refactor accordingly Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Refactor promql/engine to propagate warnings at eval stage Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Address review issues Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Make sure all the series from all Selects are pre-advanced Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Address review issues Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Separate merge series sets Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Clean Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Refactor merge querier failure handling Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Refactored and simplified fanout with improvements from incoming chunk iterator PRs. * Secondary logic is hidden, instead of weird failed series set logic we had. * Fanout is well commented * Fanout closing record all errors * MergeQuerier improved API (clearer) * deferredGenericMergeSeriesSet is not needed as we return no samples anyway for failed series sets (next = false). Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Fix formatting Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Fix CI issues Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Added final tests for error handling. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed Brian's comments. * Moved hints in populate to be allocated only when needed. * Used sync.Once in secondary Querier to achieve all-or-nothing partial response logic. * Select after first Next is done will panic. NOTE: in lazySeriesSet in theory we could just panic, I think however we can totally just return error, it will panic in expand anyway. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Utilize errWithWarnings Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Fix recently introduced expansion issue Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Add tests for secondary querier error handling Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Implement lazy merge Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Add name to test cases Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Reorganize Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Address review comments Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Address review comments Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Remove redundant warnings Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Fix rebase mistake Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
139 lines
3.6 KiB
Go
139 lines
3.6 KiB
Go
// Copyright 2020 The Prometheus Authors
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
// This file holds boilerplate adapters for generic MergeSeriesSet and MergeQuerier functions, so we can have one optimized
|
|
// solution that works for both ChunkSeriesSet as well as SeriesSet.
|
|
|
|
package storage
|
|
|
|
import "github.com/prometheus/prometheus/pkg/labels"
|
|
|
|
type genericQuerier interface {
|
|
baseQuerier
|
|
Select(bool, *SelectHints, ...*labels.Matcher) genericSeriesSet
|
|
}
|
|
|
|
type genericSeriesSet interface {
|
|
Next() bool
|
|
At() Labels
|
|
Err() error
|
|
Warnings() Warnings
|
|
}
|
|
|
|
type genericSeriesMergeFunc func(...Labels) Labels
|
|
|
|
type genericSeriesSetAdapter struct {
|
|
SeriesSet
|
|
}
|
|
|
|
func (a *genericSeriesSetAdapter) At() Labels {
|
|
return a.SeriesSet.At()
|
|
}
|
|
|
|
type genericChunkSeriesSetAdapter struct {
|
|
ChunkSeriesSet
|
|
}
|
|
|
|
func (a *genericChunkSeriesSetAdapter) At() Labels {
|
|
return a.ChunkSeriesSet.At()
|
|
}
|
|
|
|
type genericQuerierAdapter struct {
|
|
baseQuerier
|
|
|
|
// One-of. If both are set, Querier will be used.
|
|
q Querier
|
|
cq ChunkQuerier
|
|
}
|
|
|
|
func (q *genericQuerierAdapter) Select(sortSeries bool, hints *SelectHints, matchers ...*labels.Matcher) genericSeriesSet {
|
|
if q.q != nil {
|
|
return &genericSeriesSetAdapter{q.q.Select(sortSeries, hints, matchers...)}
|
|
}
|
|
return &genericChunkSeriesSetAdapter{q.cq.Select(sortSeries, hints, matchers...)}
|
|
}
|
|
|
|
func newGenericQuerierFrom(q Querier) genericQuerier {
|
|
return &genericQuerierAdapter{baseQuerier: q, q: q}
|
|
}
|
|
|
|
func newGenericQuerierFromChunk(cq ChunkQuerier) genericQuerier {
|
|
return &genericQuerierAdapter{baseQuerier: cq, cq: cq}
|
|
}
|
|
|
|
type querierAdapter struct {
|
|
genericQuerier
|
|
}
|
|
|
|
type seriesSetAdapter struct {
|
|
genericSeriesSet
|
|
}
|
|
|
|
func (a *seriesSetAdapter) At() Series {
|
|
return a.genericSeriesSet.At().(Series)
|
|
}
|
|
|
|
func (q *querierAdapter) Select(sortSeries bool, hints *SelectHints, matchers ...*labels.Matcher) SeriesSet {
|
|
return &seriesSetAdapter{q.genericQuerier.Select(sortSeries, hints, matchers...)}
|
|
}
|
|
|
|
type chunkQuerierAdapter struct {
|
|
genericQuerier
|
|
}
|
|
|
|
type chunkSeriesSetAdapter struct {
|
|
genericSeriesSet
|
|
}
|
|
|
|
func (a *chunkSeriesSetAdapter) At() ChunkSeries {
|
|
return a.genericSeriesSet.At().(ChunkSeries)
|
|
}
|
|
|
|
func (q *chunkQuerierAdapter) Select(sortSeries bool, hints *SelectHints, matchers ...*labels.Matcher) ChunkSeriesSet {
|
|
return &chunkSeriesSetAdapter{q.genericQuerier.Select(sortSeries, hints, matchers...)}
|
|
}
|
|
|
|
type seriesMergerAdapter struct {
|
|
VerticalSeriesMergeFunc
|
|
}
|
|
|
|
func (a *seriesMergerAdapter) Merge(s ...Labels) Labels {
|
|
buf := make([]Series, 0, len(s))
|
|
for _, ser := range s {
|
|
buf = append(buf, ser.(Series))
|
|
}
|
|
return a.VerticalSeriesMergeFunc(buf...)
|
|
}
|
|
|
|
type chunkSeriesMergerAdapter struct {
|
|
VerticalChunkSeriesMergerFunc
|
|
}
|
|
|
|
func (a *chunkSeriesMergerAdapter) Merge(s ...Labels) Labels {
|
|
buf := make([]ChunkSeries, 0, len(s))
|
|
for _, ser := range s {
|
|
buf = append(buf, ser.(ChunkSeries))
|
|
}
|
|
return a.VerticalChunkSeriesMergerFunc(buf...)
|
|
}
|
|
|
|
type noopGenericSeriesSet struct{}
|
|
|
|
func (noopGenericSeriesSet) Next() bool { return false }
|
|
|
|
func (noopGenericSeriesSet) At() Labels { return nil }
|
|
|
|
func (noopGenericSeriesSet) Err() error { return nil }
|
|
|
|
func (noopGenericSeriesSet) Warnings() Warnings { return nil }
|