resolve conflicts and refine some parts

Author: wgtmac

src/iceberg/arrow/arrow_fs_file_io.cc

@@ -22,9 +22,9 @@
 #include <arrow/filesystem/localfs.h>
 #include <arrow/filesystem/mockfs.h>
 
-#include "iceberg/arrow/arrow_error_transform_internal.h"
 #include "iceberg/arrow/arrow_file_io.h"
 #include "iceberg/arrow/arrow_fs_file_io_internal.h"
+#include "iceberg/arrow/arrow_status_internal.h"
 
 namespace iceberg::arrow {
 

src/iceberg/arrow/arrow_error_transform_internal.h renamed to src/iceberg/arrow/arrow_status_internal.h

@@ -19,13 +19,13 @@
 
 #pragma once
 
-#define ICEBERG_NANOARROW_RETURN_IF_NOT_OK(status)                   \
+#define ICEBERG_NANOARROW_RETURN_UNEXPECTED(status)                  \
   if (status != NANOARROW_OK) [[unlikely]] {                         \
     return iceberg::InvalidArrowData("nanoarrow error: {}", status); \
   }
 
-#define ICEBERG_NANOARROW_RETURN_IF_NOT_OK_WITH_ERROR(status, error)       \
-  if (status != NANOARROW_OK) [[unlikely]] {                               \
-    return iceberg::InvalidArrowData("nanoarrow error: {} msg:{}", status, \
-                                     error.message);                       \
+#define ICEBERG_NANOARROW_RETURN_UNEXPECTED_WITH_ERROR(status, error)       \
+  if (status != NANOARROW_OK) [[unlikely]] {                                \
+    return iceberg::InvalidArrowData("nanoarrow error: {} msg: {}", status, \
+                                     error.message);                        \
   }

src/iceberg/arrow/nanoarrow_error_transform_internal.h renamed to src/iceberg/arrow/nanoarrow_status_internal.h

@@ -32,7 +32,7 @@
 #include <avro/NodeImpl.hh>
 #include <avro/Types.hh>
 
-#include "iceberg/arrow/arrow_error_transform_internal.h"
+#include "iceberg/arrow/arrow_status_internal.h"
 #include "iceberg/avro/avro_data_util_internal.h"
 #include "iceberg/avro/avro_schema_util_internal.h"
 #include "iceberg/schema.h"

src/iceberg/avro/avro_data_util.cc

@@ -31,8 +31,8 @@
 #include <avro/Generic.hh>
 #include <avro/GenericDatum.hh>
 
-#include "iceberg/arrow/arrow_error_transform_internal.h"
 #include "iceberg/arrow/arrow_fs_file_io_internal.h"
+#include "iceberg/arrow/arrow_status_internal.h"
 #include "iceberg/avro/avro_data_util_internal.h"
 #include "iceberg/avro/avro_register.h"
 #include "iceberg/avro/avro_schema_util_internal.h"

src/iceberg/avro/avro_reader.cc

@@ -29,8 +29,8 @@
 #include <avro/Generic.hh>
 #include <avro/GenericDatum.hh>
 
-#include "iceberg/arrow/arrow_error_transform_internal.h"
 #include "iceberg/arrow/arrow_fs_file_io_internal.h"
+#include "iceberg/arrow/arrow_status_internal.h"
 #include "iceberg/avro/avro_data_util_internal.h"
 #include "iceberg/avro/avro_register.h"
 #include "iceberg/avro/avro_schema_util_internal.h"

src/iceberg/avro/avro_writer.cc

@@ -65,6 +65,7 @@ class ICEBERG_EXPORT Writer {
   /// \brief Write arrow data to the file.
   ///
   /// \return Status of write results.
+  /// \note Ownership of the data is transferred to the writer.
   virtual Status Write(ArrowArray* data) = 0;
 
   /// \brief Get the file statistics.