github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-09-20 02:28:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51914 from sergeylanzman/master

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 55392, 55491, 51914, 55831, 55836). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Move regexp.MustCompile to global variable

Move regexp.MustCompile to global variable.
regexp.MustCompile heavy function and can be run on init app
```release-note
NONE
```

Kubernetes-commit: 79c22745660733c822cff6970db8ceb0b58a0989
This commit is contained in:
Kubernetes Publisher
2017-11-17 00:18:22 -08:00
parent be88969207 302b3649ef
commit 54736e510a
2 changed files with 707 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1400
Godeps/Godeps.json generated
View File

File diff suppressed because it is too large Load Diff

12
util/jsonpath/parser.go
View File

@@ -43,7 +43,11 @@ type Parser struct {
width int width int
} }
var ErrSyntax = errors.New("invalid syntax") var (
ErrSyntax = errors.New("invalid syntax")
dictKeyRex = regexp.MustCompile(`^'([^']*)'$`)
sliceOperatorRex = regexp.MustCompile(`^(-?[\d]*)(:-?[\d]*)?(:[\d]*)?$`)
)
// Parse parsed the given text and return a node Parser. // Parse parsed the given text and return a node Parser.
// If an error is encountered, parsing stops and an empty // If an error is encountered, parsing stops and an empty
@@ -283,8 +287,7 @@ Loop:
} }
// dict key // dict key
reg := regexp.MustCompile(`^'([^']*)'$`) value := dictKeyRex.FindStringSubmatch(text)
value := reg.FindStringSubmatch(text)
if value != nil { if value != nil {
parser, err := parseAction("arraydict", fmt.Sprintf(".%s", value[1])) parser, err := parseAction("arraydict", fmt.Sprintf(".%s", value[1]))
if err != nil { if err != nil {
@@ -297,8 +300,7 @@ Loop:
} }
//slice operator //slice operator
reg = regexp.MustCompile(`^(-?[\d]*)(:-?[\d]*)?(:[\d]*)?$`) value = sliceOperatorRex.FindStringSubmatch(text)
value = reg.FindStringSubmatch(text)
if value == nil { if value == nil {
return fmt.Errorf("invalid array index %s", text) return fmt.Errorf("invalid array index %s", text)
} }