* 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>
503 lines
12 KiB
Go
503 lines
12 KiB
Go
package dash
|
|
|
|
import (
|
|
"path"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
)
|
|
|
|
// TestGenerateBreadcrumbs tests the actual breadcrumb generation function
|
|
// from the production code with various path scenarios
|
|
func TestGenerateBreadcrumbs(t *testing.T) {
|
|
s := &AdminServer{}
|
|
|
|
tests := []struct {
|
|
name string
|
|
path string
|
|
expected []BreadcrumbItem
|
|
}{
|
|
{
|
|
name: "root path",
|
|
path: "/",
|
|
expected: []BreadcrumbItem{
|
|
{Name: "Root", Path: "/"},
|
|
},
|
|
},
|
|
{
|
|
name: "simple path",
|
|
path: "/folder",
|
|
expected: []BreadcrumbItem{
|
|
{Name: "Root", Path: "/"},
|
|
{Name: "folder", Path: "/folder"},
|
|
},
|
|
},
|
|
{
|
|
name: "nested path",
|
|
path: "/folder/subfolder",
|
|
expected: []BreadcrumbItem{
|
|
{Name: "Root", Path: "/"},
|
|
{Name: "folder", Path: "/folder"},
|
|
{Name: "subfolder", Path: "/folder/subfolder"},
|
|
},
|
|
},
|
|
{
|
|
name: "bucket path",
|
|
path: "/buckets/mybucket",
|
|
expected: []BreadcrumbItem{
|
|
{Name: "Root", Path: "/"},
|
|
{Name: "Object Store Buckets", Path: "/buckets"},
|
|
{Name: "📦 mybucket", Path: "/buckets/mybucket"},
|
|
},
|
|
},
|
|
{
|
|
name: "bucket nested path",
|
|
path: "/buckets/mybucket/folder",
|
|
expected: []BreadcrumbItem{
|
|
{Name: "Root", Path: "/"},
|
|
{Name: "Object Store Buckets", Path: "/buckets"},
|
|
{Name: "📦 mybucket", Path: "/buckets/mybucket"},
|
|
{Name: "folder", Path: "/buckets/mybucket/folder"},
|
|
},
|
|
},
|
|
{
|
|
name: "path with trailing slash",
|
|
path: "/folder/",
|
|
expected: []BreadcrumbItem{
|
|
{Name: "Root", Path: "/"},
|
|
{Name: "folder", Path: "/folder"},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Call the actual production function
|
|
result := s.generateBreadcrumbs(tt.path)
|
|
|
|
if len(result) != len(tt.expected) {
|
|
t.Errorf("expected %d breadcrumbs, got %d", len(tt.expected), len(result))
|
|
return
|
|
}
|
|
|
|
for i, crumb := range result {
|
|
if crumb.Name != tt.expected[i].Name {
|
|
t.Errorf("breadcrumb %d: expected name %q, got %q", i, tt.expected[i].Name, crumb.Name)
|
|
}
|
|
if crumb.Path != tt.expected[i].Path {
|
|
t.Errorf("breadcrumb %d: expected path %q, got %q", i, tt.expected[i].Path, crumb.Path)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestPathHandlingWithForwardSlashes verifies that the production code
|
|
// correctly handles paths with forward slashes (not OS-specific backslashes)
|
|
func TestPathHandlingWithForwardSlashes(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
path string
|
|
hasSlash bool
|
|
}{
|
|
{
|
|
name: "root",
|
|
path: "/",
|
|
hasSlash: true,
|
|
},
|
|
{
|
|
name: "single level",
|
|
path: "/test",
|
|
hasSlash: true,
|
|
},
|
|
{
|
|
name: "multiple levels",
|
|
path: "/a/b/c",
|
|
hasSlash: true,
|
|
},
|
|
{
|
|
name: "bucket path",
|
|
path: "/buckets/mybucket/file",
|
|
hasSlash: true,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Verify no backslashes appear in paths (which would be wrong on Windows)
|
|
if strings.Contains(tt.path, "\\") {
|
|
t.Errorf("path contains backslash: %q", tt.path)
|
|
}
|
|
|
|
// Verify forward slashes are used
|
|
if tt.hasSlash && !strings.Contains(tt.path, "/") {
|
|
t.Errorf("path should contain forward slash: %q", tt.path)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestParentPathCalculationLogic verifies that parent path calculation
|
|
// uses path.Dir semantics (forward slashes), not filepath.Dir (OS-specific)
|
|
func TestParentPathCalculationLogic(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
currentDir string
|
|
expected string
|
|
}{
|
|
{
|
|
name: "root path",
|
|
currentDir: "/",
|
|
expected: "/",
|
|
},
|
|
{
|
|
name: "single level",
|
|
currentDir: "/folder",
|
|
expected: "/",
|
|
},
|
|
{
|
|
name: "two levels",
|
|
currentDir: "/folder/subfolder",
|
|
expected: "/folder",
|
|
},
|
|
{
|
|
name: "deep nesting",
|
|
currentDir: "/a/b/c/d",
|
|
expected: "/a/b/c",
|
|
},
|
|
{
|
|
name: "bucket root",
|
|
currentDir: "/buckets",
|
|
expected: "/",
|
|
},
|
|
{
|
|
name: "bucket directory",
|
|
currentDir: "/buckets/mybucket",
|
|
expected: "/buckets",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Verify using path.Dir (the correct approach for URLs)
|
|
// This demonstrates the expected behavior
|
|
parentPath := "/"
|
|
if tt.currentDir != "/" {
|
|
// path.Dir always uses forward slashes
|
|
parentPath = path.Dir(tt.currentDir)
|
|
if parentPath == "." {
|
|
parentPath = "/"
|
|
}
|
|
}
|
|
|
|
if parentPath != tt.expected {
|
|
t.Errorf("expected parent %q, got %q for %q", tt.expected, parentPath, tt.currentDir)
|
|
}
|
|
|
|
// Verify no backslashes in the result
|
|
if strings.Contains(parentPath, "\\") {
|
|
t.Errorf("parent path contains backslash: %q", parentPath)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestFileExtensionHandlingLogic verifies that file extensions are correctly
|
|
// identified using path semantics (always forward slashes)
|
|
func TestFileExtensionHandlingLogic(t *testing.T) {
|
|
tests := []struct {
|
|
filename string
|
|
expected string
|
|
}{
|
|
{"file.txt", ".txt"},
|
|
{"file.log", ".log"},
|
|
{"archive.tar.gz", ".gz"},
|
|
{"image.jpg", ".jpg"},
|
|
{"document.pdf", ".pdf"},
|
|
{"data.json", ".json"},
|
|
{"noextension", ""},
|
|
{".hidden", ".hidden"},
|
|
{"file.TXT", ".txt"},
|
|
{"file.JPG", ".jpg"},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.filename, func(t *testing.T) {
|
|
// Verify using path.Ext + strings.ToLower (the correct approach)
|
|
ext := strings.ToLower(path.Ext(tt.filename))
|
|
if ext != tt.expected {
|
|
t.Errorf("expected extension %q for %q, got %q", tt.expected, tt.filename, ext)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestBucketPathDetectionLogic verifies bucket path detection logic
|
|
func TestBucketPathDetectionLogic(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
path string
|
|
isBucket bool
|
|
expectedName string
|
|
}{
|
|
{
|
|
name: "root is not a bucket path",
|
|
path: "/",
|
|
isBucket: false,
|
|
expectedName: "",
|
|
},
|
|
{
|
|
name: "buckets root",
|
|
path: "/buckets/",
|
|
isBucket: true,
|
|
expectedName: "",
|
|
},
|
|
{
|
|
name: "single bucket",
|
|
path: "/buckets/mybucket",
|
|
isBucket: true,
|
|
expectedName: "mybucket",
|
|
},
|
|
{
|
|
name: "bucket with nested path",
|
|
path: "/buckets/mybucket/folder/file",
|
|
isBucket: true,
|
|
expectedName: "mybucket",
|
|
},
|
|
{
|
|
name: "non-bucket path",
|
|
path: "/data/folder",
|
|
isBucket: false,
|
|
expectedName: "",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Verify the bucket path detection logic
|
|
isBucketPath := false
|
|
bucketName := ""
|
|
if strings.HasPrefix(tt.path, "/buckets/") {
|
|
isBucketPath = true
|
|
pathParts := strings.Split(strings.Trim(tt.path, "/"), "/")
|
|
if len(pathParts) >= 2 {
|
|
bucketName = pathParts[1]
|
|
}
|
|
}
|
|
|
|
if isBucketPath != tt.isBucket {
|
|
t.Errorf("expected isBucketPath=%v, got %v for path %q", tt.isBucket, isBucketPath, tt.path)
|
|
}
|
|
|
|
if bucketName != tt.expectedName {
|
|
t.Errorf("expected bucket name %q, got %q for path %q", tt.expectedName, bucketName, tt.path)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestPathJoinHandlesEdgeCases verifies that path.Join handles edge cases
|
|
// properly for URL path construction (unlike filepath.Join which is OS-specific)
|
|
func TestPathJoinHandlesEdgeCases(t *testing.T) {
|
|
tests := []struct {
|
|
testName string
|
|
dir string
|
|
filename string
|
|
expected string
|
|
}{
|
|
{
|
|
testName: "root directory",
|
|
dir: "/",
|
|
filename: "file.txt",
|
|
expected: "/file.txt",
|
|
},
|
|
{
|
|
testName: "simple directory",
|
|
dir: "/folder",
|
|
filename: "file.txt",
|
|
expected: "/folder/file.txt",
|
|
},
|
|
{
|
|
testName: "nested directory",
|
|
dir: "/a/b/c",
|
|
filename: "file.txt",
|
|
expected: "/a/b/c/file.txt",
|
|
},
|
|
{
|
|
testName: "handles trailing slash",
|
|
dir: "/folder/",
|
|
filename: "file.txt",
|
|
expected: "/folder/file.txt",
|
|
},
|
|
{
|
|
testName: "handles empty name",
|
|
dir: "/folder",
|
|
filename: "",
|
|
expected: "/folder",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.testName, func(t *testing.T) {
|
|
// Verify path.Join behavior for URL paths
|
|
result := path.Join(tt.dir, tt.filename)
|
|
if result != tt.expected {
|
|
t.Errorf("path.Join(%q, %q) = %q, expected %q", tt.dir, tt.filename, result, tt.expected)
|
|
}
|
|
|
|
// Verify no backslashes in the result
|
|
if strings.Contains(result, "\\") {
|
|
t.Errorf("result contains backslash: %q", result)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestWindowsPathNormalizationBehavior validates that Windows-style paths
|
|
// are correctly converted to forward slashes for URL compatibility.
|
|
// This test verifies the actual util.CleanWindowsPath() function used in
|
|
// the ShowFileBrowser handler.
|
|
func TestWindowsPathNormalizationBehavior(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
windowsPath string
|
|
expectedNormPath string
|
|
}{
|
|
{
|
|
name: "backslash separator",
|
|
windowsPath: "\\folder\\subfolder",
|
|
expectedNormPath: "/folder/subfolder",
|
|
},
|
|
{
|
|
name: "mixed separators",
|
|
windowsPath: "/folder\\subfolder/file",
|
|
expectedNormPath: "/folder/subfolder/file",
|
|
},
|
|
{
|
|
name: "already normalized",
|
|
windowsPath: "/folder/file",
|
|
expectedNormPath: "/folder/file",
|
|
},
|
|
{
|
|
name: "simple backslash path",
|
|
windowsPath: "\\data",
|
|
expectedNormPath: "/data",
|
|
},
|
|
{
|
|
name: "deep nested path",
|
|
windowsPath: "\\a\\b\\c\\d",
|
|
expectedNormPath: "/a/b/c/d",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Test the actual production function
|
|
normalized := util.CleanWindowsPath(tt.windowsPath)
|
|
if normalized != tt.expectedNormPath {
|
|
t.Errorf("CleanWindowsPath(%q): expected %q, got %q",
|
|
tt.windowsPath, tt.expectedNormPath, normalized)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestBreadcrumbPathFormatting validates that breadcrumb paths always
|
|
// use forward slashes and maintain proper URL format
|
|
func TestBreadcrumbPathFormatting(t *testing.T) {
|
|
s := &AdminServer{}
|
|
|
|
testPaths := []string{
|
|
"/",
|
|
"/folder",
|
|
"/folder/subfolder",
|
|
"/buckets/mybucket",
|
|
"/buckets/mybucket/data",
|
|
}
|
|
|
|
for _, testPath := range testPaths {
|
|
t.Run("breadcrumbs_for_"+testPath, func(t *testing.T) {
|
|
breadcrumbs := s.generateBreadcrumbs(testPath)
|
|
|
|
// Verify all breadcrumb paths use forward slashes
|
|
for i, crumb := range breadcrumbs {
|
|
if strings.Contains(crumb.Path, "\\") {
|
|
t.Errorf("breadcrumb %d has backslash in path: %q", i, crumb.Path)
|
|
}
|
|
// Verify paths start with / (except when empty)
|
|
if crumb.Path != "" && !strings.HasPrefix(crumb.Path, "/") {
|
|
t.Errorf("breadcrumb %d path should start with /: %q", i, crumb.Path)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestDirectoryNavigation validates the complete navigation flow
|
|
// for various path scenarios
|
|
func TestDirectoryNavigation(t *testing.T) {
|
|
s := &AdminServer{}
|
|
|
|
tests := []struct {
|
|
name string
|
|
currentPath string
|
|
expectedParent string
|
|
expectedCrumbs int
|
|
}{
|
|
{
|
|
name: "navigate from root",
|
|
currentPath: "/",
|
|
expectedParent: "/",
|
|
expectedCrumbs: 1,
|
|
},
|
|
{
|
|
name: "navigate from single folder",
|
|
currentPath: "/documents",
|
|
expectedParent: "/",
|
|
expectedCrumbs: 2,
|
|
},
|
|
{
|
|
name: "navigate from nested folder",
|
|
currentPath: "/documents/projects/current",
|
|
expectedParent: "/documents/projects",
|
|
expectedCrumbs: 4,
|
|
},
|
|
{
|
|
name: "navigate bucket contents",
|
|
currentPath: "/buckets/data/files",
|
|
expectedParent: "/buckets/data",
|
|
expectedCrumbs: 4,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Verify breadcrumbs are generated correctly
|
|
breadcrumbs := s.generateBreadcrumbs(tt.currentPath)
|
|
if len(breadcrumbs) != tt.expectedCrumbs {
|
|
t.Errorf("expected %d breadcrumbs, got %d", tt.expectedCrumbs, len(breadcrumbs))
|
|
}
|
|
|
|
// Verify parent path calculation
|
|
expectedParent := "/"
|
|
if tt.currentPath != "/" {
|
|
expectedParent = path.Dir(tt.currentPath)
|
|
if expectedParent == "." {
|
|
expectedParent = "/"
|
|
}
|
|
}
|
|
if expectedParent != tt.expectedParent {
|
|
t.Errorf("expected parent %q, got %q", tt.expectedParent, expectedParent)
|
|
}
|
|
|
|
// Verify all paths use forward slashes
|
|
for i, crumb := range breadcrumbs {
|
|
if strings.Contains(crumb.Path, "\\") {
|
|
t.Errorf("breadcrumb %d contains backslash: %q", i, crumb.Path)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|