lib/storage: tune the logic for sorting tag filters according the their exeuction times

This commit is contained in:
Aliaksandr Valialkin 2021-02-17 15:00:08 +02:00
parent 1a19702d92
commit 9d1f14d94c

View file

@ -2811,23 +2811,21 @@ func (is *indexSearch) getMetricIDsForDateAndFilters(date uint64, tfs *TagFilter
} }
tfws := make([]tagFilterWithWeight, len(tfs.tfs)) tfws := make([]tagFilterWithWeight, len(tfs.tfs))
ct := fasttime.UnixTimestamp() ct := fasttime.UnixTimestamp()
hasDurationReset := false
for i := range tfs.tfs { for i := range tfs.tfs {
tf := &tfs.tfs[i] tf := &tfs.tfs[i]
durationSeconds, lastQueryTimestamp := is.getDurationAndTimestampForDateFilter(date, tf) durationSeconds, lastQueryTimestamp := is.getDurationAndTimestampForDateFilter(date, tf)
if ct > lastQueryTimestamp+60 { if durationSeconds == 0 && (tf.isNegative || tf.isRegexp && len(tf.orSuffixes) == 0) {
// It is time to update filter duration stats.
if tf.isNegative || tf.isRegexp && len(tf.orSuffixes) == 0 {
// Negative and regexp filters usually take the most time, so move them to the end of filters // Negative and regexp filters usually take the most time, so move them to the end of filters
// in the hope they won't be executed at all. // in the hope they won't be executed at all.
if durationSeconds == 0 {
durationSeconds = 10 durationSeconds = 10
is.storeDurationAndTimestampForDateFilter(date, tf, durationSeconds, 0)
} }
} else { if !hasDurationReset && ct > lastQueryTimestamp+10*60 && durationSeconds < 0.2 {
// Reset duration stats for relatively fast {key="value"} and {key=~"foo|bar|baz"} filters, so it is re-populated below. // Reset duration stats for relatively fast filters, so it is re-populated below.
if durationSeconds < 0.5 { // Reset duration for a single filter at a time in order to reduce negative impact on query time.
durationSeconds = 0 durationSeconds = 0
} hasDurationReset = true
}
} }
tfws[i] = tagFilterWithWeight{ tfws[i] = tagFilterWithWeight{
tf: tf, tf: tf,