Skip to content

Commit

Permalink
Remove AppendFloat from go/mysql/format and add required tests (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
beingnoble03 authored Jan 18, 2024
1 parent 2ec885d commit 6f48aba
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 6 deletions.
8 changes: 2 additions & 6 deletions go/mysql/format/float.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ const expUpperThreshold = 1000000000000000.0
const expLowerThreshold = 0.000000000000001

// FormatFloat formats a float64 as a byte string in a similar way to what MySQL does
func FormatFloat(v float64) []byte {
return AppendFloat(nil, v)
}

func AppendFloat(buf []byte, f float64) []byte {
func FormatFloat(f float64) []byte {
format := byte('f')
if f >= expUpperThreshold || f <= -expUpperThreshold || (f < expLowerThreshold && f > -expLowerThreshold) {
format = 'g'
Expand All @@ -39,7 +35,7 @@ func AppendFloat(buf []byte, f float64) []byte {
// do that, and there's no way to customize it, so we must strip the
// redundant positive sign manually
// e.g. 1.234E+56789 -> 1.234E56789
fstr := strconv.AppendFloat(buf, f, format, -1, 64)
fstr := strconv.AppendFloat(nil, f, format, -1, 64)
if idx := bytes.IndexByte(fstr, 'e'); idx >= 0 {
if fstr[idx+1] == '+' {
fstr = append(fstr[:idx+1], fstr[idx+2:]...)
Expand Down
42 changes: 42 additions & 0 deletions go/mysql/format/float_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
Copyright 2024 The Vitess Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package format

import (
"testing"

"github.com/stretchr/testify/assert"
)

func TestFormatFloat(t *testing.T) {
testCases := []struct {
input float64
want []byte
}{
{123.456, []byte("123.456")},
{-1.13456e15, []byte("-1.13456e15")},
{2e15, []byte("2e15")},
{2e-15, []byte("0.000000000000002")},
{-1e-16, []byte("-1e-16")},
{0.0, []byte("0")},
}

for _, tCase := range testCases {
got := FormatFloat(tCase.input)
assert.Equal(t, tCase.want, got)
}
}

0 comments on commit 6f48aba

Please sign in to comment.