fix

Author: HeartLinked

src/iceberg/json_internal.cc

@@ -533,7 +533,8 @@ Result<std::unique_ptr<PartitionField>> PartitionFieldFromJson(
 }
 
 Result<std::unique_ptr<PartitionSpec>> PartitionSpecFromJson(
-    const std::shared_ptr<Schema>& schema, const nlohmann::json& json) {
+    const std::shared_ptr<Schema>& schema, const nlohmann::json& json,
+    int32_t default_spec_id) {
   ICEBERG_ASSIGN_OR_RAISE(auto spec_id, GetJsonValue<int32_t>(json, kSpecId));
   ICEBERG_ASSIGN_OR_RAISE(auto fields, GetJsonValue<nlohmann::json>(json, kFields));
 
@@ -542,9 +543,16 @@ Result<std::unique_ptr<PartitionSpec>> PartitionSpecFromJson(
     ICEBERG_ASSIGN_OR_RAISE(auto partition_field, PartitionFieldFromJson(field_json));
     partition_fields.push_back(std::move(*partition_field));
   }
-  ICEBERG_ASSIGN_OR_RAISE(
-      auto spec, PartitionSpec::Make(*schema, spec_id, std::move(partition_fields),
-                                     true /*allow_missing_fields*/));
+
+  std::unique_ptr<PartitionSpec> spec;
+  if (default_spec_id == spec_id) {
+    ICEBERG_ASSIGN_OR_RAISE(
+        spec, PartitionSpec::Make(*schema, spec_id, std::move(partition_fields),
+                                  true /*allow_missing_fields*/));
+  } else {
+    ICEBERG_ASSIGN_OR_RAISE(spec,
+                            PartitionSpec::Make(spec_id, std::move(partition_fields)));
+  }
   return spec;
 }
 
@@ -886,8 +894,8 @@ Status ParsePartitionSpecs(const nlohmann::json& json, int8_t format_version,
     ICEBERG_ASSIGN_OR_RAISE(default_spec_id, GetJsonValue<int32_t>(json, kDefaultSpecId));
 
     for (const auto& spec_json : spec_array) {
-      ICEBERG_ASSIGN_OR_RAISE(auto spec,
-                              PartitionSpecFromJson(current_schema, spec_json));
+      ICEBERG_ASSIGN_OR_RAISE(
+          auto spec, PartitionSpecFromJson(current_schema, spec_json, default_spec_id));
       partition_specs.push_back(std::move(spec));
     }
   } else {

src/iceberg/json_internal.h

@@ -176,10 +176,12 @@ ICEBERG_EXPORT Result<std::string> ToJsonString(const PartitionSpec& partition_s
 ///
 /// \param schema The current schema.
 /// \param json The JSON object representing a `PartitionSpec`.
+/// \param default_spec_id The default spec ID from the table metadata.
 /// \return An `expected` value containing either a `PartitionSpec` object or an error. If
 /// the JSON is malformed or missing expected fields, an error will be returned.
 ICEBERG_EXPORT Result<std::unique_ptr<PartitionSpec>> PartitionSpecFromJson(
-    const std::shared_ptr<Schema>& schema, const nlohmann::json& json);
+    const std::shared_ptr<Schema>& schema, const nlohmann::json& json,
+    int32_t default_spec_id);
 
 /// \brief Serializes a `SnapshotRef` object to JSON.
 ///

src/iceberg/test/json_internal_test.cc

@@ -168,7 +168,7 @@ TEST(JsonInternalTest, PartitionSpec) {
 
   EXPECT_EQ(json, expected_json);
 
-  auto parsed_spec_result = PartitionSpecFromJson(schema, json);
+  auto parsed_spec_result = PartitionSpecFromJson(schema, json, 1);
   ASSERT_TRUE(parsed_spec_result.has_value()) << parsed_spec_result.error().message;
   EXPECT_EQ(*spec, *parsed_spec_result.value());
 }

src/iceberg/test/manifest_reader_writer_test.cc

@@ -186,10 +186,8 @@ TEST_F(ManifestV1Test, WritePartitionedTest) {
   auto identity_transform = Transform::Identity();
   std::vector<PartitionField> fields{
       PartitionField(1, 1000, "order_ts_hour", identity_transform)};
-  auto partition_spec_result = PartitionSpec::Make(1, fields);
-  ASSERT_TRUE(partition_spec_result.has_value());
-  auto partition_spec =
-      std::shared_ptr<PartitionSpec>(std::move(partition_spec_result.value()));
+  ICEBERG_UNWRAP_OR_FAIL(std::shared_ptr<PartitionSpec> partition_spec,
+                         PartitionSpec::Make(*table_schema, 1, fields, false));
 
   auto expected_entries = PreparePartitionedTestData();
   auto write_manifest_path = CreateNewTempFilePath();

src/iceberg/test/partition_spec_test.cc

@@ -138,7 +138,7 @@ TEST(PartitionSpecTest, PartitionTypeTest) {
       std::vector<SchemaField>{field1, field2, field3, field4, field5, field6},
       Schema::kInitialSchemaId);
 
-  auto parsed_spec_result = PartitionSpecFromJson(schema, json);
+  auto parsed_spec_result = PartitionSpecFromJson(schema, json, 1);
   ASSERT_TRUE(parsed_spec_result.has_value()) << parsed_spec_result.error().message;
 
   auto partition_type = parsed_spec_result.value()->PartitionType(*schema);