diff --git a/cmd/metacache-entries.go b/cmd/metacache-entries.go index 0c39897128b06..94f274c9ac642 100644 --- a/cmd/metacache-entries.go +++ b/cmd/metacache-entries.go @@ -749,9 +749,10 @@ func mergeEntryChannels(ctx context.Context, in []chan metaCacheEntry, out chan< continue } - if !dirMatches && !suffixMatches { - // We have an object `name` and a directory `name/`. + if !dirMatches { + // We have an object `name` or 'name/' and a directory `name/`. if other.isDir() { + console.Debugln("mergeEntryChannels: discarding directory", other.name, "for object", best.name) // Discard the directory. if err := selectFrom(otherIdx); err != nil { return err @@ -759,12 +760,13 @@ func mergeEntryChannels(ctx context.Context, in []chan metaCacheEntry, out chan< continue } // Replace directory with object. + console.Debugln("mergeEntryChannels: discarding directory", best.name, "for object", other.name) toMerge = toMerge[:0] best = other bestIdx = otherIdx continue } - // Return as separate entries. + // Leave it to be resolved. Names are different. } if best.name > other.name { toMerge = toMerge[:0] diff --git a/go.mod b/go.mod index f76de0e60c532..d321361d70a92 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/eclipse/paho.mqtt.golang v1.4.3 github.com/elastic/go-elasticsearch/v7 v7.17.10 - github.com/fatih/color v1.16.0 + github.com/fatih/color v1.17.0 github.com/felixge/fgprof v0.9.4 github.com/fraugster/parquet-go v0.12.0 github.com/go-ldap/ldap/v3 v3.4.8 diff --git a/go.sum b/go.sum index b32991a6f14d4..8b339a9a2299a 100644 --- a/go.sum +++ b/go.sum @@ -147,8 +147,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= -github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= +github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/fgprof v0.9.4 h1:ocDNwMFlnA0NU0zSB3I52xkO4sFXk80VK9lXjLClu88=