add inline to the macro

Signed-off-by: Junwang Zhao <[email protected]>

Author: zhjwpku

src/iceberg/json_internal.cc

@@ -27,8 +27,6 @@
 #include <type_traits>
 #include <unordered_set>
 
-#include <iceberg/table.h>
-#include <iceberg/util/timepoint.h>
 #include <nlohmann/json.hpp>
 
 #include "iceberg/partition_field.h"
@@ -39,11 +37,13 @@
 #include "iceberg/snapshot.h"
 #include "iceberg/sort_order.h"
 #include "iceberg/statistics_file.h"
+#include "iceberg/table.h"
 #include "iceberg/table_metadata.h"
 #include "iceberg/transform.h"
 #include "iceberg/type.h"
 #include "iceberg/util/formatter.h"  // IWYU pragma: keep
 #include "iceberg/util/macros.h"
+#include "iceberg/util/timepoint.h"
 
 namespace iceberg {
 

src/iceberg/result.h

@@ -65,7 +65,7 @@ using Status = Result<void>;
 /// \brief Macro to define error creation functions
 #define DEFINE_ERROR_FUNCTION(name)                                           \
   template <typename... Args>                                                 \
-  auto name(const std::format_string<Args...> fmt, Args&&... args)            \
+  inline auto name(const std::format_string<Args...> fmt, Args&&... args)     \
       -> unexpected<Error> {                                                  \
     return unexpected<Error>(                                                 \
         {ErrorKind::k##name, std::format(fmt, std::forward<Args>(args)...)}); \
@@ -80,6 +80,7 @@ DEFINE_ERROR_FUNCTION(IOError)
 DEFINE_ERROR_FUNCTION(JsonParseError)
 DEFINE_ERROR_FUNCTION(NoSuchNamespace)
 DEFINE_ERROR_FUNCTION(NoSuchTable)
+DEFINE_ERROR_FUNCTION(NotFound)
 DEFINE_ERROR_FUNCTION(NotImplemented)
 DEFINE_ERROR_FUNCTION(NotSupported)
 DEFINE_ERROR_FUNCTION(UnknownError)

src/iceberg/table_metadata.cc

@@ -23,8 +23,8 @@
 #include <ranges>
 #include <string>
 
-#include "iceberg/expected.h"
 #include "iceberg/partition_spec.h"
+#include "iceberg/result.h"
 #include "iceberg/schema.h"
 #include "iceberg/sort_order.h"
 namespace iceberg {
@@ -44,10 +44,7 @@ Result<std::shared_ptr<Schema>> TableMetadata::Schema() const {
     return schema->schema_id() == current_schema_id;
   });
   if (iter == schemas.end()) {
-    return unexpected<Error>({
-        .kind = ErrorKind::kNotFound,
-        .message = std::format("Current schema is not found"),
-    });
+    return NotFound("Current schema is not found");
   }
   return *iter;
 }
@@ -57,10 +54,7 @@ Result<std::shared_ptr<PartitionSpec>> TableMetadata::PartitionSpec() const {
     return spec->spec_id() == default_spec_id;
   });
   if (iter == partition_specs.end()) {
-    return unexpected<Error>({
-        .kind = ErrorKind::kNotFound,
-        .message = std::format("Default partition spec is not found"),
-    });
+    return NotFound("Default partition spec is not found");
   }
   return *iter;
 }
@@ -70,10 +64,7 @@ Result<std::shared_ptr<SortOrder>> TableMetadata::SortOrder() const {
     return order->order_id() == default_sort_order_id;
   });
   if (iter == sort_orders.end()) {
-    return unexpected<Error>({
-        .kind = ErrorKind::kNotFound,
-        .message = std::format("Default sort order is not found"),
-    });
+    return NotFound("Default sort order is not found");
   }
   return *iter;
 }

test/metadata_serde_test.cc

@@ -166,22 +166,23 @@ TEST_F(MetadataSerdeTest, DeserializeV2Valid) {
   EXPECT_EQ(metadata->current_snapshot_id, 3055729675574597004);
 
   // Compare snapshots
-  std::vector<Snapshot> expected_snapshots{{
-                                               .snapshot_id = 3051729675574597004,
-                                               .sequence_number = 0,
-                                               .timestamp_ms = 1515100955770,
-                                               .manifest_list = "s3://a/b/1.avro",
-                                               .summary = {{"operation", "append"}},
-                                           },
-                                           {
-                                               .snapshot_id = 3055729675574597004,
-                                               .parent_snapshot_id = 3051729675574597004,
-                                               .sequence_number = 1,
-                                               .timestamp_ms = 1555100955770,
-                                               .manifest_list = "s3://a/b/2.avro",
-                                               .summary = {{"operation", "append"}},
-                                               .schema_id = 1,
-                                           }};
+  std::vector<Snapshot> expected_snapshots{
+      {
+          .snapshot_id = 3051729675574597004,
+          .sequence_number = 0,
+          .timestamp_ms = TimePointMsFromUnixMs(1515100955770).value(),
+          .manifest_list = "s3://a/b/1.avro",
+          .summary = {{"operation", "append"}},
+      },
+      {
+          .snapshot_id = 3055729675574597004,
+          .parent_snapshot_id = 3051729675574597004,
+          .sequence_number = 1,
+          .timestamp_ms = TimePointMsFromUnixMs(1555100955770).value(),
+          .manifest_list = "s3://a/b/2.avro",
+          .summary = {{"operation", "append"}},
+          .schema_id = 1,
+      }};
   EXPECT_EQ(metadata->snapshots.size(), expected_snapshots.size());
   for (size_t i = 0; i < expected_snapshots.size(); ++i) {
     EXPECT_EQ(*metadata->snapshots[i], expected_snapshots[i]);