github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib/storage: reduce memory allocations when merging metricID sets

Browse source
This commit is contained in:
Aliaksandr Valialkin 2020-01-17 22:10:36 +02:00
parent 0c8ad08578
commit f9289b804a
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/storage/index_db.go
View file

@ -1749,7 +1749,7 @@ func (is *indexSearch) updateMetricIDsForTagFilters(metricIDs *uint64set.Set, tf
}
minMetricIDs = mIDs
}
metricIDs.Union(minMetricIDs)
metricIDs.UnionMayOwn(minMetricIDs)
return nil
}
@ -2068,7 +2068,7 @@ func (is *indexSearch) getMetricIDsForTimeRange(tr TimeRange, maxMetrics int) (*
err := isLocal.getMetricIDsForDate(date, &result, maxMetrics)
mu.Lock()
if metricIDs.Len() < maxMetrics {
metricIDs.Union(&result)
metricIDs.UnionMayOwn(&result)
}
if err != nil {
errGlobal = err
@ -2114,7 +2114,7 @@ func (is *indexSearch) tryUpdatingMetricIDsForDateRange(metricIDs *uint64set.Set
ok, err := isLocal.tryUpdatingMetricIDsForDate(date, &result, tfs, maxMetrics)
mu.Lock()
if metricIDs.Len() < maxMetrics {
metricIDs.Union(&result)
metricIDs.UnionMayOwn(&result)
}
if !ok {
okGlobal = ok
@ -2203,7 +2203,7 @@ func (is *indexSearch) tryUpdatingMetricIDsForDate(date uint64, metricIDs *uint6
return true, nil
}
}
metricIDs.Union(result)
metricIDs.UnionMayOwn(result)
return true, nil
}

25
lib/uint64set/uint64set.go
View file

@ -165,16 +165,33 @@ func (s *Set) sort() {
// Union adds all the items from a to s.
func (s *Set) Union(a *Set) {
s.union(a, false)
}
// UnionMayOwn adds all the items from a to s.
//
// It may own a if s is empty. This means that `a` cannot be used
// after the call to UnionMayOwn.
func (s *Set) UnionMayOwn(a *Set) {
s.union(a, true)
}
func (s *Set) union(a *Set, mayOwn bool) {
if mayOwn && s.Len() < a.Len() {
// Swap `a` with `s` in order to reduce the number of iterations in ForEach loop below.
// This operation is safe only if `a` is no longer used after the call to union.
*a, *s = *s, *a
}
if a.Len() == 0 {
// Fast path - nothing to union.
return
}
if s.Len() == 0 {
// Fast path - just copy a.
aCopy := a.Clone()
*s = *aCopy
return
}
if a.Len() == 0 {
// Fast path - nothing to union.
return
}
a.ForEach(func(part []uint64) bool {
for _, x := range part {
s.Add(x)