Skip to content

Commit 7d9f61a

Browse files
authored
zstd: use slices.Max for max value in slice (#1041)
Signed-off-by: Eng Zer Jun <[email protected]>
1 parent a2a2e44 commit 7d9f61a

File tree

1 file changed

+5
-22
lines changed

1 file changed

+5
-22
lines changed

Diff for: zstd/blockenc.go

+5-22
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"fmt"
1010
"math"
1111
"math/bits"
12+
"slices"
1213

1314
"github.com/klauspost/compress/huff0"
1415
)
@@ -457,16 +458,7 @@ func fuzzFseEncoder(data []byte) int {
457458
// All 0
458459
return 0
459460
}
460-
maxCount := func(a []uint32) int {
461-
var max uint32
462-
for _, v := range a {
463-
if v > max {
464-
max = v
465-
}
466-
}
467-
return int(max)
468-
}
469-
cnt := maxCount(hist[:maxSym])
461+
cnt := int(slices.Max(hist[:maxSym]))
470462
if cnt == len(data) {
471463
// RLE
472464
return 0
@@ -884,15 +876,6 @@ func (b *blockEnc) genCodes() {
884876
}
885877
}
886878
}
887-
maxCount := func(a []uint32) int {
888-
var max uint32
889-
for _, v := range a {
890-
if v > max {
891-
max = v
892-
}
893-
}
894-
return int(max)
895-
}
896879
if debugAsserts && mlMax > maxMatchLengthSymbol {
897880
panic(fmt.Errorf("mlMax > maxMatchLengthSymbol (%d)", mlMax))
898881
}
@@ -903,7 +886,7 @@ func (b *blockEnc) genCodes() {
903886
panic(fmt.Errorf("llMax > maxLiteralLengthSymbol (%d)", llMax))
904887
}
905888

906-
b.coders.mlEnc.HistogramFinished(mlMax, maxCount(mlH[:mlMax+1]))
907-
b.coders.ofEnc.HistogramFinished(ofMax, maxCount(ofH[:ofMax+1]))
908-
b.coders.llEnc.HistogramFinished(llMax, maxCount(llH[:llMax+1]))
889+
b.coders.mlEnc.HistogramFinished(mlMax, int(slices.Max(mlH[:mlMax+1])))
890+
b.coders.ofEnc.HistogramFinished(ofMax, int(slices.Max(ofH[:ofMax+1])))
891+
b.coders.llEnc.HistogramFinished(llMax, int(slices.Max(llH[:llMax+1])))
909892
}

0 commit comments

Comments
 (0)