From 8eba7ba5b2edd42f46f6fae5c7ac0f03d9e9fccc Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 26 Feb 2026 16:36:24 -0800 Subject: [PATCH] feat: drop table location mapping support (#8458) * feat: drop table location mapping support Disable external metadata locations for S3 Tables and remove the table location mapping index entirely. Table metadata must live under the table bucket paths, so lookups no longer use mapping directories. Changes: - Remove mapping lookup and cache from bucket path resolution - Reject metadataLocation in CreateTable and UpdateTable - Remove mapping helpers and tests * compile * refactor * fix: accept metadataLocation in S3 Tables API requests We removed the external table location mapping feature, but still need to accept and store metadataLocation values from clients like Trino. The mapping feature was an internal implementation detail that mapped external buckets to internal table paths. The metadataLocation field itself is part of the S3 Tables API and should be preserved. * fmt * fix: handle MetadataLocation in UpdateTable requests Mirror handleCreateTable behavior by updating metadata.MetadataLocation when req.MetadataLocation is provided in UpdateTable requests. This ensures table metadata location can be updated, not just set during creation. --- weed/s3api/auth_proxy_integration_test.go | 82 +++++------ weed/s3api/auth_security_test.go | 10 +- weed/s3api/bucket_metadata.go | 17 +-- weed/s3api/bucket_paths.go | 129 ------------------ weed/s3api/bucket_paths_test.go | 45 ------ weed/s3api/s3tables/handler_table.go | 116 ---------------- .../s3tables/table_location_mapping_test.go | 77 ----------- weed/s3api/s3tables/utils.go | 57 +------- 8 files changed, 50 insertions(+), 483 deletions(-) delete mode 100644 weed/s3api/bucket_paths_test.go delete mode 100644 weed/s3api/s3tables/table_location_mapping_test.go diff --git a/weed/s3api/auth_proxy_integration_test.go b/weed/s3api/auth_proxy_integration_test.go index 3310cbfc1..29d16f6bd 100644 --- a/weed/s3api/auth_proxy_integration_test.go +++ b/weed/s3api/auth_proxy_integration_test.go @@ -46,68 +46,68 @@ func TestReverseProxySignatureVerification(t *testing.T) { }` tests := []struct { - name string - externalUrl string // s3.externalUrl config for the backend - clientScheme string // scheme the client uses for signing - clientHost string // host the client signs against - proxyForwardsHost bool // whether proxy sets X-Forwarded-Host - expectSuccess bool + name string + externalUrl string // s3.externalUrl config for the backend + clientScheme string // scheme the client uses for signing + clientHost string // host the client signs against + proxyForwardsHost bool // whether proxy sets X-Forwarded-Host + expectSuccess bool }{ { - name: "non-standard port, externalUrl matches proxy address", - externalUrl: "", // filled dynamically with proxy address - clientScheme: "http", - clientHost: "", // filled dynamically + name: "non-standard port, externalUrl matches proxy address", + externalUrl: "", // filled dynamically with proxy address + clientScheme: "http", + clientHost: "", // filled dynamically proxyForwardsHost: true, - expectSuccess: true, + expectSuccess: true, }, { - name: "externalUrl with non-standard port, client signs against external host", - externalUrl: "http://api.example.com:9000", - clientScheme: "http", - clientHost: "api.example.com:9000", + name: "externalUrl with non-standard port, client signs against external host", + externalUrl: "http://api.example.com:9000", + clientScheme: "http", + clientHost: "api.example.com:9000", proxyForwardsHost: true, - expectSuccess: true, + expectSuccess: true, }, { - name: "externalUrl with HTTPS default port stripped, client signs without port", - externalUrl: "https://api.example.com:443", - clientScheme: "https", - clientHost: "api.example.com", + name: "externalUrl with HTTPS default port stripped, client signs without port", + externalUrl: "https://api.example.com:443", + clientScheme: "https", + clientHost: "api.example.com", proxyForwardsHost: true, - expectSuccess: true, + expectSuccess: true, }, { - name: "externalUrl with HTTP default port stripped, client signs without port", - externalUrl: "http://api.example.com:80", - clientScheme: "http", - clientHost: "api.example.com", + name: "externalUrl with HTTP default port stripped, client signs without port", + externalUrl: "http://api.example.com:80", + clientScheme: "http", + clientHost: "api.example.com", proxyForwardsHost: true, - expectSuccess: true, + expectSuccess: true, }, { - name: "proxy forwards X-Forwarded-Host correctly, no externalUrl needed", - externalUrl: "", - clientScheme: "http", - clientHost: "api.example.com:9000", + name: "proxy forwards X-Forwarded-Host correctly, no externalUrl needed", + externalUrl: "", + clientScheme: "http", + clientHost: "api.example.com:9000", proxyForwardsHost: true, - expectSuccess: true, + expectSuccess: true, }, { - name: "proxy without X-Forwarded-Host, no externalUrl: host mismatch", - externalUrl: "", - clientScheme: "http", - clientHost: "api.example.com:9000", + name: "proxy without X-Forwarded-Host, no externalUrl: host mismatch", + externalUrl: "", + clientScheme: "http", + clientHost: "api.example.com:9000", proxyForwardsHost: false, - expectSuccess: false, + expectSuccess: false, }, { - name: "proxy without X-Forwarded-Host, externalUrl saves the day", - externalUrl: "http://api.example.com:9000", - clientScheme: "http", - clientHost: "api.example.com:9000", + name: "proxy without X-Forwarded-Host, externalUrl saves the day", + externalUrl: "http://api.example.com:9000", + clientScheme: "http", + clientHost: "api.example.com:9000", proxyForwardsHost: false, - expectSuccess: true, + expectSuccess: true, }, } diff --git a/weed/s3api/auth_security_test.go b/weed/s3api/auth_security_test.go index f088fd2c1..ea247fbf0 100644 --- a/weed/s3api/auth_security_test.go +++ b/weed/s3api/auth_security_test.go @@ -209,11 +209,11 @@ func TestExternalUrlSignatureVerification(t *testing.T) { secretKey := "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY" tests := []struct { - name string - clientUrl string // URL the client signs against - backendHost string // Host header SeaweedFS sees (from proxy) - externalUrl string // s3.externalUrl config - expectSuccess bool + name string + clientUrl string // URL the client signs against + backendHost string // Host header SeaweedFS sees (from proxy) + externalUrl string // s3.externalUrl config + expectSuccess bool }{ { name: "non-standard port with externalUrl", diff --git a/weed/s3api/bucket_metadata.go b/weed/s3api/bucket_metadata.go index 80e764ca0..f13fbb949 100644 --- a/weed/s3api/bucket_metadata.go +++ b/weed/s3api/bucket_metadata.go @@ -49,9 +49,6 @@ type BucketRegistry struct { metadataCache map[string]*BucketMetaData metadataCacheLock sync.RWMutex - tableLocationCache map[string]string // Cache for table location mappings (external bucket -> mapped root path) - tableLocationLock sync.RWMutex - notFound map[string]struct{} notFoundLock sync.RWMutex s3a *S3ApiServer @@ -59,10 +56,9 @@ type BucketRegistry struct { func NewBucketRegistry(s3a *S3ApiServer) *BucketRegistry { br := &BucketRegistry{ - metadataCache: make(map[string]*BucketMetaData), - tableLocationCache: make(map[string]string), - notFound: make(map[string]struct{}), - s3a: s3a, + metadataCache: make(map[string]*BucketMetaData), + notFound: make(map[string]struct{}), + s3a: s3a, } err := br.init() if err != nil { @@ -164,7 +160,6 @@ func buildBucketMetadata(accountManager AccountManager, entry *filer_pb.Entry) * func (r *BucketRegistry) RemoveBucketMetadata(entry *filer_pb.Entry) { r.removeMetadataCache(entry.Name) r.unMarkNotFound(entry.Name) - r.removeTableLocationCache(entry.Name) } func (r *BucketRegistry) GetBucketMetadata(bucketName string) (*BucketMetaData, s3err.ErrorCode) { @@ -229,12 +224,6 @@ func (r *BucketRegistry) removeMetadataCache(bucket string) { delete(r.metadataCache, bucket) } -func (r *BucketRegistry) removeTableLocationCache(bucket string) { - r.tableLocationLock.Lock() - defer r.tableLocationLock.Unlock() - delete(r.tableLocationCache, bucket) -} - func (r *BucketRegistry) markNotFound(bucket string) { r.notFoundLock.Lock() defer r.notFoundLock.Unlock() diff --git a/weed/s3api/bucket_paths.go b/weed/s3api/bucket_paths.go index 88843f374..d7a2c278f 100644 --- a/weed/s3api/bucket_paths.go +++ b/weed/s3api/bucket_paths.go @@ -1,9 +1,7 @@ package s3api import ( - "context" "errors" - "io" "path" "strings" @@ -43,136 +41,12 @@ func (s3a *S3ApiServer) isTableBucket(bucket string) bool { return false } -func (s3a *S3ApiServer) tableLocationDir(bucket string) (string, bool) { - if bucket == "" { - return "", false - } - - // Check cache first - if s3a.bucketRegistry != nil { - s3a.bucketRegistry.tableLocationLock.RLock() - if tablePath, ok := s3a.bucketRegistry.tableLocationCache[bucket]; ok { - s3a.bucketRegistry.tableLocationLock.RUnlock() - return tablePath, tablePath != "" - } - s3a.bucketRegistry.tableLocationLock.RUnlock() - } - - tablePath, err := s3a.lookupTableLocationMapping(bucket, s3tables.GetTableLocationMappingDir()) - - // Only cache definitive results: successful lookup (tablePath set) or definitive not-found (ErrNotFound) - // Don't cache transient errors to avoid treating temporary failures as permanent misses - if err == nil || errors.Is(err, filer_pb.ErrNotFound) { - if s3a.bucketRegistry != nil { - s3a.bucketRegistry.tableLocationLock.Lock() - s3a.bucketRegistry.tableLocationCache[bucket] = tablePath - s3a.bucketRegistry.tableLocationLock.Unlock() - } - } - - if tablePath == "" { - if err != nil && !errors.Is(err, filer_pb.ErrNotFound) { - glog.V(1).Infof("table location mapping lookup failed for %s: %v", bucket, err) - } - return "", false - } - - return tablePath, true -} - -func (s3a *S3ApiServer) readTableLocationMappingFromDirectory(mappingDir string) (string, error) { - var mappedPath string - conflict := false - - err := s3a.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error { - stream, err := client.ListEntries(context.Background(), &filer_pb.ListEntriesRequest{ - Directory: mappingDir, - Limit: 4294967295, // math.MaxUint32 - }) - if err != nil { - return err - } - - for { - resp, recvErr := stream.Recv() - if recvErr == io.EOF { - return nil - } - if recvErr != nil { - return recvErr - } - if resp == nil || resp.Entry == nil || resp.Entry.IsDirectory || len(resp.Entry.Content) == 0 { - continue - } - - candidate := normalizeTableLocationMappingPath(string(resp.Entry.Content)) - if candidate == "" { - continue - } - if mappedPath == "" { - mappedPath = candidate - continue - } - if mappedPath != candidate { - conflict = true - return nil - } - } - }) - if err != nil { - return "", err - } - - if conflict { - glog.V(1).Infof("table location mapping conflict under %s: multiple mapped roots found", mappingDir) - return "", nil - } - return mappedPath, nil -} - -func (s3a *S3ApiServer) lookupTableLocationMapping(bucket, mappingDir string) (string, error) { - entry, err := s3a.getEntry(mappingDir, bucket) - if err != nil || entry == nil { - return "", err - } - if entry.IsDirectory { - return s3a.readTableLocationMappingFromDirectory(path.Join(mappingDir, bucket)) - } - if len(entry.Content) == 0 { - return "", nil - } - return normalizeTableLocationMappingPath(string(entry.Content)), nil -} - -func normalizeTableLocationMappingPath(rawPath string) string { - rawPath = strings.TrimSpace(rawPath) - if rawPath == "" { - return "" - } - - normalized := path.Clean("/" + strings.TrimPrefix(rawPath, "/")) - tablesPrefix := strings.TrimSuffix(s3tables.TablesPath, "/") + "/" - if !strings.HasPrefix(normalized, tablesPrefix) { - return normalized - } - - remaining := strings.TrimPrefix(normalized, tablesPrefix) - bucketName, _, _ := strings.Cut(remaining, "/") - if bucketName == "" { - return "" - } - return path.Join(s3tables.TablesPath, bucketName) -} - func (s3a *S3ApiServer) bucketRoot(bucket string) string { // Returns the unified buckets root path for all bucket types return s3a.option.BucketsPath } func (s3a *S3ApiServer) bucketDir(bucket string) string { - if tablePath, ok := s3a.tableLocationDir(bucket); ok { - return tablePath - } return path.Join(s3a.bucketRoot(bucket), bucket) } @@ -221,8 +95,5 @@ func (s3a *S3ApiServer) bucketExists(bucket string) (bool, error) { } func (s3a *S3ApiServer) getBucketEntry(bucket string) (*filer_pb.Entry, error) { - if tablePath, ok := s3a.tableLocationDir(bucket); ok { - return s3a.getEntry(path.Dir(tablePath), path.Base(tablePath)) - } return s3a.getEntry(s3a.option.BucketsPath, bucket) } diff --git a/weed/s3api/bucket_paths_test.go b/weed/s3api/bucket_paths_test.go deleted file mode 100644 index cfee593a9..000000000 --- a/weed/s3api/bucket_paths_test.go +++ /dev/null @@ -1,45 +0,0 @@ -package s3api - -import "testing" - -func TestNormalizeTableLocationMappingPath(t *testing.T) { - testCases := []struct { - name string - raw string - want string - }{ - { - name: "legacy table path maps to bucket root", - raw: "/buckets/warehouse/analytics/orders", - want: "/buckets/warehouse", - }, - { - name: "already bucket root", - raw: "/buckets/warehouse", - want: "/buckets/warehouse", - }, - { - name: "relative buckets path normalized and reduced", - raw: "buckets/warehouse/analytics/orders", - want: "/buckets/warehouse", - }, - { - name: "non buckets path preserved", - raw: "/tmp/custom/path", - want: "/tmp/custom/path", - }, - { - name: "empty path", - raw: "", - want: "", - }, - } - - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - if got := normalizeTableLocationMappingPath(tc.raw); got != tc.want { - t.Fatalf("normalizeTableLocationMappingPath(%q)=%q, want %q", tc.raw, got, tc.want) - } - }) - } -} diff --git a/weed/s3api/s3tables/handler_table.go b/weed/s3api/s3tables/handler_table.go index 5a21f2cfb..0b5b50932 100644 --- a/weed/s3api/s3tables/handler_table.go +++ b/weed/s3api/s3tables/handler_table.go @@ -1,7 +1,6 @@ package s3tables import ( - "context" "encoding/json" "errors" "fmt" @@ -10,7 +9,6 @@ import ( "strings" "time" - "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" ) @@ -242,10 +240,6 @@ func (h *S3TablesHandler) handleCreateTable(w http.ResponseWriter, r *http.Reque } } - if err := h.updateTableLocationMapping(r.Context(), client, "", req.MetadataLocation, tablePath); err != nil { - glog.V(1).Infof("failed to update table location mapping for %s: %v", req.MetadataLocation, err) - } - return nil }) @@ -943,9 +937,6 @@ func (h *S3TablesHandler) handleDeleteTable(w http.ResponseWriter, r *http.Reque if err := h.deleteDirectory(r.Context(), client, tablePath); err != nil { return err } - if err := h.deleteTableLocationMapping(r.Context(), client, metadata.MetadataLocation, tablePath); err != nil { - glog.V(1).Infof("failed to delete table location mapping for %s: %v", metadata.MetadataLocation, err) - } return nil }) @@ -1090,9 +1081,6 @@ func (h *S3TablesHandler) handleUpdateTable(w http.ResponseWriter, r *http.Reque return ErrVersionTokenMismatch } - // Capture old metadata location before mutation for stale mapping cleanup - oldMetadataLocation := metadata.MetadataLocation - // Update metadata if req.Metadata != nil { if metadata.Metadata == nil { @@ -1131,9 +1119,6 @@ func (h *S3TablesHandler) handleUpdateTable(w http.ResponseWriter, r *http.Reque if err := h.setExtendedAttribute(r.Context(), client, tablePath, ExtendedKeyMetadata, metadataBytes); err != nil { return err } - if err := h.updateTableLocationMapping(r.Context(), client, oldMetadataLocation, metadata.MetadataLocation, tablePath); err != nil { - glog.V(1).Infof("failed to update table location mapping for %s -> %s: %v", oldMetadataLocation, metadata.MetadataLocation, err) - } return nil }) @@ -1149,104 +1134,3 @@ func (h *S3TablesHandler) handleUpdateTable(w http.ResponseWriter, r *http.Reque }) return nil } - -func (h *S3TablesHandler) updateTableLocationMapping(ctx context.Context, client filer_pb.SeaweedFilerClient, oldMetadataLocation, newMetadataLocation, tablePath string) error { - newTableLocationBucket, ok := parseTableLocationBucket(newMetadataLocation) - if !ok { - return nil - } - tableBucketPath, ok := tableBucketPathFromTablePath(tablePath) - if !ok { - return fmt.Errorf("invalid table path for location mapping: %s", tablePath) - } - - if err := h.ensureDirectory(ctx, client, GetTableLocationMappingDir()); err != nil { - return err - } - if err := h.ensureTableLocationMappingBucketDir(ctx, client, newTableLocationBucket); err != nil { - return err - } - - // If the metadata location changed, remove this table's stale mapping entry from the old bucket. - if oldMetadataLocation != "" && oldMetadataLocation != newMetadataLocation { - oldTableLocationBucket, ok := parseTableLocationBucket(oldMetadataLocation) - if ok && oldTableLocationBucket != newTableLocationBucket { - if err := h.removeTableLocationMappingEntry(ctx, client, oldTableLocationBucket, tablePath); err != nil { - glog.V(1).Infof("failed to delete stale mapping for %s: %v", oldTableLocationBucket, err) - } - } - } - - return h.upsertFile(ctx, client, GetTableLocationMappingEntryPath(newTableLocationBucket, tablePath), []byte(tableBucketPath)) -} - -func (h *S3TablesHandler) deleteTableLocationMapping(ctx context.Context, client filer_pb.SeaweedFilerClient, metadataLocation, tablePath string) error { - tableLocationBucket, ok := parseTableLocationBucket(metadataLocation) - if !ok { - return nil - } - return h.removeTableLocationMappingEntry(ctx, client, tableLocationBucket, tablePath) -} - -func (h *S3TablesHandler) ensureTableLocationMappingBucketDir(ctx context.Context, client filer_pb.SeaweedFilerClient, tableLocationBucket string) error { - mappingDir := GetTableLocationMappingDir() - bucketMappingPath := GetTableLocationMappingPath(tableLocationBucket) - - resp, err := filer_pb.LookupEntry(ctx, client, &filer_pb.LookupDirectoryEntryRequest{ - Directory: mappingDir, - Name: tableLocationBucket, - }) - if err == nil { - if resp != nil && resp.Entry != nil && resp.Entry.IsDirectory { - return nil - } - if removeErr := h.deleteEntryIfExists(ctx, client, bucketMappingPath); removeErr != nil && !errors.Is(removeErr, filer_pb.ErrNotFound) { - return removeErr - } - } else if !errors.Is(err, filer_pb.ErrNotFound) { - return err - } - - return h.ensureDirectory(ctx, client, bucketMappingPath) -} - -func (h *S3TablesHandler) removeTableLocationMappingEntry(ctx context.Context, client filer_pb.SeaweedFilerClient, tableLocationBucket, tablePath string) error { - entryPath := GetTableLocationMappingEntryPath(tableLocationBucket, tablePath) - if err := h.deleteEntryIfExists(ctx, client, entryPath); err != nil && !errors.Is(err, filer_pb.ErrNotFound) { - return err - } - return h.removeTableLocationMappingBucketDirIfEmpty(ctx, client, tableLocationBucket) -} - -func (h *S3TablesHandler) removeTableLocationMappingBucketDirIfEmpty(ctx context.Context, client filer_pb.SeaweedFilerClient, tableLocationBucket string) error { - bucketMappingPath := GetTableLocationMappingPath(tableLocationBucket) - - stream, err := client.ListEntries(ctx, &filer_pb.ListEntriesRequest{ - Directory: bucketMappingPath, - Limit: 1, - }) - if err != nil { - if errors.Is(err, filer_pb.ErrNotFound) { - return nil - } - return err - } - - for { - resp, recvErr := stream.Recv() - if recvErr == io.EOF { - break - } - if recvErr != nil { - return recvErr - } - if resp != nil && resp.Entry != nil { - return nil - } - } - - if err := h.deleteEntryIfExists(ctx, client, bucketMappingPath); err != nil && !errors.Is(err, filer_pb.ErrNotFound) { - return err - } - return nil -} diff --git a/weed/s3api/s3tables/table_location_mapping_test.go b/weed/s3api/s3tables/table_location_mapping_test.go deleted file mode 100644 index e4026d42f..000000000 --- a/weed/s3api/s3tables/table_location_mapping_test.go +++ /dev/null @@ -1,77 +0,0 @@ -package s3tables - -import ( - "strings" - "testing" -) - -func TestGetTableLocationMappingEntryPathPerTable(t *testing.T) { - tableLocationBucket := "shared-location--table-s3" - tablePathA := GetTablePath("warehouse", "analytics", "orders") - tablePathB := GetTablePath("warehouse", "analytics", "customers") - - entryPathA := GetTableLocationMappingEntryPath(tableLocationBucket, tablePathA) - entryPathARepeat := GetTableLocationMappingEntryPath(tableLocationBucket, tablePathA) - entryPathB := GetTableLocationMappingEntryPath(tableLocationBucket, tablePathB) - - if entryPathA != entryPathARepeat { - t.Fatalf("mapping entry path should be deterministic: %q != %q", entryPathA, entryPathARepeat) - } - if entryPathA == entryPathB { - t.Fatalf("mapping entry path should differ per table path: %q == %q", entryPathA, entryPathB) - } - - expectedPrefix := GetTableLocationMappingPath(tableLocationBucket) + "/" - if !strings.HasPrefix(entryPathA, expectedPrefix) { - t.Fatalf("mapping entry path %q should start with %q", entryPathA, expectedPrefix) - } - if strings.TrimPrefix(entryPathA, expectedPrefix) == "" { - t.Fatalf("mapping entry name should not be empty: %q", entryPathA) - } -} - -func TestTableBucketPathFromTablePath(t *testing.T) { - testCases := []struct { - name string - tablePath string - expected string - ok bool - }{ - { - name: "valid table path", - tablePath: GetTablePath("warehouse", "analytics", "orders"), - expected: GetTableBucketPath("warehouse"), - ok: true, - }, - { - name: "valid table bucket root", - tablePath: GetTableBucketPath("warehouse"), - expected: GetTableBucketPath("warehouse"), - ok: true, - }, - { - name: "invalid non-tables path", - tablePath: "/tmp/warehouse/analytics/orders", - expected: "", - ok: false, - }, - { - name: "invalid empty bucket segment", - tablePath: "/buckets/", - expected: "", - ok: false, - }, - } - - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - actual, ok := tableBucketPathFromTablePath(tc.tablePath) - if ok != tc.ok { - t.Fatalf("tableBucketPathFromTablePath(%q) ok=%v, want %v", tc.tablePath, ok, tc.ok) - } - if actual != tc.expected { - t.Fatalf("tableBucketPathFromTablePath(%q)=%q, want %q", tc.tablePath, actual, tc.expected) - } - }) - } -} diff --git a/weed/s3api/s3tables/utils.go b/weed/s3api/s3tables/utils.go index 1e64bfbf6..ff5dd0fe2 100644 --- a/weed/s3api/s3tables/utils.go +++ b/weed/s3api/s3tables/utils.go @@ -2,7 +2,6 @@ package s3tables import ( "crypto/rand" - "crypto/sha1" "encoding/hex" "fmt" "net/url" @@ -21,8 +20,7 @@ const ( ) const ( - tableLocationMappingsDirPath = "/etc/s3tables" - tableObjectRootDirName = ".objects" + tableObjectRootDirName = ".objects" ) var ( @@ -109,43 +107,6 @@ func GetTableObjectBucketPath(bucketName string) string { return path.Join(GetTableObjectRootDir(), bucketName) } -// GetTableLocationMappingDir returns the root path for table location bucket mappings -func GetTableLocationMappingDir() string { - return tableLocationMappingsDirPath -} - -// GetTableLocationMappingPath returns the filer path for a table location bucket mapping -func GetTableLocationMappingPath(tableLocationBucket string) string { - return path.Join(GetTableLocationMappingDir(), tableLocationBucket) -} - -// GetTableLocationMappingEntryPath returns the filer path for a table-specific mapping entry. -// Each table gets its own entry so multiple tables can share the same external table-location bucket. -func GetTableLocationMappingEntryPath(tableLocationBucket, tablePath string) string { - return path.Join(GetTableLocationMappingPath(tableLocationBucket), tableLocationMappingEntryName(tablePath)) -} - -func tableLocationMappingEntryName(tablePath string) string { - normalized := path.Clean("/" + strings.TrimSpace(strings.TrimPrefix(tablePath, "/"))) - sum := sha1.Sum([]byte(normalized)) - return hex.EncodeToString(sum[:]) -} - -func tableBucketPathFromTablePath(tablePath string) (string, bool) { - normalized := path.Clean("/" + strings.TrimSpace(strings.TrimPrefix(tablePath, "/"))) - tablesPrefix := strings.TrimSuffix(TablesPath, "/") + "/" - if !strings.HasPrefix(normalized, tablesPrefix) { - return "", false - } - - remaining := strings.TrimPrefix(normalized, tablesPrefix) - bucketName, _, _ := strings.Cut(remaining, "/") - if bucketName == "" { - return "", false - } - return path.Join(TablesPath, bucketName), true -} - // Metadata structures type tableBucketMetadata struct { @@ -244,22 +205,6 @@ func ValidateBucketName(name string) error { return validateBucketName(name) } -func parseTableLocationBucket(metadataLocation string) (string, bool) { - if !strings.HasPrefix(metadataLocation, "s3://") { - return "", false - } - trimmed := strings.TrimPrefix(metadataLocation, "s3://") - trimmed = strings.TrimSuffix(trimmed, "/") - if trimmed == "" { - return "", false - } - bucket, _, _ := strings.Cut(trimmed, "/") - if bucket == "" || !strings.HasSuffix(bucket, "--table-s3") { - return "", false - } - return bucket, true -} - // BuildBucketARN builds a bucket ARN with the provided region and account ID. // If region is empty, the ARN will omit the region field. func BuildBucketARN(region, accountID, bucketName string) (string, error) {