mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-11 19:31:11 -05:00
Code Issues Packages Projects Releases 144 Wiki Activity

comments

Browse Source
This commit is contained in:
Brian Hendriks
2022-08-23 12:08:02 -07:00
parent bd8ef2a098
commit 683b8d39b0
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
go/cmd/dolt/commands/sqlserver/metrics_listener.go
View File

@@ -15,6 +15,7 @@
package sqlserver
import (
"fmt"
"time"
"github.com/dolthub/dolt/go/libraries/utils/version"
@@ -69,11 +70,17 @@ func newMetricsListener(labels prometheus.Labels, versionStr string) (*metricsLi
}),
}
version, err := version.Encode(versionStr)
u32Version, err := version.Encode(versionStr)
if err != nil {
return nil, err
}
f64Version := float64(u32Version)
decoded := version.Decode(uint32(f64Version))
if decoded != versionStr {
return nil, fmt.Errorf("the float64 encoded version does not decode back to its original value. version:'%s', decoded:'%s'", versionStr, decoded)
}
prometheus.MustRegister(ml.gaugeVersion)
prometheus.MustRegister(ml.cntConnections)
prometheus.MustRegister(ml.cntDisconnects)
@@ -81,8 +88,7 @@ func newMetricsListener(labels prometheus.Labels, versionStr string) (*metricsLi
prometheus.MustRegister(ml.gaugeConcurrentQueries)
prometheus.MustRegister(ml.histQueryDur)
ml.gaugeVersion.Set(version)
ml.gaugeVersion.Set(f64Version)
return ml, nil
}

19
go/libraries/utils/version/version.go
View File

@@ -20,7 +20,12 @@ import (
"strings"
)
func Encode(version string) (float64, error) {
// Encode encodes a version string in the format "X.Y.Z" into a uint32 (X represents the major version and must be
// numeric and in the range 0-255, Y represents the minor version and must be in the range 0-255, and Z represents the
// build which is in the range 0-65535). The encoded uint32 version uses the highest 8 bits for the major version,
// the next 8 bits for the minor version, and the last 16 used for the build number. Encoded versions are numerically
// comparable (as in the encoded value of the version 1.2.3 will be less than the encoded value of the version 1.11.0)
func Encode(version string) (uint32, error) {
parts := strings.Split(version, ".")
if len(parts) != 3 {
@@ -41,14 +46,14 @@ func Encode(version string) (float64, error) {
}
versionUint32 := (uint32(partVals[0]&0xFF) << 24) | (uint32(partVals[1]&0xFF) << 16) | uint32(partVals[2]&0xFFFF)
return float64(versionUint32), nil
return versionUint32, nil
}
func Decode(version float64) string {
versInt32 := uint32(version)
major := (versInt32 & 0xFF000000) >> 24
minor := (versInt32 & 0x00FF0000) >> 16
build := versInt32 & 0x0000FFFF
// Decode converts the uint32 encoding of the version (described by the Encode method) back to its string representation.
func Decode(version uint32) string {
major := (version & 0xFF000000) >> 24
minor := (version & 0x00FF0000) >> 16
build := version & 0x0000FFFF
majorStr := strconv.FormatUint(uint64(major), 10)
minorStr := strconv.FormatUint(uint64(minor), 10)