Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate search v2 #1082

Merged
merged 13 commits into from
Feb 21, 2025
Merged

Integrate search v2 #1082

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6ee2469
multipart: Drop set-only struct fields
cthulhu-rider Feb 11, 2025
82d05da
multipart: Inline a once called method
cthulhu-rider Feb 11, 2025
30b92db
api/layer: Drop unused comment
cthulhu-rider Feb 11, 2025
0cb4ff2
go.mod: Update SDK
smallhive Feb 14, 2025
9ce5aac
layer: Use search-v2 for multipart
smallhive Feb 19, 2025
04ab5c9
layer: Use search-v2 for tags removal
smallhive Feb 19, 2025
c14a3c0
layer: Use search-v2 for file listing
smallhive Feb 12, 2025
95b3304
handler: Remove obsolete tests
smallhive Feb 21, 2025
bf6f214
layer: Use search-v2 for tags retrieving
smallhive Feb 19, 2025
bfb2204
layer: Use search-v2 for locks retrieving
smallhive Feb 14, 2025
acfb3ce
*: Remove GetExtendObjectInfo usage where possible
smallhive Feb 17, 2025
c05b659
layer: Remove last search-v1 usage
smallhive Feb 18, 2025
17d951f
layer: Remove unused
smallhive Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions api/layer/layer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ func (n *layer) deleteObject(ctx context.Context, bkt *data.BucketInfo, settings
}

for _, version := range versions {
if obj.Error = n.objectDelete(ctx, bkt, version.GetID()); obj.Error != nil {
if obj.Error = n.objectDelete(ctx, bkt, version.ID); obj.Error != nil {
return obj
}
}
Expand Down Expand Up @@ -729,7 +729,7 @@ func (n *layer) deleteObject(ctx context.Context, bkt *data.BucketInfo, settings
}

for _, version := range versions {
if obj.Error = n.objectDelete(ctx, bkt, version.GetID()); obj.Error != nil {
if obj.Error = n.objectDelete(ctx, bkt, version.ID); obj.Error != nil {
return obj
}
}
Expand All @@ -750,8 +750,8 @@ func (n *layer) deleteObject(ctx context.Context, bkt *data.BucketInfo, settings

if obj.VersionID == "" {
for _, ver := range versions {
if obj.Error = n.objectDelete(ctx, bkt, ver.GetID()); obj.Error != nil {
n.log.Error("could not delete object", zap.Error(obj.Error), zap.Stringer("oid", ver.GetID()))
if obj.Error = n.objectDelete(ctx, bkt, ver.ID); obj.Error != nil {
n.log.Error("could not delete object", zap.Error(obj.Error), zap.Stringer("oid", ver.ID))
if isErrObjectAlreadyRemoved(obj.Error) {
obj.Error = nil
continue
Expand All @@ -762,8 +762,8 @@ func (n *layer) deleteObject(ctx context.Context, bkt *data.BucketInfo, settings
}
} else {
for _, ver := range versions {
if ver.GetID().EncodeToString() == obj.VersionID {
if obj.Error = n.objectDelete(ctx, bkt, ver.GetID()); obj.Error != nil {
if ver.ID.EncodeToString() == obj.VersionID {
if obj.Error = n.objectDelete(ctx, bkt, ver.ID); obj.Error != nil {
return obj
}

Expand Down
1 change: 0 additions & 1 deletion api/layer/multipart_upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,6 @@ func (n *layer) CompleteMultipartUpload(ctx context.Context, p *CompleteMultipar
prm := PrmObjectCreate{
Container: p.Info.Bkt.CID,
Creator: p.Info.Bkt.Owner,
Filepath: p.Info.Key,
CreationTime: TimeNow(ctx),
CopiesNumber: multipartInfo.CopiesNumber,
Multipart: &Multipart{
Expand Down
Loading