Browse Source
Add table operations test (#8241)
Add table operations test (#8241)
* 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>feature/s3tables-improvements-and-spark-tests
Chris Lu
4 weeks ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
41 changed files with 906 additions and 278 deletions
-
172test/s3tables/catalog_trino/trino_blog_operations_test.go
-
29test/s3tables/catalog_trino/trino_catalog_test.go
-
38weed/admin/dash/file_browser_data.go
-
24weed/admin/dash/file_browser_data_test.go
-
3weed/admin/dash/s3tables_management.go
-
39weed/admin/view/app/file_browser.templ
-
29weed/admin/view/app/file_browser_templ.go
-
12weed/command/mount_std.go
-
2weed/s3api/auth_signature_v4.go
-
30weed/s3api/bucket_metadata.go
-
118weed/s3api/bucket_paths.go
-
2weed/s3api/filer_multipart.go
-
102weed/s3api/iceberg/iceberg.go
-
10weed/s3api/s3api_bucket_config.go
-
14weed/s3api/s3api_bucket_handlers.go
-
2weed/s3api/s3api_bucket_handlers_object_lock_config.go
-
14weed/s3api/s3api_bucket_policy_handlers.go
-
21weed/s3api/s3api_implicit_directory_test.go
-
42weed/s3api/s3api_object_handlers.go
-
8weed/s3api/s3api_object_handlers_acl.go
-
20weed/s3api/s3api_object_handlers_copy.go
-
4weed/s3api/s3api_object_handlers_copy_unified.go
-
4weed/s3api/s3api_object_handlers_delete.go
-
31weed/s3api/s3api_object_handlers_list.go
-
2weed/s3api/s3api_object_handlers_multipart.go
-
2weed/s3api/s3api_object_handlers_postpolicy.go
-
10weed/s3api/s3api_object_handlers_put.go
-
22weed/s3api/s3api_object_handlers_tagging.go
-
4weed/s3api/s3api_object_retention.go
-
20weed/s3api/s3api_object_versioning.go
-
2weed/s3api/s3api_sosapi.go
-
4weed/s3api/s3api_version_id.go
-
72weed/s3api/s3tables/filer_ops.go
-
9weed/s3api/s3tables/handler.go
-
47weed/s3api/s3tables/handler_bucket_create.go
-
22weed/s3api/s3tables/handler_bucket_get_list_delete.go
-
2weed/s3api/s3tables/handler_policy.go
-
56weed/s3api/s3tables/handler_table.go
-
39weed/s3api/s3tables/iceberg_layout.go
-
49weed/s3api/s3tables/iceberg_layout_test.go
-
52weed/s3api/s3tables/utils.go
@ -0,0 +1,172 @@ |
|||
package catalog_trino |
|||
|
|||
import ( |
|||
"fmt" |
|||
"strconv" |
|||
"strings" |
|||
"testing" |
|||
"time" |
|||
) |
|||
|
|||
func TestTrinoBlogOperations(t *testing.T) { |
|||
env := setupTrinoTest(t) |
|||
defer env.Cleanup(t) |
|||
|
|||
schemaName := "blog_ns_" + randomString(6) |
|||
customersTable := "customers_" + randomString(6) |
|||
trinoCustomersTable := "trino_customers_" + randomString(6) |
|||
|
|||
runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("CREATE SCHEMA IF NOT EXISTS iceberg.%s", schemaName)) |
|||
defer runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("DROP SCHEMA IF EXISTS iceberg.%s", schemaName)) |
|||
defer runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("DROP TABLE IF EXISTS iceberg.%s.%s", schemaName, trinoCustomersTable)) |
|||
defer runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("DROP TABLE IF EXISTS iceberg.%s.%s", schemaName, customersTable)) |
|||
|
|||
createCustomersSQL := fmt.Sprintf(`CREATE TABLE IF NOT EXISTS iceberg.%s.%s ( |
|||
customer_sk INT, |
|||
customer_id VARCHAR, |
|||
salutation VARCHAR, |
|||
first_name VARCHAR, |
|||
last_name VARCHAR, |
|||
preferred_cust_flag VARCHAR, |
|||
birth_day INT, |
|||
birth_month INT, |
|||
birth_year INT, |
|||
birth_country VARCHAR, |
|||
login VARCHAR |
|||
) WITH ( |
|||
format = 'PARQUET', |
|||
sorted_by = ARRAY['customer_id'] |
|||
)`, schemaName, customersTable) |
|||
runTrinoSQL(t, env.trinoContainer, createCustomersSQL) |
|||
|
|||
insertCustomersSQL := fmt.Sprintf(`INSERT INTO iceberg.%s.%s VALUES |
|||
(1, 'AAAAA', 'Mrs', 'Amanda', 'Olson', 'Y', 8, 4, 1984, 'US', 'aolson'), |
|||
(2, 'AAAAB', 'Mr', 'Leonard', 'Eads', 'N', 22, 6, 2001, 'US', 'leads'), |
|||
(3, 'BAAAA', 'Mr', 'David', 'White', 'Y', 16, 2, 1999, 'US', 'dwhite'), |
|||
(4, 'BBAAA', 'Mr', 'Melvin', 'Lee', 'N', 30, 3, 1973, 'US', 'mlee'), |
|||
(5, 'AACAA', 'Mr', 'Donald', 'Holt', 'N', 2, 6, 1982, 'CA', 'dholt'), |
|||
(6, 'ABAAA', 'Mrs', 'Jacqueline', 'Harvey', 'N', 5, 12, 1988, 'US', 'jharvey'), |
|||
(7, 'BBAAA', 'Ms', 'Debbie', 'Ward', 'N', 6, 1, 2006, 'MX', 'dward'), |
|||
(8, 'ACAAA', 'Mr', 'Tim', 'Strong', 'N', 15, 7, 1976, 'US', 'tstrong') |
|||
`, schemaName, customersTable) |
|||
runTrinoSQL(t, env.trinoContainer, insertCustomersSQL) |
|||
|
|||
countOutput := runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("SELECT count(*) FROM iceberg.%s.%s", schemaName, customersTable)) |
|||
rowCount := mustParseCSVInt64(t, countOutput) |
|||
if rowCount != 8 { |
|||
t.Fatalf("expected 8 rows in customers table, got %d", rowCount) |
|||
} |
|||
|
|||
output := runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("SELECT first_name FROM iceberg.%s.%s WHERE customer_sk = 1", schemaName, customersTable)) |
|||
if !strings.Contains(output, "Amanda") { |
|||
t.Fatalf("expected sample query to include Amanda, got: %s", output) |
|||
} |
|||
|
|||
ctasSQL := fmt.Sprintf(`CREATE TABLE iceberg.%s.%s |
|||
WITH ( |
|||
format = 'PARQUET' |
|||
) |
|||
AS SELECT * FROM iceberg.%s.%s`, schemaName, trinoCustomersTable, schemaName, customersTable) |
|||
runTrinoSQL(t, env.trinoContainer, ctasSQL) |
|||
|
|||
countOutput = runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("SELECT count(*) FROM iceberg.%s.%s", schemaName, trinoCustomersTable)) |
|||
rowCount = mustParseCSVInt64(t, countOutput) |
|||
if rowCount != 8 { |
|||
t.Fatalf("expected 8 rows in CTAS table, got %d", rowCount) |
|||
} |
|||
|
|||
runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("ALTER TABLE iceberg.%s.%s ADD COLUMN updated_at TIMESTAMP", schemaName, trinoCustomersTable)) |
|||
output = runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("DESCRIBE iceberg.%s.%s", schemaName, trinoCustomersTable)) |
|||
if !strings.Contains(output, "updated_at") { |
|||
t.Fatalf("expected updated_at column in describe output, got: %s", output) |
|||
} |
|||
|
|||
runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("UPDATE iceberg.%s.%s SET updated_at = current_timestamp", schemaName, trinoCustomersTable)) |
|||
|
|||
// Sleep to ensure timestamps are in the past for time travel queries
|
|||
time.Sleep(1 * time.Second) |
|||
|
|||
snapshotOutput := runTrinoSQL(t, env.trinoContainer, fmt.Sprintf(`SELECT snapshot_id FROM iceberg.%s."%s$snapshots" ORDER BY committed_at DESC LIMIT 1`, schemaName, trinoCustomersTable)) |
|||
snapshotID := mustParseCSVInt64(t, snapshotOutput) |
|||
if snapshotID == 0 { |
|||
t.Fatalf("expected snapshot ID from snapshots table, got 0") |
|||
} |
|||
|
|||
filesOutput := runTrinoSQL(t, env.trinoContainer, fmt.Sprintf(`SELECT file_path FROM iceberg.%s."%s$files" LIMIT 1`, schemaName, trinoCustomersTable)) |
|||
if !hasCSVDataRow(filesOutput) { |
|||
t.Fatalf("expected files metadata rows, got: %s", filesOutput) |
|||
} |
|||
|
|||
historyOutput := runTrinoSQL(t, env.trinoContainer, fmt.Sprintf(`SELECT made_current_at FROM iceberg.%s."%s$history" LIMIT 1`, schemaName, trinoCustomersTable)) |
|||
if !hasCSVDataRow(historyOutput) { |
|||
t.Fatalf("expected history metadata rows, got: %s", historyOutput) |
|||
} |
|||
|
|||
countOutput = runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("SELECT count(*) FROM iceberg.%s.%s FOR VERSION AS OF %d", schemaName, trinoCustomersTable, snapshotID)) |
|||
versionCount := mustParseCSVInt64(t, countOutput) |
|||
if versionCount != 8 { |
|||
t.Fatalf("expected 8 rows for version time travel, got %d", versionCount) |
|||
} |
|||
|
|||
// Use current_timestamp - interval '1 second' to ensure it's in the past (Iceberg requirement)
|
|||
countOutput = runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("SELECT count(*) FROM iceberg.%s.%s FOR TIMESTAMP AS OF (current_timestamp - interval '1' second)", schemaName, trinoCustomersTable)) |
|||
timestampCount := mustParseCSVInt64(t, countOutput) |
|||
if timestampCount != 8 { |
|||
t.Fatalf("expected 8 rows for timestamp time travel, got %d", timestampCount) |
|||
} |
|||
|
|||
runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("DELETE FROM iceberg.%s.%s WHERE customer_sk = 8", schemaName, trinoCustomersTable)) |
|||
countOutput = runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("SELECT count(*) FROM iceberg.%s.%s", schemaName, trinoCustomersTable)) |
|||
rowCount = mustParseCSVInt64(t, countOutput) |
|||
if rowCount != 7 { |
|||
t.Fatalf("expected 7 rows after delete, got %d", rowCount) |
|||
} |
|||
|
|||
runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("ALTER TABLE iceberg.%s.%s EXECUTE rollback_to_snapshot(%d)", schemaName, trinoCustomersTable, snapshotID)) |
|||
countOutput = runTrinoSQL(t, env.trinoContainer, fmt.Sprintf("SELECT count(*) FROM iceberg.%s.%s", schemaName, trinoCustomersTable)) |
|||
rowCount = mustParseCSVInt64(t, countOutput) |
|||
if rowCount != 8 { |
|||
t.Fatalf("expected 8 rows after rollback, got %d", rowCount) |
|||
} |
|||
} |
|||
|
|||
func hasCSVDataRow(output string) bool { |
|||
lines := strings.Split(strings.TrimSpace(output), "\n") |
|||
if len(lines) == 0 { |
|||
return false |
|||
} |
|||
for _, line := range lines { |
|||
if strings.TrimSpace(line) != "" { |
|||
return true |
|||
} |
|||
} |
|||
return false |
|||
} |
|||
|
|||
func mustParseCSVInt64(t *testing.T, output string) int64 { |
|||
t.Helper() |
|||
value := mustFirstCSVValue(t, output) |
|||
parsed, err := strconv.ParseInt(value, 10, 64) |
|||
if err != nil { |
|||
t.Fatalf("failed to parse int from output %q: %v", output, err) |
|||
} |
|||
return parsed |
|||
} |
|||
|
|||
func mustFirstCSVValue(t *testing.T, output string) string { |
|||
t.Helper() |
|||
lines := strings.Split(strings.TrimSpace(output), "\n") |
|||
if len(lines) == 0 { |
|||
t.Fatalf("expected CSV output with data row, got: %q", output) |
|||
} |
|||
for _, line := range lines { |
|||
line = strings.TrimSpace(line) |
|||
if line == "" { |
|||
continue |
|||
} |
|||
parts := strings.Split(line, ",") |
|||
return strings.Trim(parts[0], "\"") |
|||
} |
|||
t.Fatalf("no CSV data rows found in output: %q", output) |
|||
return "" |
|||
} |
|||
@ -0,0 +1,118 @@ |
|||
package s3api |
|||
|
|||
import ( |
|||
"errors" |
|||
"path" |
|||
"strings" |
|||
|
|||
"github.com/seaweedfs/seaweedfs/weed/glog" |
|||
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" |
|||
"github.com/seaweedfs/seaweedfs/weed/s3api/s3tables" |
|||
) |
|||
|
|||
func (s3a *S3ApiServer) isTableBucket(bucket string) bool { |
|||
if bucket == "" { |
|||
return false |
|||
} |
|||
|
|||
// Check cache first
|
|||
if s3a.bucketRegistry != nil { |
|||
s3a.bucketRegistry.metadataCacheLock.RLock() |
|||
if metadata, ok := s3a.bucketRegistry.metadataCache[bucket]; ok { |
|||
s3a.bucketRegistry.metadataCacheLock.RUnlock() |
|||
return metadata.IsTableBucket |
|||
} |
|||
s3a.bucketRegistry.metadataCacheLock.RUnlock() |
|||
} |
|||
|
|||
entry, err := s3a.getEntry(s3a.option.BucketsPath, bucket) |
|||
if err == nil && entry != nil { |
|||
if s3a.bucketRegistry != nil { |
|||
s3a.bucketRegistry.LoadBucketMetadata(entry) |
|||
} |
|||
return s3tables.IsTableBucketEntry(entry) |
|||
} |
|||
|
|||
if err != nil && !errors.Is(err, filer_pb.ErrNotFound) { |
|||
glog.V(1).Infof("bucket lookup failed for %s: %v", bucket, err) |
|||
} |
|||
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() |
|||
} |
|||
|
|||
entry, err := s3a.getEntry(s3tables.GetTableLocationMappingDir(), bucket) |
|||
tablePath := "" |
|||
if err == nil && entry != nil && len(entry.Content) > 0 { |
|||
tablePath = strings.TrimSpace(string(entry.Content)) |
|||
} |
|||
|
|||
// 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) 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 |
|||
} |
|||
if s3a.isTableBucket(bucket) { |
|||
return s3tables.GetTableObjectBucketPath(bucket) |
|||
} |
|||
return path.Join(s3a.bucketRoot(bucket), bucket) |
|||
} |
|||
|
|||
func (s3a *S3ApiServer) bucketPrefix(bucket string) string { |
|||
return s3a.bucketDir(bucket) + "/" |
|||
} |
|||
|
|||
func (s3a *S3ApiServer) bucketExists(bucket string) (bool, error) { |
|||
entry, err := s3a.getBucketEntry(bucket) |
|||
if err != nil { |
|||
if errors.Is(err, filer_pb.ErrNotFound) { |
|||
return false, nil |
|||
} |
|||
return false, err |
|||
} |
|||
return entry != nil, nil |
|||
} |
|||
|
|||
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) |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue