badalprasadsingh commented on code in PR #2438:
URL: https://github.com/apache/iceberg-go/pull/2438#discussion_r4527533110
##########
schema.go:
##########
@@ -660,11 +704,14 @@ func (s *Schema) Select(caseSensitive bool, names
...string) (*Schema, error) {
}
for _, n := range names {
- id, ok := nameMap[strings.ToLower(n)]
+ entry, ok := nameMap[strings.ToLower(n)]
if !ok {
return nil, fmt.Errorf("%w: could not find
column %s", ErrInvalidSchema, n)
}
- ids[id] = void
+ if err := entry.ambiguityError(); err != nil {
+ return nil, err
+ }
Review Comment:
no test covers this check in Select. Without it, a case-insensitive
Select("id") on ID and id quietly returns ID
better: add that case to `TestLazyNameToIDLowerRejectsOnlyAmbiguousNames,`
expecting `ErrInvalidSchema`.
##########
schema.go:
##########
@@ -243,9 +260,25 @@ func (s *Schema) lazyNameToIDLower() (map[string]int,
error) {
return nil, err
}
- out := make(map[string]int)
- for k, v := range idx {
- out[strings.ToLower(k)] = v
+ names := make([]string, 0, len(idx))
+ for name := range idx {
+ names = append(names, name)
+ }
+ slices.Sort(names)
+
+ out := make(map[string]caseInsensitiveNameEntry, len(idx))
+ for _, name := range names {
+ id := idx[name]
+ lower := strings.ToLower(name)
+ if previous, exists := out[lower]; exists {
+ if previous.id != id && previous.conflictingName == "" {
+ previous.conflictingName = name
+ out[lower] = previous
+ }
+ continue
Review Comment:
fix the lint here
##########
table/replace_sort_order_builder_regression_test.go:
##########
@@ -0,0 +1,212 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package table_test
+
+import (
+ "encoding/json"
+ "testing"
+
+ "github.com/apache/iceberg-go"
+ "github.com/apache/iceberg-go/table"
+ "github.com/stretchr/testify/require"
+)
+
+func TestReplaceSortOrderBuilderDistinctFieldDefinitions(t *testing.T) {
+ cases := []struct {
+ name string
+ build func(*table.Transaction) *table.ReplaceSortOrderBuilder
+ }{
+ {"id ascending, nulls first", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).Asc("id",
table.NullsFirst)
+ }},
+ {"change only null order", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).Asc("id",
table.NullsLast)
+ }},
+ {"change only direction", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).Desc("id",
table.NullsLast)
+ }},
+ {"two fields", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).Asc("id",
table.NullsFirst).Desc("name", table.NullsLast)
+ }},
+ {"reverse field priority", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).Desc("name",
table.NullsLast).Asc("id", table.NullsFirst)
+ }},
+ {"bucket eight", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).AddField("id",
iceberg.BucketTransform{NumBuckets: 8}, table.SortASC, table.NullsFirst)
+ }},
+ {"bucket sixteen", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).AddField("id",
iceberg.BucketTransform{NumBuckets: 16}, table.SortASC, table.NullsFirst)
+ }},
+ {"year transform", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).AddField("ts",
iceberg.YearTransform{}, table.SortASC, table.NullsFirst)
+ }},
+ {"month transform", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).AddField("ts",
iceberg.MonthTransform{}, table.SortASC, table.NullsFirst)
+ }},
+ }
+
+ txn := testNonPartitionedTable.NewTransaction()
+ for i, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ builder := tc.build(txn)
+ preview, err := builder.Apply()
+ require.NoError(t, err)
+ require.Equal(t, i+1, preview.OrderID(), "changing a
sort-field property must assign a new ID")
+ require.NoError(t, builder.Commit())
+
+ staged, err := txn.StagedTable()
+ require.NoError(t, err)
+ require.True(t, preview.Equals(staged.SortOrder()))
+ require.Len(t, staged.Metadata().SortOrders(), i+2)
+ })
+ }
+
+ // Even after multiple new orders, reusing an older transformed order
+ // must reference its concrete ID instead of the latest add (-1).
+ oldOrder := cases[5].build(txn)
+ preview, err := oldOrder.Apply()
+ require.NoError(t, err)
+ require.Equal(t, 6, preview.OrderID())
+ require.NoError(t, oldOrder.Commit())
+
+ commit, err := txn.TableCommit()
+ require.NoError(t, err)
+ last, err := json.Marshal(commit.Updates[len(commit.Updates)-1])
+ require.NoError(t, err)
+ require.JSONEq(t,
`{"action":"set-default-sort-order","sort-order-id":6}`, string(last))
+
+ replay, err :=
table.MetadataBuilderFromBase(testNonPartitionedTable.Metadata(), "")
+ require.NoError(t, err)
+ for _, update := range commit.Updates {
+ require.NoError(t, update.Apply(replay))
+ }
+ replayed, err := replay.Build()
+ require.NoError(t, err)
+ require.Equal(t, 6, replayed.DefaultSortOrder())
+ require.Len(t, replayed.SortOrders(), len(cases)+1)
+}
+
+func TestReplaceSortOrderBuilderInvalidLaterFieldPreservesStagedOrder(t
*testing.T) {
+ txn := testNonPartitionedTable.NewTransaction()
+ require.NoError(t, txn.NewReplaceSortOrder(true).Asc("id",
table.NullsFirst).Commit())
+ before, err := txn.TableCommit()
+ require.NoError(t, err)
+ beforeWire, err := json.Marshal(before.Updates)
+ require.NoError(t, err)
+
+ cases := []struct {
+ name string
+ build func(*table.Transaction)
*table.ReplaceSortOrderBuilder
+ wantError string
+ }{
+ {"missing second column", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).Asc("name",
table.NullsFirst).Asc("missing", table.NullsLast)
+ }, "cannot bind sort field"},
+ {"invalid second transform", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).Asc("name",
table.NullsFirst).
+ AddField("name", iceberg.YearTransform{},
table.SortASC, table.NullsLast)
+ }, "invalid source type"},
+ {"nil second transform", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).Asc("name",
table.NullsFirst).
+ AddField("id", nil, table.SortASC,
table.NullsFirst)
+ }, "has no transform"},
+ {"invalid second direction", func(txn *table.Transaction)
*table.ReplaceSortOrderBuilder {
+ return txn.NewReplaceSortOrder(true).Asc("name",
table.NullsFirst).
+ AddField("id", iceberg.IdentityTransform{},
"sideways", table.NullsFirst)
+ }, "invalid sort direction"},
+ }
+
+ for _, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ builder := tc.build(txn)
+ _, err := builder.Apply()
+ require.ErrorContains(t, err, tc.wantError)
+ require.ErrorContains(t, builder.Commit(), tc.wantError)
+
+ after, err := txn.TableCommit()
+ require.NoError(t, err)
+ afterWire, err := json.Marshal(after.Updates)
+ require.NoError(t, err)
+ require.JSONEq(t, string(beforeWire), string(afterWire))
+ require.Len(t, after.Requirements,
len(before.Requirements))
+
+ staged, err := txn.StagedTable()
+ require.NoError(t, err)
+ require.Equal(t, 1,
staged.Metadata().DefaultSortOrder())
+ require.Len(t, staged.Metadata().SortOrders(), 2)
+ })
+ }
+}
+
+func TestReplaceSortOrderBuilderNestedCaseCollisionsAreScoped(t *testing.T) {
+ schema := iceberg.NewSchema(0,
+ iceberg.NestedField{ID: 1, Name: "payload", Type:
&iceberg.StructType{FieldList: []iceberg.NestedField{
+ {ID: 2, Name: "ID", Type: iceberg.PrimitiveTypes.Int64},
+ {ID: 3, Name: "id", Type: iceberg.PrimitiveTypes.Int64},
+ {ID: 4, Name: "other", Type:
iceberg.PrimitiveTypes.Int64},
+ }}},
+ iceberg.NestedField{ID: 5, Name: "sibling", Type:
&iceberg.StructType{FieldList: []iceberg.NestedField{
+ {ID: 6, Name: "id", Type: iceberg.PrimitiveTypes.Int64},
+ }}},
+ iceberg.NestedField{ID: 7, Name: "unique", Type:
iceberg.PrimitiveTypes.Int64},
+ )
+ meta, err := table.NewMetadata(schema, iceberg.UnpartitionedSpec,
table.UnsortedSortOrder,
+ "file:///tmp/nested-sort-collisions", nil)
+ require.NoError(t, err)
+ tbl := table.New([]string{"nested-sort-collisions"}, meta, "", nil, nil)
+
+ for _, name := range []string{"payload.ID", "payload.id", "PAYLOAD.Id"}
{
+ t.Run("ambiguous "+name, func(t *testing.T) {
+ txn := tbl.NewTransaction()
+ builder := txn.NewReplaceSortOrder(false).Asc(name,
table.NullsFirst)
+ _, err := builder.Apply()
+ require.ErrorIs(t, err, iceberg.ErrInvalidSchema)
+ require.ErrorContains(t, err, `"payload.ID" and
"payload.id"`)
+ require.ErrorIs(t, builder.Commit(),
iceberg.ErrInvalidSchema)
+
+ commit, err := txn.TableCommit()
+ require.NoError(t, err)
+ require.Empty(t, commit.Updates)
+ })
+ }
+
+ for _, tc := range []struct {
+ name string
+ caseSensitive bool
+ sourceID int
+ }{
+ {"payload.ID", true, 2},
+ {"payload.id", true, 3},
+ {"PAYLOAD.OTHER", false, 4},
+ {"SIBLING.ID", false, 6},
+ {"UnIqUe", false, 7},
Review Comment:
this fails on every run: NewMetadata renumbers field IDs top-level first, so
payload.ID becomes 4, not 2.
better: read each expected ID from `tbl.Schema().FindFieldByName`, or
declare the IDs in that order.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
