gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s3tables: normalize filer errors and use standard helpers

Browse Source 
- Migrate from custom ErrNotFound to filer_pb.ErrNotFound
- Use filer_pb.LookupEntry for automatic error normalization
- Normalize entryExists and attribute lookups
This commit is contained in:
Chris Lu
2026-01-28 11:36:49 -08:00
parent 1d1634c2a2
commit b4d8350936
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
weed/s3api/s3tables/filer_ops.go
View File

@@ -10,7 +10,6 @@ import (
) )
var ( var (
ErrNotFound = errors.New("entry not found")
ErrAttributeNotFound = errors.New("attribute not found") ErrAttributeNotFound = errors.New("attribute not found")
) )
@@ -40,7 +39,7 @@ func (h *S3TablesHandler) setExtendedAttribute(ctx context.Context, client filer
dir, name := splitPath(path) dir, name := splitPath(path)
// First, get the existing entry // First, get the existing entry
resp, err := client.LookupDirectoryEntry(ctx, &filer_pb.LookupDirectoryEntryRequest{ resp, err := filer_pb.LookupEntry(ctx, client, &filer_pb.LookupDirectoryEntryRequest{
Directory: dir, Directory: dir,
Name: name, Name: name,
}) })
@@ -49,9 +48,6 @@ func (h *S3TablesHandler) setExtendedAttribute(ctx context.Context, client filer
} }
entry := resp.Entry entry := resp.Entry
if entry == nil {
return fmt.Errorf("%w: %s", ErrNotFound, path)
}
// Update the extended attributes // Update the extended attributes
if entry.Extended == nil { if entry.Extended == nil {
@@ -70,7 +66,7 @@ func (h *S3TablesHandler) setExtendedAttribute(ctx context.Context, client filer
// getExtendedAttribute gets an extended attribute from an entry // getExtendedAttribute gets an extended attribute from an entry
func (h *S3TablesHandler) getExtendedAttribute(ctx context.Context, client filer_pb.SeaweedFilerClient, path, key string) ([]byte, error) { func (h *S3TablesHandler) getExtendedAttribute(ctx context.Context, client filer_pb.SeaweedFilerClient, path, key string) ([]byte, error) {
dir, name := splitPath(path) dir, name := splitPath(path)
resp, err := client.LookupDirectoryEntry(ctx, &filer_pb.LookupDirectoryEntryRequest{ resp, err := filer_pb.LookupEntry(ctx, client, &filer_pb.LookupDirectoryEntryRequest{
Directory: dir, Directory: dir,
Name: name, Name: name,
}) })
@@ -78,10 +74,6 @@ func (h *S3TablesHandler) getExtendedAttribute(ctx context.Context, client filer
return nil, err return nil, err
} }
if resp.Entry == nil {
return nil, fmt.Errorf("%w: %s", ErrNotFound, path)
}
if resp.Entry.Extended == nil { if resp.Entry.Extended == nil {
return nil, fmt.Errorf("%w: %s", ErrAttributeNotFound, key) return nil, fmt.Errorf("%w: %s", ErrAttributeNotFound, key)
} }
@@ -99,7 +91,7 @@ func (h *S3TablesHandler) deleteExtendedAttribute(ctx context.Context, client fi
dir, name := splitPath(path) dir, name := splitPath(path)
// Get the existing entry // Get the existing entry
resp, err := client.LookupDirectoryEntry(ctx, &filer_pb.LookupDirectoryEntryRequest{ resp, err := filer_pb.LookupEntry(ctx, client, &filer_pb.LookupDirectoryEntryRequest{
Directory: dir, Directory: dir,
Name: name, Name: name,
}) })
@@ -108,9 +100,6 @@ func (h *S3TablesHandler) deleteExtendedAttribute(ctx context.Context, client fi
} }
entry := resp.Entry entry := resp.Entry
if entry == nil {
return fmt.Errorf("%w: %s", ErrNotFound, path)
}
// Remove the extended attribute // Remove the extended attribute
if entry.Extended != nil { if entry.Extended != nil {
@@ -141,9 +130,9 @@ func (h *S3TablesHandler) deleteDirectory(ctx context.Context, client filer_pb.S
// entryExists checks if an entry exists at the given path // entryExists checks if an entry exists at the given path
func (h *S3TablesHandler) entryExists(ctx context.Context, client filer_pb.SeaweedFilerClient, path string) bool { func (h *S3TablesHandler) entryExists(ctx context.Context, client filer_pb.SeaweedFilerClient, path string) bool {
dir, name := splitPath(path) dir, name := splitPath(path)
resp, err := client.LookupDirectoryEntry(ctx, &filer_pb.LookupDirectoryEntryRequest{ _, err := filer_pb.LookupEntry(ctx, client, &filer_pb.LookupDirectoryEntryRequest{
Directory: dir, Directory: dir,
Name: name, Name: name,
}) })
return err == nil && resp.Entry != nil return err == nil
} }