Skip to content

Commit db796cb

Browse files
manuzhangcodex
andauthored
fix: preserve partition types after source columns are dropped (#999)
Co-authored-by: Codex <codex@openai.com>
1 parent f799dcb commit db796cb

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

‎src/iceberg/partition_spec.cc‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,9 @@ Result<std::unique_ptr<StructType>> PartitionSpec::PartitionType(
8282
for (const auto& partition_field : fields_) {
8383
ICEBERG_ASSIGN_OR_RAISE(auto source_field,
8484
schema.FindFieldById(partition_field.source_id()));
85-
std::shared_ptr<Type> result_type;
86-
if (source_field.has_value()) {
87-
auto source_field_type = source_field.value().get().type();
88-
result_type = partition_field.transform()->ResultType(std::move(source_field_type));
89-
} else {
90-
result_type = unknown();
91-
}
85+
// Fixed-result transforms retain their type after the source column is dropped.
86+
auto source_type = source_field.has_value() ? source_field->get().type() : unknown();
87+
auto result_type = partition_field.transform()->ResultType(source_type);
9288

9389
partition_fields.emplace_back(partition_field.field_id(),
9490
std::string(partition_field.name()),

‎src/iceberg/test/partition_spec_test.cc‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,17 +171,23 @@ TEST(PartitionSpecTest, PartitionTypeMissingSource) {
171171
PartitionSpec::Make(
172172
1, {PartitionField(1, 1000, "dropped_identity", Transform::Identity()),
173173
PartitionField(3, 1001, "dropped_bucket", Transform::Bucket(16)),
174-
PartitionField(2, 1002, "ts_day", Transform::Day())}));
174+
PartitionField(2, 1002, "ts_day", Transform::Day()),
175+
PartitionField(4, 1003, "dropped_day", Transform::Day()),
176+
PartitionField(4, 1004, "dropped_year", Transform::Year())}));
175177

176178
ICEBERG_UNWRAP_OR_FAIL(auto partition_type, spec->PartitionType(schema));
177179

178-
ASSERT_EQ(partition_type->fields().size(), 3U);
180+
ASSERT_EQ(partition_type->fields().size(), 5U);
179181
EXPECT_EQ(partition_type->fields()[0],
180182
SchemaField::MakeOptional(1000, "dropped_identity", unknown()));
181183
EXPECT_EQ(partition_type->fields()[1],
182-
SchemaField::MakeOptional(1001, "dropped_bucket", unknown()));
184+
SchemaField::MakeOptional(1001, "dropped_bucket", int32()));
183185
EXPECT_EQ(partition_type->fields()[2],
184186
SchemaField::MakeOptional(1002, "ts_day", date()));
187+
EXPECT_EQ(partition_type->fields()[3],
188+
SchemaField::MakeOptional(1003, "dropped_day", date()));
189+
EXPECT_EQ(partition_type->fields()[4],
190+
SchemaField::MakeOptional(1004, "dropped_year", int32()));
185191
}
186192

187193
TEST(PartitionSpecTest, RawPartitionTypeNoReassign) {

0 commit comments

Comments
 (0)