fix confict and some bug

Author: HeartLinked

src/iceberg/partition_spec.cc

@@ -59,7 +59,7 @@ std::span<const PartitionField> PartitionSpec::fields() const { return fields_;
 
 Result<std::unique_ptr<StructType>> PartitionSpec::PartitionType(const Schema& schema) {
   if (fields_.empty()) {
-    return nullptr;
+    return std::make_unique<StructType>(std::vector<SchemaField>{});
   }
 
   std::vector<SchemaField> partition_fields;

src/iceberg/v1_metadata.cc

@@ -18,6 +18,7 @@
  */
 
 #include "iceberg/v1_metadata.h"
+
 #include <memory>
 
 #include "iceberg/json_internal.h"
@@ -31,8 +32,10 @@
 namespace iceberg {
 
 ManifestEntryAdapterV1::ManifestEntryAdapterV1(
-    std::optional<int64_t> snapshot_id, std::shared_ptr<PartitionSpec> partition_spec, std::shared_ptr<Schema> current_schema)
-    : ManifestEntryAdapter(std::move(partition_spec), std::move(current_schema), ManifestContent::kData),
+    std::optional<int64_t> snapshot_id, std::shared_ptr<PartitionSpec> partition_spec,
+    std::shared_ptr<Schema> current_schema)
+    : ManifestEntryAdapter(std::move(partition_spec), std::move(current_schema),
+                           ManifestContent::kData),
       snapshot_id_(snapshot_id) {}
 
 std::shared_ptr<Schema> ManifestEntryAdapterV1::EntrySchema(
@@ -74,16 +77,14 @@ std::shared_ptr<StructType> ManifestEntryAdapterV1::DataFileSchema(
 }
 
 Status ManifestEntryAdapterV1::Init() {
-  // TODO(gangwu): fix the schema to use current table schema.
-  // ICEBERG_ASSIGN_OR_RAISE(metadata_["schema"], ToJsonString(*manifest_schema_))
+  ICEBERG_ASSIGN_OR_RAISE(metadata_["schema"], ToJsonString(*current_schema_))
   ICEBERG_ASSIGN_OR_RAISE(metadata_["partition-spec"], ToJsonString(*partition_spec_));
   metadata_["partition-spec-id"] = std::to_string(partition_spec_->spec_id());
   metadata_["format-version"] = "1";
 
-  ICEBERG_ASSIGN_OR_RAISE(auto partition_type, partition_spec_->PartitionType());
-  if (!partition_type) {
-    partition_type = std::make_shared<StructType>(std::vector<SchemaField>{});
-  }
+  ICEBERG_ASSIGN_OR_RAISE(auto partition_type,
+                          partition_spec_->PartitionType(*current_schema_));
+
   manifest_schema_ = EntrySchema(std::move(partition_type));
   return ToArrowSchema(*manifest_schema_, &schema_);
 }

src/iceberg/v2_metadata.cc

@@ -30,8 +30,9 @@ namespace iceberg {
 
 ManifestEntryAdapterV2::ManifestEntryAdapterV2(
     std::optional<int64_t> snapshot_id, std::shared_ptr<PartitionSpec> partition_spec,
-    std::shared_ptr<Schema> current_schema,    ManifestContent content)
-    : ManifestEntryAdapter(std::move(partition_spec), std::move(current_schema), std::move(content)),
+    std::shared_ptr<Schema> current_schema, ManifestContent content)
+    : ManifestEntryAdapter(std::move(partition_spec), std::move(current_schema),
+                           std::move(content)),
       snapshot_id_(snapshot_id) {}
 
 std::shared_ptr<Schema> ManifestEntryAdapterV2::EntrySchema(
@@ -74,16 +75,14 @@ std::shared_ptr<StructType> ManifestEntryAdapterV2::DataFileType(
 }
 
 Status ManifestEntryAdapterV2::Init() {
-  // ICEBERG_ASSIGN_OR_RAISE(metadata_["schema"], ToJsonString(*manifest_schema_))
+  ICEBERG_ASSIGN_OR_RAISE(metadata_["schema"], ToJsonString(*current_schema_))
   ICEBERG_ASSIGN_OR_RAISE(metadata_["partition-spec"], ToJsonString(*partition_spec_));
   metadata_["partition-spec-id"] = std::to_string(partition_spec_->spec_id());
   metadata_["format-version"] = "2";
   metadata_["content"] = content_ == ManifestContent::kData ? "data" : "delete";
 
-  ICEBERG_ASSIGN_OR_RAISE(auto partition_type, partition_spec_->PartitionType());
-  if (!partition_type) {
-    partition_type = std::make_shared<StructType>(std::vector<SchemaField>{});
-  }
+  ICEBERG_ASSIGN_OR_RAISE(auto partition_type,
+                          partition_spec_->PartitionType(*current_schema_));
   manifest_schema_ = EntrySchema(std::move(partition_type));
   return ToArrowSchema(*manifest_schema_, &schema_);
 }

src/iceberg/v3_metadata.cc

@@ -18,6 +18,7 @@
  */
 
 #include "iceberg/v3_metadata.h"
+
 #include <memory>
 
 #include "iceberg/json_internal.h"
@@ -31,10 +32,12 @@ namespace iceberg {
 
 ManifestEntryAdapterV3::ManifestEntryAdapterV3(
     std::optional<int64_t> snapshot_id, std::optional<int64_t> first_row_id,
-    std::shared_ptr<PartitionSpec> partition_spec, std::shared_ptr<Schema> current_schema, ManifestContent content)
-    : ManifestEntryAdapter(std::move(partition_spec), std::move(current_schema),std::move(content)),
-    snapshot_id_(snapshot_id),
-    first_row_id_(first_row_id) {}
+    std::shared_ptr<PartitionSpec> partition_spec, std::shared_ptr<Schema> current_schema,
+    ManifestContent content)
+    : ManifestEntryAdapter(std::move(partition_spec), std::move(current_schema),
+                           std::move(content)),
+      snapshot_id_(snapshot_id),
+      first_row_id_(first_row_id) {}
 
 std::shared_ptr<Schema> ManifestEntryAdapterV3::EntrySchema(
     std::shared_ptr<StructType> partition_type) {
@@ -81,16 +84,14 @@ std::shared_ptr<StructType> ManifestEntryAdapterV3::DataFileType(
 }
 
 Status ManifestEntryAdapterV3::Init() {
-  // ICEBERG_ASSIGN_OR_RAISE(metadata_["schema"], ToJsonString(*manifest_schema_))
+  ICEBERG_ASSIGN_OR_RAISE(metadata_["schema"], ToJsonString(*current_schema_))
   ICEBERG_ASSIGN_OR_RAISE(metadata_["partition-spec"], ToJsonString(*partition_spec_));
   metadata_["partition-spec-id"] = std::to_string(partition_spec_->spec_id());
   metadata_["format-version"] = "3";
   metadata_["content"] = content_ == ManifestContent::kData ? "data" : "delete";
 
-  ICEBERG_ASSIGN_OR_RAISE(auto partition_type, partition_spec_->PartitionType());
-  if (!partition_type) {
-    partition_type = std::make_shared<StructType>(std::vector<SchemaField>{});
-  }
+  ICEBERG_ASSIGN_OR_RAISE(auto partition_type,
+                          partition_spec_->PartitionType(*current_schema_));
   manifest_schema_ = EntrySchema(std::move(partition_type));
   return ToArrowSchema(*manifest_schema_, &schema_);
 }