You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by at...@apache.org on 2026/05/17 17:03:47 UTC

(iceberg-go) branch main updated: feat(table): gate v3-only metadata fields on sub-v3 reads (#1006) (#1069)

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

laskoviymishka 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 2e6b2b6d feat(table): gate v3-only metadata fields on sub-v3 reads (#1006) (#1069)
2e6b2b6d is described below

commit 2e6b2b6da79189232189d4714bec2b09cd9bc98b
Author: Tanmay Rauth <t_...@apple.com>
AuthorDate: Sun May 17 10:03:42 2026 -0700

    feat(table): gate v3-only metadata fields on sub-v3 reads (#1006) (#1069)
    
    Reject next-row-id and encryption-keys during v1/v2 metadata parsing
    with a descriptive error naming the field and required format version.
    
    Closes: #1006
---
 table/metadata.go               |  31 +++++++++++
 table/metadata_internal_test.go | 120 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 151 insertions(+)

diff --git a/table/metadata.go b/table/metadata.go
index 08f545ca..6a4694ef 100644
--- a/table/metadata.go
+++ b/table/metadata.go
@@ -1363,6 +1363,23 @@ var (
 	ErrPartitionSpecNotFound        = errors.New("partition spec not found")
 )
 
+type v3FieldCheck struct {
+	name    string
+	present bool
+}
+
+func rejectV3OnlyFields(version int, checks ...v3FieldCheck) error {
+	var errs []error
+	for _, c := range checks {
+		if c.present {
+			errs = append(errs, fmt.Errorf("%w: v3-only field '%s' present in v%d metadata",
+				ErrInvalidMetadataFormatVersion, c.name, version))
+		}
+	}
+
+	return errors.Join(errs...)
+}
+
 // ParseMetadata parses json metadata provided by the passed in reader,
 // returning an error if one is encountered.
 func ParseMetadata(r io.Reader) (Metadata, error) {
@@ -1906,6 +1923,13 @@ func (m *metadataV1) UnmarshalJSON(b []byte) error {
 		return err
 	}
 
+	if err := rejectV3OnlyFields(aux.FormatVersion,
+		v3FieldCheck{"next-row-id", aux.NextRowID != nil},
+		v3FieldCheck{"encryption-keys", len(aux.EncryptionKeyList) > 0},
+	); err != nil {
+		return err
+	}
+
 	// CurrentSchemaID was optional in v1, it can also be expressed via Schema.
 	if aux.CurrentSchemaID == -1 && aux.Schema != nil {
 		aux.CurrentSchemaID = aux.Schema.ID
@@ -1972,6 +1996,13 @@ func (m *metadataV2) UnmarshalJSON(b []byte) error {
 		return err
 	}
 
+	if err := rejectV3OnlyFields(aux.FormatVersion,
+		v3FieldCheck{"next-row-id", aux.NextRowID != nil},
+		v3FieldCheck{"encryption-keys", len(aux.EncryptionKeyList) > 0},
+	); err != nil {
+		return err
+	}
+
 	m.preValidate()
 
 	return m.validate()
diff --git a/table/metadata_internal_test.go b/table/metadata_internal_test.go
index 43e50f94..c1a4a405 100644
--- a/table/metadata_internal_test.go
+++ b/table/metadata_internal_test.go
@@ -1854,3 +1854,123 @@ func TestZstdGoldenFixture(t *testing.T) {
 
 	assert.True(t, expected.Equals(meta))
 }
+
+func TestRejectV3OnlyFields(t *testing.T) {
+	v1Base := `{
+		"format-version": 1,
+		"table-uuid": "d20125c8-7284-442c-9aea-15fee620737c",
+		"location": "s3://bucket/test/location",
+		"last-updated-ms": 1602638573874,
+		"last-column-id": 3,
+		"schemas": [{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"x","required":true,"type":"long"}]}],
+		"current-schema-id": 0,
+		"partition-specs": [{"spec-id": 0, "fields": []}],
+		"default-spec-id": 0,
+		"sort-orders": [{"order-id": 0, "fields": []}],
+		"default-sort-order-id": 0`
+
+	v2Base := `{
+		"format-version": 2,
+		"table-uuid": "d20125c8-7284-442c-9aea-15fee620737c",
+		"location": "s3://bucket/test/location",
+		"last-updated-ms": 1602638573874,
+		"last-column-id": 3,
+		"last-sequence-number": 0,
+		"schemas": [{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"x","required":true,"type":"long"}]}],
+		"current-schema-id": 0,
+		"partition-specs": [{"spec-id": 0, "fields": []}],
+		"default-spec-id": 0,
+		"last-partition-id": 1000,
+		"sort-orders": [{"order-id": 0, "fields": []}],
+		"default-sort-order-id": 0`
+
+	tests := []struct {
+		name      string
+		json      string
+		wantErr   bool
+		errSubstr string
+	}{
+		{
+			name:      "v1 rejects next-row-id",
+			json:      v1Base + `, "next-row-id": 42}`,
+			wantErr:   true,
+			errSubstr: "v3-only field 'next-row-id' present in v1 metadata",
+		},
+		{
+			name:      "v1 rejects encryption-keys",
+			json:      v1Base + `, "encryption-keys": [{"key-id": "k1", "encrypted-key-metadata": "abc123"}]}`,
+			wantErr:   true,
+			errSubstr: "v3-only field 'encryption-keys' present in v1 metadata",
+		},
+		{
+			name:    "v1 accepts empty encryption-keys",
+			json:    v1Base + `, "encryption-keys": []}`,
+			wantErr: false,
+		},
+		{
+			name:      "v2 rejects next-row-id",
+			json:      v2Base + `, "next-row-id": 42}`,
+			wantErr:   true,
+			errSubstr: "v3-only field 'next-row-id' present in v2 metadata",
+		},
+		{
+			name:      "v2 rejects encryption-keys",
+			json:      v2Base + `, "encryption-keys": [{"key-id": "k1", "encrypted-key-metadata": "abc123"}]}`,
+			wantErr:   true,
+			errSubstr: "v3-only field 'encryption-keys' present in v2 metadata",
+		},
+		{
+			name:    "v2 accepts empty encryption-keys",
+			json:    v2Base + `, "encryption-keys": []}`,
+			wantErr: false,
+		},
+		{
+			name:      "v2 rejects multiple v3 fields at once",
+			json:      v2Base + `, "next-row-id": 42, "encryption-keys": [{"key-id": "k1", "encrypted-key-metadata": "abc123"}]}`,
+			wantErr:   true,
+			errSubstr: "next-row-id",
+		},
+		{
+			name: "v3 accepts encryption-keys",
+			json: `{
+				"format-version": 3,
+				"table-uuid": "d20125c8-7284-442c-9aea-15fee620737c",
+				"location": "s3://bucket/test/location",
+				"last-updated-ms": 1602638573874,
+				"last-column-id": 3,
+				"last-sequence-number": 0,
+				"next-row-id": 1,
+				"schemas": [{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"x","required":true,"type":"long"}]}],
+				"current-schema-id": 0,
+				"partition-specs": [{"spec-id": 0, "fields": []}],
+				"default-spec-id": 0,
+				"last-partition-id": 1000,
+				"sort-orders": [{"order-id": 0, "fields": []}],
+				"default-sort-order-id": 0,
+				"encryption-keys": [{"key-id": "k1", "encrypted-key-metadata": "abc123"}]
+			}`,
+			wantErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := ParseMetadataBytes([]byte(tt.json))
+			if tt.wantErr {
+				require.ErrorIs(t, err, ErrInvalidMetadataFormatVersion)
+				assert.ErrorContains(t, err, tt.errSubstr)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+
+	// Verify multiple v3 fields are all reported in a single error.
+	t.Run("reports all rejected fields", func(t *testing.T) {
+		input := v2Base + `, "next-row-id": 42, "encryption-keys": [{"key-id": "k1", "encrypted-key-metadata": "abc123"}]}`
+		_, err := ParseMetadataBytes([]byte(input))
+		require.Error(t, err)
+		assert.ErrorContains(t, err, "next-row-id")
+		assert.ErrorContains(t, err, "encryption-keys")
+	})
+}