Skip to content

Commit 0493904

Browse files
author
James Cor
committed
merge
2 parents d1c4874 + 366388b commit 0493904

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

sql/expression/function/aggregation/std_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,3 @@ func TestStd(t *testing.T) {
9494
})
9595
}
9696
}
97-

sql/expression/function/aggregation/unary_agg_buffers.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package aggregation
33
import (
44
"fmt"
55
"math"
6-
"reflect"
6+
"reflect"
77

88
"github.com/cespare/xxhash/v2"
99
"github.com/shopspring/decimal"
@@ -710,9 +710,9 @@ func (s *stdDevPopBuffer) Update(ctx *sql.Context, row sql.Row) error {
710710
return nil
711711
}
712712

713-
s.newMean = s.oldMean + (val - s.oldMean) / float64(s.count)
714-
s.newVar = s.oldVar + (val - s.oldMean) * (val - s.newMean)
715-
s.oldVar = s.newVar
713+
s.newMean = s.oldMean + (val-s.oldMean)/float64(s.count)
714+
s.newVar = s.oldVar + (val-s.oldMean)*(val-s.newMean)
715+
s.oldVar = s.newVar
716716
s.oldMean = s.newMean
717717

718718
return nil

sql/expression/function/aggregation/window_functions.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package aggregation
1616

1717
import (
1818
"math"
19-
"sort"
19+
"sort"
2020
"strings"
2121

2222
"github.com/dolthub/go-mysql-server/sql"
@@ -1583,4 +1583,4 @@ func (s *StdDevSampAgg) Compute(ctx *sql.Context, interval sql.WindowInterval, b
15831583
}
15841584

15851585
return math.Sqrt(v / float64(nonNullCnt - 1))
1586-
}
1586+
}

0 commit comments

Comments
 (0)