From 8e44fba76d092c594d16a5466152b56ee1986410 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 6 Aug 2020 18:44:18 +0300 Subject: [PATCH] lib/storage: reduce the frequency (and overhead) for timeout and pace limiter checks by 4x --- lib/storage/index_db.go | 20 ++++++++++---------- lib/storage/search.go | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/storage/index_db.go b/lib/storage/index_db.go index 04642d797..2030bdccb 100644 --- a/lib/storage/index_db.go +++ b/lib/storage/index_db.go @@ -780,7 +780,7 @@ func (is *indexSearch) searchTagKeys(tks map[string]struct{}, maxTagKeys int) er prefix := kb.B ts.Seek(prefix) for len(tks) < maxTagKeys && ts.NextItem() { - if loopsPaceLimiter&(1<<16) == 0 { + if loopsPaceLimiter&(1<<18) == 0 { if err := checkSearchDeadlineAndPace(is.deadline); err != nil { return err } @@ -860,7 +860,7 @@ func (is *indexSearch) searchTagValues(tvs map[string]struct{}, tagKey []byte, m prefix := kb.B ts.Seek(prefix) for len(tvs) < maxTagValues && ts.NextItem() { - if loopsPaceLimiter&(1<<16) == 0 { + if loopsPaceLimiter&(1<<18) == 0 { if err := checkSearchDeadlineAndPace(is.deadline); err != nil { return err } @@ -936,7 +936,7 @@ func (is *indexSearch) getSeriesCount() (uint64, error) { kb.B = marshalTagValue(kb.B, nil) ts.Seek(kb.B) for ts.NextItem() { - if loopsPaceLimiter&(1<<16) == 0 { + if loopsPaceLimiter&(1<<18) == 0 { if err := checkSearchDeadlineAndPace(is.deadline); err != nil { return 0, err } @@ -1008,7 +1008,7 @@ func (is *indexSearch) getTSDBStatusForDate(date uint64, topN int) (*TSDBStatus, prefix := kb.B ts.Seek(prefix) for ts.NextItem() { - if loopsPaceLimiter&(1<<16) == 0 { + if loopsPaceLimiter&(1<<18) == 0 { if err := checkSearchDeadlineAndPace(is.deadline); err != nil { return nil, err } @@ -1532,7 +1532,7 @@ func (is *indexSearch) searchTSIDs(tfss []*TagFilters, tr TimeRange, maxMetrics tsids := make([]TSID, len(metricIDs)) i := 0 for loopsPaceLimiter, metricID := range metricIDs { - if loopsPaceLimiter&(1<<10) == 0 { + if loopsPaceLimiter&(1<<12) == 0 { if err := checkSearchDeadlineAndPace(is.deadline); err != nil { return nil, err } @@ -1604,7 +1604,7 @@ func (is *indexSearch) updateMetricIDsByMetricNameMatch(metricIDs, srcMetricIDs mn := GetMetricName() defer PutMetricName(mn) for loopsPaceLimiter, metricID := range sortedMetricIDs { - if loopsPaceLimiter&(1<<10) == 0 { + if loopsPaceLimiter&(1<<12) == 0 { if err := checkSearchDeadlineAndPace(is.deadline); err != nil { return err } @@ -2092,7 +2092,7 @@ func (is *indexSearch) getMetricIDsForTagFilterSlow(tf *tagFilter, maxLoops int, prefix := tf.prefix ts.Seek(prefix) for ts.NextItem() { - if loopsPaceLimiter&(1<<14) == 0 { + if loopsPaceLimiter&(1<<16) == 0 { if err := checkSearchDeadlineAndPace(is.deadline); err != nil { return err } @@ -2216,7 +2216,7 @@ func (is *indexSearch) updateMetricIDsForOrSuffixNoFilter(prefix []byte, maxMetr loopsPaceLimiter := 0 ts.Seek(prefix) for metricIDs.Len() < maxMetrics && ts.NextItem() { - if loopsPaceLimiter&(1<<16) == 0 { + if loopsPaceLimiter&(1<<18) == 0 { if err := checkSearchDeadlineAndPace(is.deadline); err != nil { return err } @@ -2258,7 +2258,7 @@ func (is *indexSearch) updateMetricIDsForOrSuffixWithFilter(prefix []byte, metri var sf []uint64 var metricID uint64 for ts.NextItem() { - if loopsPaceLimiter&(1<<12) == 0 { + if loopsPaceLimiter&(1<<14) == 0 { if err := checkSearchDeadlineAndPace(is.deadline); err != nil { return err } @@ -2799,7 +2799,7 @@ func (is *indexSearch) updateMetricIDsForPrefix(prefix []byte, metricIDs *uint64 loopsPaceLimiter := 0 ts.Seek(prefix) for ts.NextItem() { - if loopsPaceLimiter&(1<<16) == 0 { + if loopsPaceLimiter&(1<<18) == 0 { if err := checkSearchDeadlineAndPace(is.deadline); err != nil { return err } diff --git a/lib/storage/search.go b/lib/storage/search.go index ed570e073..a8cb32f9a 100644 --- a/lib/storage/search.go +++ b/lib/storage/search.go @@ -139,7 +139,7 @@ func (s *Search) NextMetricBlock() bool { return false } for s.ts.NextBlock() { - if s.loops&(1<<10) == 0 { + if s.loops&(1<<12) == 0 { if err := checkSearchDeadlineAndPace(s.deadline); err != nil { s.err = err return false