pkg/local_object_storage/pilorama/boltdb.go

@@ -1073,8 +1073,9 @@ func (t *boltForest) TreeSortedByFilename(ctx context.Context, cid cidSDK.ID, tr
 			return bytes.Compare(result[i].Meta.GetAttr(AttributeFilename), result[j].Meta.GetAttr(AttributeFilename)) == -1
 		})
 		for i := range result {
-			if bytes.Compare([]byte(last), result[i].Meta.GetAttr(AttributeFilename)) == -1 {
+			if cmp := bytes.Compare([]byte(last), result[i].Meta.GetAttr(AttributeFilename)); cmp <= 0 {
-				result = result[i:]
+				// if last == result[i], return next [i+1:] values; if last < result[i], return all values from [i:]
+				result = result[i+cmp+1:]
 				break
 			}
 		}

pkg/services/tree/getsubtree_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"path"
+	"path/filepath"
 	"sort"
 	"testing"
 
@@ -123,9 +124,21 @@ func TestGetSubTree(t *testing.T) {
 }
 
 func TestGetSubTreeOrderAsc(t *testing.T) {
+	t.Run("memory forest", func(t *testing.T) {
+		testGetSubTreeOrderAsc(t, pilorama.NewMemoryForest())
+	})
+
+	t.Run("boltdb forest", func(t *testing.T) {
+		p := pilorama.NewBoltForest(pilorama.WithPath(filepath.Join(t.TempDir(), "pilorama")))
+		require.NoError(t, p.Open(context.Background(), 0644))
+		require.NoError(t, p.Init())
+		testGetSubTreeOrderAsc(t, p)
+	})
+}
+
+func testGetSubTreeOrderAsc(t *testing.T, p pilorama.ForestStorage) {
 	d := pilorama.CIDDescriptor{CID: cidtest.ID(), Size: 1}
 	treeID := "sometree"
-	p := pilorama.NewMemoryForest()
 
 	tree := []struct {
 		path []string