ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2025-04-08 22:45:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Name change, the official usage is prefix

Browse Source
This commit is contained in:
Thomas Roehl 2022-03-10 14:51:27 +01:00
parent c9fb8ca327
commit 230a21513d
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
internal/ccUnits/ccUnitScale.go → internal/ccUnits/ccUnitPrefix.go
View File

@ -2,28 +2,28 @@ package ccunits
import "regexp" import "regexp"
type Scale float64 type Prefix float64
const ( const (
Base Scale = iota Base Prefix = iota
Peta = 1e15 Peta = 1e15
Tera = 1e12 Tera = 1e12
Giga = 1e9 Giga = 1e9
Mega = 1e6 Mega = 1e6
Kilo = 1e3 Kilo = 1e3
Milli = 1e-3 Milli = 1e-3
Micro = 1e-6 Micro = 1e-6
Nano = 1e-9 Nano = 1e-9
Kibi = 1024 Kibi = 1024
Mebi = 1024 * 1024 Mebi = 1024 * 1024
Gibi = 1024 * 1024 * 1024 Gibi = 1024 * 1024 * 1024
Tebi = 1024 * 1024 * 1024 * 1024 Tebi = 1024 * 1024 * 1024 * 1024
) )
const prefixRegexStr = `^([kKmMgGtTpP]?[i]?)(.*)` const prefixRegexStr = `^([kKmMgGtTpP]?[i]?)(.*)`
var prefixRegex = regexp.MustCompile(prefixRegexStr) var prefixRegex = regexp.MustCompile(prefixRegexStr)
func (s *Scale) String() string { func (s *Prefix) String() string {
switch *s { switch *s {
case Base: case Base:
return "" return ""
@ -56,7 +56,7 @@ func (s *Scale) String() string {
} }
} }
func (s *Scale) Prefix() string { func (s *Prefix) Prefix() string {
switch *s { switch *s {
case Base: case Base:
return "" return ""
@ -89,7 +89,7 @@ func (s *Scale) Prefix() string {
} }
} }
func NewScale(prefix string) Scale { func NewPrefix(prefix string) Prefix {
switch prefix { switch prefix {
case "k": case "k":
return Kilo return Kilo

10
internal/ccUnits/ccUnits.go
View File

@ -6,7 +6,7 @@ import (
) )
type Unit struct { type Unit struct {
scale Scale scale Prefix
measure Measure measure Measure
divMeasure Measure divMeasure Measure
} }
@ -31,7 +31,7 @@ func (u *Unit) AddDivisorUnit(div Measure) {
u.divMeasure = div u.divMeasure = div
} }
func GetScaleFactor(in Scale, out Scale) float64 { func GetPrefixFactor(in Prefix, out Prefix) float64 {
var factor = 1.0 var factor = 1.0
var in_scale = 1.0 var in_scale = 1.0
var out_scale = 1.0 var out_scale = 1.0
@ -45,11 +45,11 @@ func GetScaleFactor(in Scale, out Scale) float64 {
return factor return factor
} }
func GetUnitScaleFactor(in Unit, out Unit) (float64, error) { func GetUnitPrefixFactor(in Unit, out Unit) (float64, error) {
if in.measure != out.measure || in.divMeasure != out.divMeasure { if in.measure != out.measure || in.divMeasure != out.divMeasure {
return 1.0, fmt.Errorf("invalid measures in in and out Unit") return 1.0, fmt.Errorf("invalid measures in in and out Unit")
} }
return GetScaleFactor(in.scale, out.scale), nil return GetPrefixFactor(in.scale, out.scale), nil
} }
func NewUnit(unit string) Unit { func NewUnit(unit string) Unit {
@ -60,7 +60,7 @@ func NewUnit(unit string) Unit {
} }
matches := prefixRegex.FindStringSubmatch(unit) matches := prefixRegex.FindStringSubmatch(unit)
if len(matches) > 2 { if len(matches) > 2 {
u.scale = NewScale(matches[1]) u.scale = NewPrefix(matches[1])
measures := strings.Split(matches[2], "/") measures := strings.Split(matches[2], "/")
u.measure = NewMeasure(measures[0]) u.measure = NewMeasure(measures[0])
// Special case for 'm' as scale for Bytes as thers is nothing like MilliBytes // Special case for 'm' as scale for Bytes as thers is nothing like MilliBytes

8
internal/ccUnits/ccUnits_test.go
View File

@ -55,7 +55,7 @@ func TestUnitsExact(t *testing.T) {
} }
} }
func TestUnitsDifferentScale(t *testing.T) { func TestUnitsDifferentPrefix(t *testing.T) {
testCases := []struct { testCases := []struct {
in string in string
want Unit want Unit
@ -71,9 +71,9 @@ func TestUnitsDifferentScale(t *testing.T) {
{"Mib", NewUnit("MBytes"), (1024 * 1024.0) / (1e6)}, {"Mib", NewUnit("MBytes"), (1024 * 1024.0) / (1e6)},
{"mb", NewUnit("MBytes"), 1.0}, {"mb", NewUnit("MBytes"), 1.0},
} }
compareUnitWithScale := func(in, out Unit, factor float64) bool { compareUnitWithPrefix := func(in, out Unit, factor float64) bool {
if in.measure == out.measure && in.divMeasure == out.divMeasure { if in.measure == out.measure && in.divMeasure == out.divMeasure {
if f := GetScaleFactor(in.scale, out.scale); f == factor { if f := GetPrefixFactor(in.scale, out.scale); f == factor {
return true return true
} else { } else {
fmt.Println(f) fmt.Println(f)
@ -83,7 +83,7 @@ func TestUnitsDifferentScale(t *testing.T) {
} }
for _, c := range testCases { for _, c := range testCases {
u := NewUnit(c.in) u := NewUnit(c.in)
if !compareUnitWithScale(u, c.want, c.scaleFactor) { if !compareUnitWithPrefix(u, c.want, c.scaleFactor) {
t.Errorf("func NewUnit(%q) == %q, want %q with factor %f", c.in, u.String(), c.want.String(), c.scaleFactor) t.Errorf("func NewUnit(%q) == %q, want %q with factor %f", c.in, u.String(), c.want.String(), c.scaleFactor)
} }
} }