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

Merge pull request #7210 from fcarriedo/refactor-common-code

Browse source 
pkg/units: Refactor common code
This commit is contained in:
Victor Vieux 2014-07-28 11:45:46 -07:00
commit 9f4db5ab98
3 changed files with 133 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
units/duration_test.go
View file

@ -44,9 +44,3 @@ func TestHumanDuration(t *testing.T) {
assertEquals(t, "2.010959 years", HumanDuration(24*month+2*week)) assertEquals(t, "2.010959 years", HumanDuration(24*month+2*week))
assertEquals(t, "3.164384 years", HumanDuration(3*year+2*month)) assertEquals(t, "3.164384 years", HumanDuration(3*year+2*month))
} }
func assertEquals(t *testing.T, expected, actual interface{}) {
if expected != actual {
t.Errorf("Expected '%s' but got '%s'", expected, actual)
}
}

102
units/size.go
View file

@ -7,54 +7,54 @@ import (
"strings" "strings"
) )
// See: http://en.wikipedia.org/wiki/Binary_prefix
const (
// Decimal
KB = 1000
MB = 1000 * KB
GB = 1000 * MB
TB = 1000 * GB
PB = 1000 * TB
// Binary
KiB = 1024
MiB = 1024 * KiB
GiB = 1024 * MiB
TiB = 1024 * GiB
PiB = 1024 * TiB
)
type unitMap map[string]int64
var (
decimalMap = unitMap{"k": KB, "m": MB, "g": GB, "t": TB, "p": PB}
binaryMap = unitMap{"k": KiB, "m": MiB, "g": GiB, "t": TiB, "p": PiB}
)
var sizeRegex *regexp.Regexp
func init() {
sizeRegex = regexp.MustCompile("^(\\d+)([kKmMgGtTpP])?[bB]?$")
}
var unitAbbrs = [...]string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}
// 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 {
i := 0 i := 0
var sizef float64 sizef := float64(size)
sizef = float64(size)
units := []string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}
for sizef >= 1000.0 { for sizef >= 1000.0 {
sizef = sizef / 1000.0 sizef = sizef / 1000.0
i++ i++
} }
return fmt.Sprintf("%.4g %s", sizef, units[i]) return fmt.Sprintf("%.4g %s", sizef, unitAbbrs[i])
} }
// FromHumanSize returns an integer from a human-readable specification of a size // FromHumanSize returns an integer from a human-readable specification of a
// using SI standard (eg. "44kB", "17MB") // size 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]?$") return parseSize(size, decimalMap)
if err != nil {
return -1, fmt.Errorf("%s does not specify not a size", size)
}
matches := re.FindStringSubmatch(size)
if len(matches) != 3 {
return -1, fmt.Errorf("Invalid size: '%s'", size)
}
theSize, err := strconv.ParseInt(matches[1], 10, 0)
if err != nil {
return -1, err
}
unit := strings.ToLower(matches[2])
if unit == "k" {
theSize *= 1000
} else if unit == "m" {
theSize *= 1000 * 1000
} else if unit == "g" {
theSize *= 1000 * 1000 * 1000
} else if unit == "t" {
theSize *= 1000 * 1000 * 1000 * 1000
} else if unit == "p" {
theSize *= 1000 * 1000 * 1000 * 1000 * 1000
}
return theSize, nil
} }
// Parses a human-readable string representing an amount of RAM // Parses a human-readable string representing an amount of RAM
@ -62,33 +62,25 @@ 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+)([kKmMgGtT])?[bB]?$") return parseSize(size, binaryMap)
if err != nil {
return -1, err
} }
matches := re.FindStringSubmatch(size) // Parses the human-readable size string into the amount it represents
func parseSize(sizeStr string, uMap unitMap) (int64, error) {
matches := sizeRegex.FindStringSubmatch(sizeStr)
if len(matches) != 3 { if len(matches) != 3 {
return -1, fmt.Errorf("Invalid size: '%s'", size) return -1, fmt.Errorf("Invalid size: '%s'", sizeStr)
} }
memLimit, err := strconv.ParseInt(matches[1], 10, 0) size, err := strconv.ParseInt(matches[1], 10, 0)
if err != nil { if err != nil {
return -1, err return -1, err
} }
unit := strings.ToLower(matches[2]) unitPrefix := strings.ToLower(matches[2])
if mul, ok := uMap[unitPrefix]; ok {
if unit == "k" { size *= mul
memLimit *= 1024
} else if unit == "m" {
memLimit *= 1024 * 1024
} else if unit == "g" {
memLimit *= 1024 * 1024 * 1024
} else if unit == "t" {
memLimit *= 1024 * 1024 * 1024 * 1024
} }
return memLimit, nil return size, nil
} }

141
units/size_test.go
View file

@ -1,6 +1,9 @@
package units package units
import ( import (
"reflect"
"runtime"
"strings"
"testing" "testing"
) )
@ -9,81 +12,87 @@ func TestHumanSize(t *testing.T) {
assertEquals(t, "1.024 kB", HumanSize(1024)) assertEquals(t, "1.024 kB", HumanSize(1024))
assertEquals(t, "1 MB", HumanSize(1000000)) assertEquals(t, "1 MB", HumanSize(1000000))
assertEquals(t, "1.049 MB", HumanSize(1048576)) assertEquals(t, "1.049 MB", HumanSize(1048576))
assertEquals(t, "2 MB", HumanSize(2*1000*1000)) assertEquals(t, "2 MB", HumanSize(2*MB))
assertEquals(t, "3.42 GB", HumanSize(3.42*1000*1000*1000)) assertEquals(t, "3.42 GB", HumanSize(3.42*GB))
assertEquals(t, "5.372 TB", HumanSize(5.372*1000*1000*1000*1000)) assertEquals(t, "5.372 TB", HumanSize(5.372*TB))
assertEquals(t, "2.22 PB", HumanSize(2.22*1000*1000*1000*1000*1000)) assertEquals(t, "2.22 PB", HumanSize(2.22*PB))
assertEquals(t, "2.22 EB", HumanSize(2.22*1000*1000*1000*1000*1000*1000))
assertEquals(t, "7.707 EB", HumanSize(7.707*1000*1000*1000*1000*1000*1000))
} }
func TestFromHumanSize(t *testing.T) { func TestFromHumanSize(t *testing.T) {
assertFromHumanSize(t, "32", false, 32) assertSuccessEquals(t, 32, FromHumanSize, "32")
assertFromHumanSize(t, "32b", false, 32) assertSuccessEquals(t, 32, FromHumanSize, "32b")
assertFromHumanSize(t, "32B", false, 32) assertSuccessEquals(t, 32, FromHumanSize, "32B")
assertFromHumanSize(t, "32k", false, 32*1000) assertSuccessEquals(t, 32*KB, FromHumanSize, "32k")
assertFromHumanSize(t, "32K", false, 32*1000) assertSuccessEquals(t, 32*KB, FromHumanSize, "32K")
assertFromHumanSize(t, "32kb", false, 32*1000) assertSuccessEquals(t, 32*KB, FromHumanSize, "32kb")
assertFromHumanSize(t, "32Kb", false, 32*1000) assertSuccessEquals(t, 32*KB, FromHumanSize, "32Kb")
assertFromHumanSize(t, "32Mb", false, 32*1000*1000) assertSuccessEquals(t, 32*MB, FromHumanSize, "32Mb")
assertFromHumanSize(t, "32Gb", false, 32*1000*1000*1000) assertSuccessEquals(t, 32*GB, FromHumanSize, "32Gb")
assertFromHumanSize(t, "32Tb", false, 32*1000*1000*1000*1000) assertSuccessEquals(t, 32*TB, FromHumanSize, "32Tb")
assertFromHumanSize(t, "8Pb", false, 8*1000*1000*1000*1000*1000) assertSuccessEquals(t, 32*PB, FromHumanSize, "32Pb")
assertFromHumanSize(t, "", true, -1) assertError(t, FromHumanSize, "")
assertFromHumanSize(t, "hello", true, -1) assertError(t, FromHumanSize, "hello")
assertFromHumanSize(t, "-32", true, -1) assertError(t, FromHumanSize, "-32")
assertFromHumanSize(t, " 32 ", true, -1) assertError(t, FromHumanSize, "32.3")
assertFromHumanSize(t, "32 mb", true, -1) assertError(t, FromHumanSize, " 32 ")
assertFromHumanSize(t, "32m b", true, -1) assertError(t, FromHumanSize, "32.3Kb")
assertFromHumanSize(t, "32bm", true, -1) assertError(t, FromHumanSize, "32 mb")
} assertError(t, FromHumanSize, "32m b")
assertError(t, FromHumanSize, "32bm")
func assertFromHumanSize(t *testing.T, size string, expectError bool, expectedBytes int64) {
actualBytes, err := FromHumanSize(size)
if (err != nil) && !expectError {
t.Errorf("Unexpected error parsing '%s': %s", size, err)
}
if (err == nil) && expectError {
t.Errorf("Expected to get an error parsing '%s', but got none (bytes=%d)", size, actualBytes)
}
if actualBytes != expectedBytes {
t.Errorf("Expected '%s' to parse as %d bytes, got %d", size, expectedBytes, actualBytes)
}
} }
func TestRAMInBytes(t *testing.T) { func TestRAMInBytes(t *testing.T) {
assertRAMInBytes(t, "32", false, 32) assertSuccessEquals(t, 32, RAMInBytes, "32")
assertRAMInBytes(t, "32b", false, 32) assertSuccessEquals(t, 32, RAMInBytes, "32b")
assertRAMInBytes(t, "32B", false, 32) assertSuccessEquals(t, 32, RAMInBytes, "32B")
assertRAMInBytes(t, "32k", false, 32*1024) assertSuccessEquals(t, 32*KiB, RAMInBytes, "32k")
assertRAMInBytes(t, "32K", false, 32*1024) assertSuccessEquals(t, 32*KiB, RAMInBytes, "32K")
assertRAMInBytes(t, "32kb", false, 32*1024) assertSuccessEquals(t, 32*KiB, RAMInBytes, "32kb")
assertRAMInBytes(t, "32Kb", false, 32*1024) assertSuccessEquals(t, 32*KiB, RAMInBytes, "32Kb")
assertRAMInBytes(t, "32Mb", false, 32*1024*1024) assertSuccessEquals(t, 32*MiB, RAMInBytes, "32Mb")
assertRAMInBytes(t, "32MB", false, 32*1024*1024) assertSuccessEquals(t, 32*GiB, RAMInBytes, "32Gb")
assertRAMInBytes(t, "32Gb", false, 32*1024*1024*1024) assertSuccessEquals(t, 32*TiB, RAMInBytes, "32Tb")
assertRAMInBytes(t, "32G", false, 32*1024*1024*1024) assertSuccessEquals(t, 32*PiB, RAMInBytes, "32Pb")
assertRAMInBytes(t, "32Tb", false, 32*1024*1024*1024*1024) assertSuccessEquals(t, 32*PiB, RAMInBytes, "32PB")
assertSuccessEquals(t, 32*PiB, RAMInBytes, "32P")
assertRAMInBytes(t, "", true, -1) assertError(t, RAMInBytes, "")
assertRAMInBytes(t, "hello", true, -1) assertError(t, RAMInBytes, "hello")
assertRAMInBytes(t, "-32", true, -1) assertError(t, RAMInBytes, "-32")
assertRAMInBytes(t, " 32 ", true, -1) assertError(t, RAMInBytes, "32.3")
assertRAMInBytes(t, "32 mb", true, -1) assertError(t, RAMInBytes, " 32 ")
assertRAMInBytes(t, "32m b", true, -1) assertError(t, RAMInBytes, "32.3Kb")
assertRAMInBytes(t, "32bm", true, -1) assertError(t, RAMInBytes, "32 mb")
assertError(t, RAMInBytes, "32m b")
assertError(t, RAMInBytes, "32bm")
} }
func assertRAMInBytes(t *testing.T, size string, expectError bool, expectedBytes int64) { func assertEquals(t *testing.T, expected, actual interface{}) {
actualBytes, err := RAMInBytes(size) if expected != actual {
if (err != nil) && !expectError { t.Errorf("Expected '%v' but got '%v'", expected, actual)
t.Errorf("Unexpected error parsing '%s': %s", size, err) }
} }
if (err == nil) && expectError {
t.Errorf("Expected to get an error parsing '%s', but got none (bytes=%d)", size, actualBytes) // func that maps to the parse function signatures as testing abstraction
} type parseFn func(string) (int64, error)
if actualBytes != expectedBytes {
t.Errorf("Expected '%s' to parse as %d bytes, got %d", size, expectedBytes, actualBytes) // Define 'String()' for pretty-print
func (fn parseFn) String() string {
fnName := runtime.FuncForPC(reflect.ValueOf(fn).Pointer()).Name()
return fnName[strings.LastIndex(fnName, ".")+1:]
}
func assertSuccessEquals(t *testing.T, expected int64, fn parseFn, arg string) {
res, err := fn(arg)
if err != nil || res != expected {
t.Errorf("%s(\"%s\") -> expected '%d' but got '%d' with error '%v'", fn, arg, expected, res, err)
}
}
func assertError(t *testing.T, fn parseFn, arg string) {
res, err := fn(arg)
if err == nil && res != -1 {
t.Errorf("%s(\"%s\") -> expected error but got '%d'", fn, arg, res)
} }
} }