mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 05:34:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Simplify QueryAnalizer.Visit().

Browse source 
Change-Id: I628582a1903b7273e78921e22a475f1dae5ebaae
This commit is contained in:
Bjoern Rabenstein 2014-02-13 19:10:56 +01:00
parent fd63500ed3
commit 682cf6fc51
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rules/ast/query_analyzer.go
View file

@ -73,7 +73,11 @@ func (analyzer *QueryAnalyzer) Visit(node Node) {
}
n.fingerprints = fingerprints
for _, fingerprint := range fingerprints {
analyzer.IntervalRanges[*fingerprint] = true
// Only add the fingerprint to IntervalRanges if not yet present in FullRanges.
// Full ranges always contain more points and span more time than interval ranges.
if _, alreadyInFullRanges := analyzer.FullRanges[*fingerprint]; !alreadyInFullRanges {
analyzer.IntervalRanges[*fingerprint] = true
}
}
case *MatrixLiteral:
fingerprints, err := analyzer.storage.GetFingerprintsForLabelSet(n.labels)
@ -85,6 +89,10 @@ func (analyzer *QueryAnalyzer) Visit(node Node) {
for _, fingerprint := range fingerprints {
if analyzer.FullRanges[*fingerprint] < n.interval {
analyzer.FullRanges[*fingerprint] = n.interval
// Delete the fingerprint from IntervalRanges. Full ranges always contain
// more points and span more time than interval ranges, so we don't need
// an interval range for the same fingerprint, should we have one.
delete(analyzer.IntervalRanges, *fingerprint)
}
}
}
@ -94,12 +102,6 @@ func (analyzer *QueryAnalyzer) Visit(node Node) {
// each node to collect fingerprints.
func (analyzer *QueryAnalyzer) AnalyzeQueries(node Node) {
Walk(analyzer, node)
// Find and dedupe overlaps between full and stepped ranges. Full ranges
// always contain more points *and* span more time than stepped ranges, so
// throw away stepped ranges for fingerprints which have full ranges.
for fingerprint := range analyzer.FullRanges {
delete(analyzer.IntervalRanges, fingerprint)
}
}
func viewAdapterForInstantQuery(node Node, timestamp clientmodel.Timestamp, storage *metric.TieredStorage, queryStats *stats.TimerGroup) (*viewAdapter, error) {