@@ -721,22 +721,22 @@ def _initial_changes(self, table_metadata: TableMetadata) -> None:
721
721
722
722
schema : Schema = table_metadata .schema ()
723
723
self ._updates += (
724
- AddSchemaUpdate (schema_ = schema , last_column_id = schema .highest_field_id , initial_change = True ),
724
+ AddSchemaUpdate (schema_ = schema , last_column_id = schema .highest_field_id ),
725
725
SetCurrentSchemaUpdate (schema_id = - 1 ),
726
726
)
727
727
728
728
spec : PartitionSpec = table_metadata .spec ()
729
729
if spec .is_unpartitioned ():
730
- self ._updates += (AddPartitionSpecUpdate (spec = UNPARTITIONED_PARTITION_SPEC , initial_change = True ),)
730
+ self ._updates += (AddPartitionSpecUpdate (spec = UNPARTITIONED_PARTITION_SPEC ),)
731
731
else :
732
- self ._updates += (AddPartitionSpecUpdate (spec = spec , initial_change = True ),)
732
+ self ._updates += (AddPartitionSpecUpdate (spec = spec ),)
733
733
self ._updates += (SetDefaultSpecUpdate (spec_id = - 1 ),)
734
734
735
735
sort_order : Optional [SortOrder ] = table_metadata .sort_order_by_id (table_metadata .default_sort_order_id )
736
736
if sort_order is None or sort_order .is_unsorted :
737
- self ._updates += (AddSortOrderUpdate (sort_order = UNSORTED_SORT_ORDER , initial_change = True ),)
737
+ self ._updates += (AddSortOrderUpdate (sort_order = UNSORTED_SORT_ORDER ),)
738
738
else :
739
- self ._updates += (AddSortOrderUpdate (sort_order = sort_order , initial_change = True ),)
739
+ self ._updates += (AddSortOrderUpdate (sort_order = sort_order ),)
740
740
self ._updates += (SetDefaultSortOrderUpdate (sort_order_id = - 1 ),)
741
741
742
742
self ._updates += (
@@ -779,8 +779,6 @@ class AddSchemaUpdate(IcebergBaseModel):
779
779
# This field is required: https://github.com/apache/iceberg/pull/7445
780
780
last_column_id : int = Field (alias = "last-column-id" )
781
781
782
- initial_change : bool = Field (default = False , exclude = True )
783
-
784
782
785
783
class SetCurrentSchemaUpdate (IcebergBaseModel ):
786
784
action : Literal ["set-current-schema" ] = Field (default = "set-current-schema" )
@@ -793,8 +791,6 @@ class AddPartitionSpecUpdate(IcebergBaseModel):
793
791
action : Literal ["add-spec" ] = Field (default = "add-spec" )
794
792
spec : PartitionSpec
795
793
796
- initial_change : bool = Field (default = False , exclude = True )
797
-
798
794
799
795
class SetDefaultSpecUpdate (IcebergBaseModel ):
800
796
action : Literal ["set-default-spec" ] = Field (default = "set-default-spec" )
@@ -807,8 +803,6 @@ class AddSortOrderUpdate(IcebergBaseModel):
807
803
action : Literal ["add-sort-order" ] = Field (default = "add-sort-order" )
808
804
sort_order : SortOrder = Field (alias = "sort-order" )
809
805
810
- initial_change : bool = Field (default = False , exclude = True )
811
-
812
806
813
807
class SetDefaultSortOrderUpdate (IcebergBaseModel ):
814
808
action : Literal ["set-default-sort-order" ] = Field (default = "set-default-sort-order" )
@@ -992,7 +986,7 @@ def _(update: AddSchemaUpdate, base_metadata: TableMetadata, context: _TableMeta
992
986
993
987
metadata_updates : Dict [str , Any ] = {
994
988
"last_column_id" : update .last_column_id ,
995
- "schemas" : [ update . schema_ ] if update . initial_change else base_metadata .schemas + [update .schema_ ],
989
+ "schemas" : base_metadata .schemas + [update .schema_ ],
996
990
}
997
991
998
992
context .add_update (update )
@@ -1022,11 +1016,11 @@ def _(update: SetCurrentSchemaUpdate, base_metadata: TableMetadata, context: _Ta
1022
1016
@_apply_table_update .register (AddPartitionSpecUpdate )
1023
1017
def _ (update : AddPartitionSpecUpdate , base_metadata : TableMetadata , context : _TableMetadataUpdateContext ) -> TableMetadata :
1024
1018
for spec in base_metadata .partition_specs :
1025
- if spec .spec_id == update .spec .spec_id and not update . initial_change :
1019
+ if spec .spec_id == update .spec .spec_id :
1026
1020
raise ValueError (f"Partition spec with id { spec .spec_id } already exists: { spec } " )
1027
1021
1028
1022
metadata_updates : Dict [str , Any ] = {
1029
- "partition_specs" : [ update . spec ] if update . initial_change else base_metadata .partition_specs + [update .spec ],
1023
+ "partition_specs" : base_metadata .partition_specs + [update .spec ],
1030
1024
"last_partition_id" : max (
1031
1025
max ([field .field_id for field in update .spec .fields ], default = 0 ),
1032
1026
base_metadata .last_partition_id or PARTITION_FIELD_ID_START - 1 ,
@@ -1134,7 +1128,7 @@ def _(update: AddSortOrderUpdate, base_metadata: TableMetadata, context: _TableM
1134
1128
context .add_update (update )
1135
1129
return base_metadata .model_copy (
1136
1130
update = {
1137
- "sort_orders" : [ update . sort_order ] if update . initial_change else base_metadata .sort_orders + [update .sort_order ],
1131
+ "sort_orders" : base_metadata .sort_orders + [update .sort_order ],
1138
1132
}
1139
1133
)
1140
1134
0 commit comments