dc9e069ff2
Changed `matcher.Matches(file)` to `matcher.MatchesOrParentMatches(file)`:
cli/command/image/build/context.go:95:9: SA1019: matcher.Matches is deprecated: This implementation is buggy (it only checks a single parent dir against the pattern) and will be removed soon. Use either MatchesOrParentMatches or MatchesUsingParentResults instead. (staticcheck)
return matcher.Matches(file)
^
And updated a test to match the JSON omitting empty RootFS.Type fields (in
practice, this field should never be empty in real situations, and always
be "layer"). Changed the test to use subtests to easier find which case
is failing.
full diff: 343665850e...83b51522df
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
42 lines
1.3 KiB
Go
42 lines
1.3 KiB
Go
// Copyright 2019+ Klaus Post. All rights reserved.
|
|
// License information can be found in the LICENSE file.
|
|
// Based on work by Yann Collet, released under BSD License.
|
|
|
|
package zstd
|
|
|
|
const (
|
|
prime3bytes = 506832829
|
|
prime4bytes = 2654435761
|
|
prime5bytes = 889523592379
|
|
prime6bytes = 227718039650203
|
|
prime7bytes = 58295818150454627
|
|
prime8bytes = 0xcf1bbcdcb7a56463
|
|
)
|
|
|
|
// hashLen returns a hash of the lowest mls bytes of with length output bits.
|
|
// mls must be >=3 and <=8. Any other value will return hash for 4 bytes.
|
|
// length should always be < 32.
|
|
// Preferably length and mls should be a constant for inlining.
|
|
func hashLen(u uint64, length, mls uint8) uint32 {
|
|
switch mls {
|
|
case 3:
|
|
return (uint32(u<<8) * prime3bytes) >> (32 - length)
|
|
case 5:
|
|
return uint32(((u << (64 - 40)) * prime5bytes) >> (64 - length))
|
|
case 6:
|
|
return uint32(((u << (64 - 48)) * prime6bytes) >> (64 - length))
|
|
case 7:
|
|
return uint32(((u << (64 - 56)) * prime7bytes) >> (64 - length))
|
|
case 8:
|
|
return uint32((u * prime8bytes) >> (64 - length))
|
|
default:
|
|
return (uint32(u) * prime4bytes) >> (32 - length)
|
|
}
|
|
}
|
|
|
|
// hash3 returns the hash of the lower 3 bytes of u to fit in a hash table with h bits.
|
|
// Preferably h should be a constant and should always be <32.
|
|
func hash3(u uint32, h uint8) uint32 {
|
|
return ((u << (32 - 24)) * prime3bytes) >> ((32 - h) & 31)
|
|
}
|