vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

pkg/units: Refactor regexp.Compile to init()

Browse source 
No need to recompile a fixed regular expression each time the function
executes. Abstracting it to the `init()` method.

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
This commit is contained in:
Francisco Carriedo 2014-07-21 23:50:27 -07:00
parent f26b6b00d3
commit d56f2248e4
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
units/size.go
View file

@ -7,6 +7,15 @@ import (
"strings" "strings"
) )
var sizeRegex *regexp.Regexp
func init() {
var err error
if sizeRegex, err = regexp.Compile("^(\\d+)([kKmMgGtTpP])?[bB]?$"); err != nil {
panic("Failed to compile the 'size' regular expression")
}
}
// HumanSize returns a human-readable approximation of a size // HumanSize returns a human-readable approximation of a size
// using SI standard (eg. "44kB", "17MB") // using SI standard (eg. "44kB", "17MB")
func HumanSize(size int64) string { func HumanSize(size int64) string {
@ -24,12 +33,7 @@ func HumanSize(size int64) string {
// FromHumanSize returns an integer from a human-readable specification of a size // FromHumanSize returns an integer from a human-readable specification of a size
// using SI standard (eg. "44kB", "17MB") // using SI standard (eg. "44kB", "17MB")
func FromHumanSize(size string) (int64, error) { func FromHumanSize(size string) (int64, error) {
re, err := regexp.Compile("^(\\d+)([kKmMgGtTpP])?[bB]?$") matches := sizeRegex.FindStringSubmatch(size)
if err != nil {
return -1, fmt.Errorf("%s does not specify not a size", size)
}
matches := re.FindStringSubmatch(size)
if len(matches) != 3 { if len(matches) != 3 {
return -1, fmt.Errorf("Invalid size: '%s'", size) return -1, fmt.Errorf("Invalid size: '%s'", size)
@ -63,12 +67,7 @@ func FromHumanSize(size string) (int64, error) {
// returns the number of bytes, or -1 if the string is unparseable. // returns the number of bytes, or -1 if the string is unparseable.
// Units are case-insensitive, and the 'b' suffix is optional. // Units are case-insensitive, and the 'b' suffix is optional.
func RAMInBytes(size string) (int64, error) { func RAMInBytes(size string) (int64, error) {
re, err := regexp.Compile("^(\\d+)([kKmMgGtTpP])?[bB]?$") matches := sizeRegex.FindStringSubmatch(size)
if err != nil {
return -1, err
}
matches := re.FindStringSubmatch(size)
if len(matches) != 3 { if len(matches) != 3 {
return -1, fmt.Errorf("Invalid size: '%s'", size) return -1, fmt.Errorf("Invalid size: '%s'", size)