* Add Trino blog operations test * Update test/s3tables/catalog_trino/trino_blog_operations_test.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * feat: add table bucket path helpers and filer operations - Add table object root and table location mapping directories - Implement ensureDirectory, upsertFile, deleteEntryIfExists helpers - Support table location bucket mapping for S3 access * feat: manage table bucket object roots on creation/deletion - Create .objects directory for table buckets on creation - Clean up table object bucket paths on deletion - Enable S3 operations on table bucket object roots * feat: add table location mapping for Iceberg REST - Track table location bucket mappings when tables are created/updated/deleted - Enable location-based routing for S3 operations on table data * feat: route S3 operations to table bucket object roots - Route table-s3 bucket names to mapped table paths - Route table buckets to object root directories - Support table location bucket mapping lookup * feat: emit table-s3 locations from Iceberg REST - Generate unique table-s3 bucket names with UUID suffix - Store table metadata under table bucket paths - Return table-s3 locations for Trino compatibility * fix: handle missing directories in S3 list operations - Propagate ErrNotFound from ListEntries for non-existent directories - Treat missing directories as empty results for list operations - Fixes Trino non-empty location checks on table creation * test: improve Trino CSV parsing for single-value results - Sanitize Trino output to skip jline warnings - Handle single-value CSV results without header rows - Strip quotes from numeric values in tests * refactor: use bucket path helpers throughout S3 API - Replace direct bucket path operations with helper functions - Leverage centralized table bucket routing logic - Improve maintainability with consistent path resolution * fix: add table bucket cache and improve filer error handling - Cache table bucket lookups to reduce filer overhead on repeated checks - Use filer_pb.CreateEntry and filer_pb.UpdateEntry helpers to check resp.Error - Fix delete order in handler_bucket_get_list_delete: delete table object before directory - Make location mapping errors best-effort: log and continue, don't fail API - Update table location mappings to delete stale prior bucket mappings on update - Add 1-second sleep before timestamp time travel query to ensure timestamps are in past - Fix CSV parsing: examine all lines, not skip first; handle single-value rows * fix: properly handle stale metadata location mapping cleanup - Capture oldMetadataLocation before mutation in handleUpdateTable - Update updateTableLocationMapping to accept both old and new locations - Use passed-in oldMetadataLocation to detect location changes - Delete stale mapping only when location actually changes - Pass empty string for oldLocation in handleCreateTable (new tables have no prior mapping) - Improve logging to show old -> new location transitions * refactor: cleanup imports and cache design - Remove unused 'sync' import from bucket_paths.go - Use filer_pb.UpdateEntry helper in setExtendedAttribute and deleteExtendedAttribute for consistent error handling - Add dedicated tableBucketCache map[string]bool to BucketRegistry instead of mixing concerns with metadataCache - Improve cache separation: table buckets cache is now separate from bucket metadata cache * fix: improve cache invalidation and add transient error handling Cache invalidation (critical fix): - Add tableLocationCache to BucketRegistry for location mapping lookups - Clear tableBucketCache and tableLocationCache in RemoveBucketMetadata - Prevents stale cache entries when buckets are deleted/recreated Transient error handling: - Only cache table bucket lookups when conclusive (found or ErrNotFound) - Skip caching on transient errors (network, permission, etc) - Prevents marking real table buckets as non-table due to transient failures Performance optimization: - Cache tableLocationDir results to avoid repeated filer RPCs on hot paths - tableLocationDir now checks cache before making expensive filer lookups - Cache stores empty string for 'not found' to avoid redundant lookups Code clarity: - Add comment to deleteDirectory explaining DeleteEntry response lacks Error field * go fmt * fix: mirror transient error handling in tableLocationDir and optimize bucketDir Transient error handling: - tableLocationDir now only caches definitive results - Mirrors isTableBucket behavior to prevent treating transient errors as permanent misses - Improves reliability on flaky systems or during recovery Performance optimization: - bucketDir avoids redundant isTableBucket call via bucketRoot - Directly use s3a.option.BucketsPath for regular buckets - Saves one cache lookup for every non-table bucket operation * fix: revert bucketDir optimization to preserve bucketRoot logic The optimization to directly use BucketsPath bypassed bucketRoot's logic and caused issues with S3 list operations on delimiter+prefix cases. Revert to using path.Join(s3a.bucketRoot(bucket), bucket) which properly handles all bucket types and ensures consistent path resolution across the codebase. The slight performance cost of an extra cache lookup is worth the correctness and consistency benefits. * feat: move table buckets under /buckets Add a table-bucket marker attribute, reuse bucket metadata cache for table bucket detection, and update list/validation/UI/test paths to treat table buckets as /buckets entries. * Fix S3 Tables code review issues - handler_bucket_create.go: Fix bucket existence check to properly validate entryResp.Entry before setting s3BucketExists flag (nil Entry should not indicate existing bucket) - bucket_paths.go: Add clarifying comment to bucketRoot() explaining unified buckets root path for all bucket types - file_browser_data.go: Optimize by extracting table bucket check early to avoid redundant WithFilerClient call * Fix list prefix delimiter handling * Handle list errors conservatively * Fix Trino FOR TIMESTAMP query - use past timestamp Iceberg requires the timestamp to be strictly in the past. Use current_timestamp - interval '1' second instead of current_timestamp. --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
287 lines
8.8 KiB
Go
287 lines
8.8 KiB
Go
package s3api
|
|
|
|
import (
|
|
"io"
|
|
"testing"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
)
|
|
|
|
// TestImplicitDirectoryBehaviorLogic tests the core logic for implicit directory detection
|
|
// This tests the decision logic without requiring a full S3 server setup
|
|
func TestImplicitDirectoryBehaviorLogic(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
objectPath string
|
|
hasTrailingSlash bool
|
|
fileSize uint64
|
|
isDirectory bool
|
|
hasChildren bool
|
|
versioningEnabled bool
|
|
shouldReturn404 bool
|
|
description string
|
|
}{
|
|
{
|
|
name: "Implicit directory: 0-byte file with children, no trailing slash",
|
|
objectPath: "dataset",
|
|
hasTrailingSlash: false,
|
|
fileSize: 0,
|
|
isDirectory: false,
|
|
hasChildren: true,
|
|
versioningEnabled: false,
|
|
shouldReturn404: true,
|
|
description: "Should return 404 to force s3fs LIST-based discovery",
|
|
},
|
|
{
|
|
name: "Implicit directory: actual directory with children, no trailing slash",
|
|
objectPath: "dataset",
|
|
hasTrailingSlash: false,
|
|
fileSize: 0,
|
|
isDirectory: true,
|
|
hasChildren: true,
|
|
versioningEnabled: false,
|
|
shouldReturn404: true,
|
|
description: "Should return 404 for directory with children",
|
|
},
|
|
{
|
|
name: "Explicit directory request: trailing slash",
|
|
objectPath: "dataset/",
|
|
hasTrailingSlash: true,
|
|
fileSize: 0,
|
|
isDirectory: true,
|
|
hasChildren: true,
|
|
versioningEnabled: false,
|
|
shouldReturn404: false,
|
|
description: "Should return 200 for explicit directory request (trailing slash)",
|
|
},
|
|
{
|
|
name: "Empty file: 0-byte file without children",
|
|
objectPath: "empty.txt",
|
|
hasTrailingSlash: false,
|
|
fileSize: 0,
|
|
isDirectory: false,
|
|
hasChildren: false,
|
|
versioningEnabled: false,
|
|
shouldReturn404: false,
|
|
description: "Should return 200 for legitimate empty file",
|
|
},
|
|
{
|
|
name: "Empty directory: 0-byte directory without children",
|
|
objectPath: "empty-dir",
|
|
hasTrailingSlash: false,
|
|
fileSize: 0,
|
|
isDirectory: true,
|
|
hasChildren: false,
|
|
versioningEnabled: false,
|
|
shouldReturn404: true,
|
|
description: "Should return 404 for empty directory",
|
|
},
|
|
{
|
|
name: "Regular file: non-zero size",
|
|
objectPath: "file.txt",
|
|
hasTrailingSlash: false,
|
|
fileSize: 100,
|
|
isDirectory: false,
|
|
hasChildren: false,
|
|
versioningEnabled: false,
|
|
shouldReturn404: false,
|
|
description: "Should return 200 for regular file with content",
|
|
},
|
|
{
|
|
name: "Versioned bucket: implicit directory should return 200",
|
|
objectPath: "dataset",
|
|
hasTrailingSlash: false,
|
|
fileSize: 0,
|
|
isDirectory: false,
|
|
hasChildren: true,
|
|
versioningEnabled: true,
|
|
shouldReturn404: false,
|
|
description: "Should return 200 for versioned buckets (skip implicit dir check)",
|
|
},
|
|
{
|
|
name: "PyArrow directory marker: 0-byte with children",
|
|
objectPath: "dataset",
|
|
hasTrailingSlash: false,
|
|
fileSize: 0,
|
|
isDirectory: false,
|
|
hasChildren: true,
|
|
versioningEnabled: false,
|
|
shouldReturn404: true,
|
|
description: "Should return 404 for PyArrow-created directory markers",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Test the logic: should we return 404?
|
|
// Logic from HeadObjectHandler:
|
|
// if !versioningConfigured && !strings.HasSuffix(object, "/") {
|
|
// if isActualDirectory {
|
|
// return 404
|
|
// }
|
|
// if isZeroByteFile && hasChildren {
|
|
// return 404
|
|
// }
|
|
// }
|
|
|
|
isZeroByteFile := tt.fileSize == 0 && !tt.isDirectory
|
|
isActualDirectory := tt.isDirectory
|
|
|
|
shouldReturn404 := false
|
|
if !tt.versioningEnabled && !tt.hasTrailingSlash {
|
|
if isActualDirectory {
|
|
shouldReturn404 = true
|
|
} else if isZeroByteFile && tt.hasChildren {
|
|
shouldReturn404 = true
|
|
}
|
|
}
|
|
|
|
if shouldReturn404 != tt.shouldReturn404 {
|
|
t.Errorf("Logic mismatch for %s:\n Expected shouldReturn404=%v\n Got shouldReturn404=%v\n Description: %s",
|
|
tt.name, tt.shouldReturn404, shouldReturn404, tt.description)
|
|
} else {
|
|
t.Logf("✓ %s: correctly returns %d", tt.name, map[bool]int{true: 404, false: 200}[shouldReturn404])
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestHasChildrenLogic tests the hasChildren helper function logic
|
|
func TestHasChildrenLogic(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
bucket string
|
|
prefix string
|
|
listResponse *filer_pb.ListEntriesResponse
|
|
listError error
|
|
expectedResult bool
|
|
description string
|
|
}{
|
|
{
|
|
name: "Directory with children",
|
|
bucket: "test-bucket",
|
|
prefix: "dataset",
|
|
listResponse: &filer_pb.ListEntriesResponse{
|
|
Entry: &filer_pb.Entry{
|
|
Name: "file.parquet",
|
|
IsDirectory: false,
|
|
},
|
|
},
|
|
listError: nil,
|
|
expectedResult: true,
|
|
description: "Should return true when at least one child exists",
|
|
},
|
|
{
|
|
name: "Empty directory",
|
|
bucket: "test-bucket",
|
|
prefix: "empty-dir",
|
|
listResponse: nil,
|
|
listError: io.EOF,
|
|
expectedResult: false,
|
|
description: "Should return false when no children exist (EOF)",
|
|
},
|
|
{
|
|
name: "Directory with leading slash in prefix",
|
|
bucket: "test-bucket",
|
|
prefix: "/dataset",
|
|
listResponse: &filer_pb.ListEntriesResponse{
|
|
Entry: &filer_pb.Entry{
|
|
Name: "file.parquet",
|
|
IsDirectory: false,
|
|
},
|
|
},
|
|
listError: nil,
|
|
expectedResult: true,
|
|
description: "Should handle leading slashes correctly",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Test the hasChildren logic:
|
|
// 1. It should trim leading slashes from prefix
|
|
// 2. It should list with Limit=1
|
|
// 3. It should return true if any entry is received
|
|
// 4. It should return false if EOF is received
|
|
|
|
hasChildren := false
|
|
if tt.listError == nil && tt.listResponse != nil {
|
|
hasChildren = true
|
|
} else if tt.listError == io.EOF {
|
|
hasChildren = false
|
|
}
|
|
|
|
if hasChildren != tt.expectedResult {
|
|
t.Errorf("hasChildren logic mismatch for %s:\n Expected: %v\n Got: %v\n Description: %s",
|
|
tt.name, tt.expectedResult, hasChildren, tt.description)
|
|
} else {
|
|
t.Logf("✓ %s: correctly returns %v", tt.name, hasChildren)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestImplicitDirectoryEdgeCases tests edge cases in the implicit directory detection
|
|
func TestImplicitDirectoryEdgeCases(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
scenario string
|
|
expectation string
|
|
}{
|
|
{
|
|
name: "PyArrow write_dataset creates 0-byte files",
|
|
scenario: "PyArrow creates 'dataset' as 0-byte file, then writes 'dataset/file.parquet'",
|
|
expectation: "HEAD dataset → 404 (has children), s3fs uses LIST → correctly identifies as directory",
|
|
},
|
|
{
|
|
name: "Filer creates actual directories",
|
|
scenario: "Filer creates 'dataset' as actual directory with IsDirectory=true",
|
|
expectation: "HEAD dataset → 404 (has children), s3fs uses LIST → correctly identifies as directory",
|
|
},
|
|
{
|
|
name: "Empty file edge case",
|
|
scenario: "User creates 'empty.txt' as 0-byte file with no children",
|
|
expectation: "HEAD empty.txt → 200 (no children), s3fs correctly reports as file",
|
|
},
|
|
{
|
|
name: "Explicit directory request",
|
|
scenario: "User requests 'dataset/' with trailing slash",
|
|
expectation: "HEAD dataset/ → 200 (explicit directory request), normal directory behavior",
|
|
},
|
|
{
|
|
name: "Versioned bucket",
|
|
scenario: "Bucket has versioning enabled",
|
|
expectation: "HEAD dataset → 200 (skip implicit dir check), versioned semantics apply",
|
|
},
|
|
{
|
|
name: "AWS S3 compatibility",
|
|
scenario: "Only 'dataset/file.txt' exists, no marker at 'dataset'",
|
|
expectation: "HEAD dataset → 404 (object doesn't exist), matches AWS S3 behavior",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Logf("Scenario: %s", tt.scenario)
|
|
t.Logf("Expected: %s", tt.expectation)
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestImplicitDirectoryIntegration is an integration test placeholder
|
|
// Run with: cd test/s3/parquet && make test-implicit-dir-with-server
|
|
func TestImplicitDirectoryIntegration(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("Skipping integration test in short mode")
|
|
}
|
|
|
|
t.Skip("Integration test - run manually with: cd test/s3/parquet && make test-implicit-dir-with-server")
|
|
}
|
|
|
|
// Benchmark for hasChildren performance
|
|
func BenchmarkHasChildrenCheck(b *testing.B) {
|
|
// This benchmark would measure the performance impact of the hasChildren check
|
|
// Expected: ~1-5ms per call (one gRPC LIST request with Limit=1)
|
|
b.Skip("Benchmark - requires full filer setup")
|
|
}
|