fix schema

Author: xiao.dong

src/iceberg/avro/avro_writer.cc

@@ -33,7 +33,6 @@
 #include "iceberg/avro/avro_schema_util_internal.h"
 #include "iceberg/avro/avro_stream_internal.h"
 #include "iceberg/schema.h"
-#include "iceberg/schema_internal.h"
 #include "iceberg/util/checked_cast.h"
 #include "iceberg/util/macros.h"
 
@@ -60,8 +59,7 @@ struct WriteContext {};
 class AvroWriter::Impl {
  public:
   Status Open(const WriterOptions& options) {
-    write_arrow_schema_ = options.schema;
-    ICEBERG_ASSIGN_OR_RAISE(write_schema_, FromArrowSchema(options.schema, std::nullopt));
+    write_schema_ = options.schema;
 
     auto root = std::make_shared<::avro::NodeRecord>();
     ToAvroNodeVisitor visitor;
@@ -103,7 +101,6 @@ class AvroWriter::Impl {
   Status InitWriteContext() { return {}; }
 
  private:
-  ArrowSchema write_arrow_schema_;
   // The schema to write.
   std::shared_ptr<::iceberg::Schema> write_schema_;
   // The avro schema to write.

src/iceberg/file_writer.h

@@ -29,6 +29,7 @@
 #include "iceberg/arrow_c_data.h"
 #include "iceberg/file_format.h"
 #include "iceberg/result.h"
+#include "iceberg/schema.h"
 #include "iceberg/type_fwd.h"
 
 namespace iceberg {
@@ -38,7 +39,7 @@ struct ICEBERG_EXPORT WriterOptions {
   /// \brief The path to the file to write.
   std::string path;
   /// \brief The schema of the data to write.
-  ArrowSchema schema;
+  std::shared_ptr<Schema> schema;
   /// \brief FileIO instance to open the file. Writer implementations should down cast it
   /// to the specific FileIO implementation. By default, the `iceberg-bundle` library uses
   /// `ArrowFileSystemFileIO` as the default implementation.

src/iceberg/manifest_writer.cc

@@ -37,6 +37,7 @@ Result<std::unique_ptr<ManifestWriter>> ManifestWriter::MakeWriter(
   ICEBERG_ASSIGN_OR_RAISE(
       auto writer, WriterFactoryRegistry::Open(FileFormatType::kAvro,
                                                {.path = std::string(manifest_location),
+                                                .schema = schema,
                                                 .io = std::move(file_io)}));
   return std::make_unique<ManifestWriterImpl>(std::move(writer), std::move(schema));
 }
@@ -49,6 +50,7 @@ Result<std::unique_ptr<ManifestListWriter>> ManifestListWriter::MakeWriter(
   ICEBERG_ASSIGN_OR_RAISE(auto writer, WriterFactoryRegistry::Open(
                                            FileFormatType::kAvro,
                                            {.path = std::string(manifest_list_location),
+                                            .schema = schema,
                                             .io = std::move(file_io)}));
   return std::make_unique<ManifestListWriterImpl>(std::move(writer), std::move(schema));
 }