TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 109 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#1074] pilorama: Allow empty filenames in SortedByFilename()
Some checks failed
DCO action / DCO (pull_request) Successful in 5m8s
Details
Vulncheck / Vulncheck (pull_request) Failing after 5m46s
Details
Build / Build Components (1.21) (pull_request) Successful in 7m19s
Details
Build / Build Components (1.20) (pull_request) Successful in 7m31s
Details
Tests and linters / Staticcheck (pull_request) Successful in 10m33s
Details
Tests and linters / Lint (pull_request) Successful in 10m55s
Details
Tests and linters / gopls check (pull_request) Successful in 14m2s
Details
Tests and linters / Tests (1.21) (pull_request) Successful in 16m7s
Details
Tests and linters / Tests with -race (pull_request) Successful in 16m12s
Details
Tests and linters / Tests (1.20) (pull_request) Successful in 16m30s
Details

Browse source 
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2024-04-04 10:40:21 +03:00
parent 3d0af159da
commit b5ee99df55
8 changed files with 53 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/local_object_storage/engine/tree.go
View file

@ -210,7 +210,7 @@ func (e *StorageEngine) TreeGetChildren(ctx context.Context, cid cidSDK.ID, tree
}
// TreeSortedByFilename implements the pilorama.Forest interface.
func (e *StorageEngine) TreeSortedByFilename(ctx context.Context, cid cidSDK.ID, treeID string, nodeID pilorama.Node, last string, count int) ([]pilorama.NodeInfo, string, error) {
func (e *StorageEngine) TreeSortedByFilename(ctx context.Context, cid cidSDK.ID, treeID string, nodeID pilorama.Node, last *string, count int) ([]pilorama.NodeInfo, *string, error) {
ctx, span := tracing.StartSpanFromContext(ctx, "StorageEngine.TreeSortedByFilename",
trace.WithAttributes(
attribute.String("container_id", cid.EncodeToString()),
@ -222,7 +222,7 @@ func (e *StorageEngine) TreeSortedByFilename(ctx context.Context, cid cidSDK.ID,
var err error
var nodes []pilorama.NodeInfo
var cursor string
var cursor *string
for _, sh := range e.sortShards(cid) {
nodes, cursor, err = sh.TreeSortedByFilename(ctx, cid, treeID, nodeID, last, count)
if err != nil {