Skip to content

Reduce memory allocations in interpolation #5909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2021
Merged

Reduce memory allocations in interpolation #5909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions sdk/interpolate/interpolate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ func Do(input string, vars map[string]string) (string, error) {
var processedExpression = map[string]void{}
sm := interpolateRegex.FindAllStringSubmatch(input, -1)
if len(sm) > 0 {
var usedVariables = make(map[string]void, len(vars))
var usedHelpers = make(map[string]void, len(InterpolateHelperFuncs))
for i := 0; i < len(sm); i++ {
if len(sm[i]) > 0 {
var expression = strings.TrimSpace(sm[i][1])
Expand All @@ -92,8 +94,6 @@ func Do(input string, vars map[string]string) (string, error) {
}
processedExpression[expression] = void{}

var usedVariables = make(map[string]void, len(vars))
var usedHelpers = make(map[string]void, len(InterpolateHelperFuncs))
var quotedStuff = []string{}
var trimmedExpression = strings.TrimPrefix(expression, "{{")
trimmedExpression = strings.TrimSuffix(trimmedExpression, "}}")
Expand Down Expand Up @@ -125,23 +125,25 @@ func Do(input string, vars map[string]string) (string, error) {
}
}

var defaultIsUsed bool
if _, ok := usedHelpers["default"]; ok {
defaultIsUsed = true
}

unknownVariables := make([]string, 0, 1000)
for v := range usedVariables {
if _, is := flatData[v]; !is {
unknownVariables = append(unknownVariables, v)
}
delete(usedVariables, v)
}

unknownHelpers := make([]string, 0, 1000)
for h := range usedHelpers {
if _, is := InterpolateHelperFuncs[h]; !is {
unknownHelpers = append(unknownHelpers, h)
}
}

var defaultIsUsed bool
if _, ok := usedHelpers["default"]; ok {
defaultIsUsed = true
delete(usedHelpers, h)
}

if !defaultIsUsed && (len(unknownVariables) > 0 || len(unknownHelpers) > 0) {
Expand Down