dkirillov/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#Issue] TMP

Browse source 
Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
This commit is contained in:
Denis Kirillov 2025-02-28 17:12:22 +03:00
parent 079fd20513
commit 932b96b19c
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
api/handler/object_list_test.go
View file

@ -938,6 +938,29 @@ func TestPeriodicWriter(t *testing.T) {
}) })
} }
func TestListObjectsNotDuplicateContinuationToken(t *testing.T) {
tc := prepareHandlerContext(t)
bktName := "bucket-for-listing"
bktInfo := createTestBucket(tc, bktName)
for _, name := range []string{"bar /baz", "bar baz/foo", "bar/baz"} {
createTestObject(tc, bktInfo, name, encryption.Params{})
}
t.Run("list v2", func(t *testing.T) {
res1 := listObjectsV2(tc, bktName, "", "", "", "", 1)
res2 := listObjectsV2(tc, bktName, "", "", "", res1.NextContinuationToken, 1)
require.NotEqual(t, res1.NextContinuationToken, res2.NextContinuationToken)
})
t.Run("list versions", func(t *testing.T) {
res1 := listObjectsVersions(tc, bktName, "", "", "", "", 1)
res2 := listObjectsVersions(tc, bktName, "", "", res1.NextKeyMarker, res1.NextVersionIDMarker, 1)
require.NotEqual(t, res1.NextVersionIDMarker, res2.NextVersionIDMarker)
})
}
func checkVersionsNames(t *testing.T, versions *ListObjectsVersionsResponse, names []string) { func checkVersionsNames(t *testing.T, versions *ListObjectsVersionsResponse, names []string) {
for i, v := range versions.Version { for i, v := range versions.Version {
require.Equal(t, names[i], v.Key) require.Equal(t, names[i], v.Key)

4
api/layer/listing.go
View file

@ -161,7 +161,7 @@ func (n *Layer) ListObjectsV2(ctx context.Context, p *ListObjectsParamsV2) (*Lis
if next != nil { if next != nil {
result.IsTruncated = true result.IsTruncated = true
result.NextContinuationToken = next.NodeVersion.OID.EncodeToString() result.NextContinuationToken = objects[len(objects)-1].NodeVersion.OID.EncodeToString()
} }
result.Prefixes, result.Objects = triageExtendedObjects(objects) result.Prefixes, result.Objects = triageExtendedObjects(objects)
@ -380,7 +380,7 @@ func (n *Layer) putListLatestVersionsSession(ctx context.Context, p commonLatest
case ListObjectsV1Type: case ListObjectsV1Type:
cacheKey = cache.CreateListSessionCacheKey(p.BktInfo.CID, p.Prefix, allObjects[p.MaxKeys-1].Name()) cacheKey = cache.CreateListSessionCacheKey(p.BktInfo.CID, p.Prefix, allObjects[p.MaxKeys-1].Name())
case ListObjectsV2Type: case ListObjectsV2Type:
cacheKey = cache.CreateListSessionCacheKey(p.BktInfo.CID, p.Prefix, allObjects[p.MaxKeys].NodeVersion.OID.EncodeToString()) cacheKey = cache.CreateListSessionCacheKey(p.BktInfo.CID, p.Prefix, allObjects[p.MaxKeys-1].NodeVersion.OID.EncodeToString())
default: default:
// should never happen // should never happen
panic("invalid list type") panic("invalid list type")