You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by ze...@apache.org on 2026/07/16 17:51:50 UTC

(iceberg-go) branch main updated: fix(hadoop): recognize UUID metadata versions above 99999 (#1483)

This is an automated email from the ASF dual-hosted git repository.

zeroshade pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-go.git


The following commit(s) were added to refs/heads/main by this push:
     new bc140b54 fix(hadoop): recognize UUID metadata versions above 99999 (#1483)
bc140b54 is described below

commit bc140b54e72238a663006fa98d02dae77ebddd45
Author: Minh Vu <vu...@gmail.com>
AuthorDate: Thu Jul 16 19:51:44 2026 +0200

    fix(hadoop): recognize UUID metadata versions above 99999 (#1483)
---
 catalog/hadoop/hadoop.go      |  6 ++---
 catalog/hadoop/hadoop_test.go | 61 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/catalog/hadoop/hadoop.go b/catalog/hadoop/hadoop.go
index 10fc63b5..01551093 100644
--- a/catalog/hadoop/hadoop.go
+++ b/catalog/hadoop/hadoop.go
@@ -58,10 +58,10 @@ var versionPattern = regexp.MustCompile(`^v([0-9]+)(?:\.gz)?\.metadata\.json$`)
 
 // uuidMetadataPattern matches UUID-style metadata filenames produced by
 // Java/PyIceberg catalogs: 00000-<uuid>.metadata.json or
-// 00000-<uuid>.gz.metadata.json. The sequence is a 5-digit zero-padded
-// number and the UUID is in canonical 8-4-4-4-12 hex format.
+// 00000-<uuid>.gz.metadata.json. The numeric sequence has a minimum width
+// of 5 digits and the UUID is in canonical 8-4-4-4-12 hex format.
 var uuidMetadataPattern = regexp.MustCompile(
-	`^([0-9]{5})-[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}(?:\.gz)?\.metadata\.json$`,
+	`^([0-9]{5,})-[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}(?:\.gz)?\.metadata\.json$`,
 )
 
 // Claims expire aggressively so crashed writers do not permanently block a
diff --git a/catalog/hadoop/hadoop_test.go b/catalog/hadoop/hadoop_test.go
index d38c8a55..fcb87eff 100644
--- a/catalog/hadoop/hadoop_test.go
+++ b/catalog/hadoop/hadoop_test.go
@@ -544,21 +544,43 @@ func (s *HadoopCatalogTestSuite) TestVersionPatternRejects() {
 	}
 }
 
-func (s *HadoopCatalogTestSuite) TestMetadataFileFromNameAcceptsZeroUUIDVersion() {
-	file, ok := metadataFileFromName(
-		"/tmp/00000-a1b2c3d4-e5f6-7890-abcd-ef1234567890.metadata.json",
-		"00000-a1b2c3d4-e5f6-7890-abcd-ef1234567890.metadata.json",
-	)
-	s.True(ok)
-	s.Equal(0, file.version)
-	s.Equal("/tmp/00000-a1b2c3d4-e5f6-7890-abcd-ef1234567890.metadata.json", file.location)
+func (s *HadoopCatalogTestSuite) TestMetadataFileFromNameAcceptsUUIDVersions() {
+	tests := []struct {
+		filename   string
+		version    int
+		compressed bool
+	}{
+		{"00000-a1b2c3d4-e5f6-7890-abcd-ef1234567890.metadata.json", 0, false},
+		{"99999-a1b2c3d4-e5f6-7890-abcd-ef1234567890.metadata.json", 99999, false},
+		{"100000-a1b2c3d4-e5f6-7890-abcd-ef1234567890.metadata.json", 100000, false},
+		{"1234567-a1b2c3d4-e5f6-7890-abcd-ef1234567890.gz.metadata.json", 1234567, true},
+	}
+
+	for _, tt := range tests {
+		s.Run(tt.filename, func() {
+			path := filepath.Join("metadata", tt.filename)
+			file, ok := metadataFileFromName(path, tt.filename)
+			s.True(ok)
+			s.Equal(tt.version, file.version)
+			s.Equal(tt.compressed, file.compressed)
+			s.Equal(path, file.location)
+		})
+	}
+}
+
+func (s *HadoopCatalogTestSuite) TestMetadataFileFromNameRejectsShortUUIDVersion() {
+	filename := "9999-a1b2c3d4-e5f6-7890-abcd-ef1234567890.metadata.json"
+	_, ok := metadataFileFromName(filepath.Join("metadata", filename), filename)
+	s.False(ok)
 }
 
 func (s *HadoopCatalogTestSuite) TestMetadataFileFromNameRejectsOverflowVersion() {
-	_, ok := metadataFileFromName(
-		"/tmp/v99999999999999999999.metadata.json",
-		"v99999999999999999999.metadata.json",
-	)
+	hadoopName := "v99999999999999999999.metadata.json"
+	_, ok := metadataFileFromName(filepath.Join("metadata", hadoopName), hadoopName)
+	s.False(ok)
+
+	uuidName := "99999999999999999999-a1b2c3d4-e5f6-7890-abcd-ef1234567890.metadata.json"
+	_, ok = metadataFileFromName(filepath.Join("metadata", uuidName), uuidName)
 	s.False(ok)
 }
 
@@ -858,6 +880,21 @@ func (s *HadoopCatalogTestSuite) TestFindMetadataLocationUsesCanonicalPathForDup
 	s.Equal(filepath.Join(dir, "v3.metadata.json"), path)
 }
 
+func (s *HadoopCatalogTestSuite) TestFindMetadataLocationSelectsUUIDVersionBeyondPadding() {
+	ident := []string{"ns", "tbl"}
+	dir := s.cat.metadataDir(ident)
+	s.Require().NoError(os.MkdirAll(dir, 0o755))
+	previous := "99999-a1b2c3d4-e5f6-7890-abcd-ef1234567890.metadata.json"
+	latest := "100000-a1b2c3d4-e5f6-7890-abcd-ef1234567890.gz.metadata.json"
+	s.Require().NoError(os.WriteFile(filepath.Join(dir, previous), nil, 0o644))
+	s.Require().NoError(os.WriteFile(filepath.Join(dir, latest), nil, 0o644))
+
+	path, version, err := s.cat.findMetadataLocation(ident)
+	s.Require().NoError(err)
+	s.Equal(100000, version)
+	s.Equal(filepath.Join(dir, latest), path)
+}
+
 // CreateNamespace tests
 
 func (s *HadoopCatalogTestSuite) TestCreateNamespace() {