add v1v2v3 metadata wrapper

xiao.dong · xiao.dong · commit 169cd86b469d · 2025-08-20T16:07:35.000+08:00
diff --git a/src/iceberg/manifest_writer.cc b/src/iceberg/manifest_writer.cc
@@ -28,8 +28,9 @@
 namespace iceberg {
 
 Result<std::unique_ptr<ManifestWriter>> ManifestWriter::MakeWriter(
-    int32_t format_version, int64_t first_row_id, std::string_view manifest_location,
-    std::shared_ptr<FileIO> file_io, std::shared_ptr<Schema> partition_schema) {
+    int32_t format_version, int64_t snapshot_id, int64_t first_row_id,
+    std::string_view manifest_location, std::shared_ptr<FileIO> file_io,
+    std::shared_ptr<Schema> partition_schema) {
   auto manifest_entry_schema = ManifestEntry::TypeFromPartitionType(partition_schema);
   auto fields_span = manifest_entry_schema->fields();
   std::vector<SchemaField> fields(fields_span.begin(), fields_span.end());
@@ -41,14 +42,14 @@ Result<std::unique_ptr<ManifestWriter>> ManifestWriter::MakeWriter(
                                                 .io = std::move(file_io)}));
   switch (format_version) {
     case 1:
-      return std::make_unique<ManifestWriterV1>(first_row_id, std::move(writer),
+      return std::make_unique<ManifestWriterV1>(snapshot_id, std::move(writer),
                                                 std::move(schema));
     case 2:
-      return std::make_unique<ManifestWriterV2>(first_row_id, std::move(writer),
+      return std::make_unique<ManifestWriterV2>(snapshot_id, std::move(writer),
                                                 std::move(schema));
     case 3:
-      return std::make_unique<ManifestWriterV3>(first_row_id, std::move(writer),
-                                                std::move(schema));
+      return std::make_unique<ManifestWriterV3>(snapshot_id, first_row_id,
+                                                std::move(writer), std::move(schema));
 
     default:
       return InvalidArgument("Unsupported manifest format version: {}", format_version);
@@ -70,12 +71,12 @@ Result<std::unique_ptr<ManifestListWriter>> ManifestListWriter::MakeWriter(
   switch (format_version) {
     case 1:
       return std::make_unique<ManifestListWriterV1>(snapshot_id, parent_snapshot_id,
-                                                    sequence_number, first_row_id,
+
                                                     std::move(writer), std::move(schema));
     case 2:
       return std::make_unique<ManifestListWriterV2>(snapshot_id, parent_snapshot_id,
-                                                    sequence_number, first_row_id,
-                                                    std::move(writer), std::move(schema));
+                                                    sequence_number, std::move(writer),
+                                                    std::move(schema));
     case 3:
       return std::make_unique<ManifestListWriterV3>(snapshot_id, parent_snapshot_id,
                                                     sequence_number, first_row_id,
diff --git a/src/iceberg/manifest_writer.h b/src/iceberg/manifest_writer.h
@@ -46,13 +46,15 @@ class ICEBERG_EXPORT ManifestWriter {
 
   /// \brief Creates a writer for a manifest file.
   /// \param format_version Format version of the manifest.
+  /// \param snapshot_id ID of the snapshot.
   /// \param first_row_id First row ID of the snapshot.
   /// \param manifest_location Path to the manifest file.
   /// \param file_io File IO implementation to use.
   /// \return A Result containing the writer or an error.
   static Result<std::unique_ptr<ManifestWriter>> MakeWriter(
-      int32_t format_version, int64_t first_row_id, std::string_view manifest_location,
-      std::shared_ptr<FileIO> file_io, std::shared_ptr<Schema> partition_schema);
+      int32_t format_version, int64_t snapshot_id, int64_t first_row_id,
+      std::string_view manifest_location, std::shared_ptr<FileIO> file_io,
+      std::shared_ptr<Schema> partition_schema);
 };
 
 /// \brief Write manifest files to a manifest list file.
diff --git a/src/iceberg/manifest_writer_internal.h b/src/iceberg/manifest_writer_internal.h
@@ -23,13 +23,16 @@
 /// Writer implementation for manifest list files and manifest files.
 
 #include "iceberg/manifest_writer.h"
+#include "iceberg/v1_metadata.h"
+#include "iceberg/v2_metadata.h"
+#include "iceberg/v3_metadata.h"
 
 namespace iceberg {
 
 /// \brief Write manifest entries to a manifest file.
 class ManifestWriterImpl : public ManifestWriter {
  public:
-  explicit ManifestWriterImpl(int64_t first_row_id, std::unique_ptr<Writer> writer,
+  explicit ManifestWriterImpl(int64_t snapshot_id, std::unique_ptr<Writer> writer,
                               std::shared_ptr<Schema> schema)
       : schema_(std::move(schema)), writer_(std::move(writer)) {}
 
@@ -41,44 +44,55 @@ class ManifestWriterImpl : public ManifestWriter {
 /// \brief Write v1 manifest entries to a manifest file.
 class ManifestWriterV1 : public ManifestWriterImpl {
  public:
-  explicit ManifestWriterV1(int64_t first_row_id, std::unique_ptr<Writer> writer,
+  explicit ManifestWriterV1(int64_t snapshot_id, std::unique_ptr<Writer> writer,
                             std::shared_ptr<Schema> schema)
-      : ManifestWriterImpl(first_row_id, std::move(writer), std::move(schema)) {}
+      : ManifestWriterImpl(snapshot_id, std::move(writer), std::move(schema)) {}
 
   Status WriteManifestEntry(const ManifestEntry& entry) const override;
 
   Status Close() override;
+
+ private:
+  V1MetaData::ManifestEntryWrapper wrapper_;
 };
 
 /// \brief Write v2 manifest entries to a manifest file.
 class ManifestWriterV2 : public ManifestWriterImpl {
  public:
-  explicit ManifestWriterV2(int64_t first_row_id, std::unique_ptr<Writer> writer,
+  explicit ManifestWriterV2(int64_t snapshot_id, std::unique_ptr<Writer> writer,
                             std::shared_ptr<Schema> schema)
-      : ManifestWriterImpl(first_row_id, std::move(writer), std::move(schema)) {}
+      : ManifestWriterImpl(snapshot_id, std::move(writer), std::move(schema)),
+        wrapper_(snapshot_id) {}
 
   Status WriteManifestEntry(const ManifestEntry& entry) const override;
 
   Status Close() override;
+
+ private:
+  V2MetaData::ManifestEntryWrapper wrapper_;
 };
 
 /// \brief Write v3 manifest entries to a manifest file.
 class ManifestWriterV3 : public ManifestWriterImpl {
  public:
-  explicit ManifestWriterV3(int64_t first_row_id, std::unique_ptr<Writer> writer,
+  explicit ManifestWriterV3(int64_t snapshot_id, int64_t first_row_id,
+                            std::unique_ptr<Writer> writer,
                             std::shared_ptr<Schema> schema)
-      : ManifestWriterImpl(first_row_id, std::move(writer), std::move(schema)) {}
+      : ManifestWriterImpl(snapshot_id, std::move(writer), std::move(schema)),
+        wrapper_(snapshot_id) {}
 
   Status WriteManifestEntry(const ManifestEntry& entry) const override;
 
   Status Close() override;
+
+ private:
+  V3MetaData::ManifestEntryWrapper wrapper_;
 };
 
 /// \brief Write manifest files to a manifest list file.
 class ManifestListWriterImpl : public ManifestListWriter {
  public:
   explicit ManifestListWriterImpl(int64_t snapshot_id, int64_t parent_snapshot_id,
-                                  int64_t sequence_number, int64_t first_row_id,
                                   std::unique_ptr<Writer> writer,
                                   std::shared_ptr<Schema> schema)
       : schema_(std::move(schema)), writer_(std::move(writer)) {}
@@ -92,30 +106,36 @@ class ManifestListWriterImpl : public ManifestListWriter {
 class ManifestListWriterV1 : public ManifestListWriterImpl {
  public:
   explicit ManifestListWriterV1(int64_t snapshot_id, int64_t parent_snapshot_id,
-                                int64_t sequence_number, int64_t first_row_id,
+
                                 std::unique_ptr<Writer> writer,
                                 std::shared_ptr<Schema> schema)
-      : ManifestListWriterImpl(snapshot_id, parent_snapshot_id, sequence_number,
-                               first_row_id, std::move(writer), std::move(schema)) {}
+      : ManifestListWriterImpl(snapshot_id, parent_snapshot_id, std::move(writer),
+                               std::move(schema)) {}
 
   Status WriteManifestFile(const ManifestFile& file) const override;
 
   Status Close() override;
+
+ private:
+  V1MetaData::ManifestFileWrapper wrapper_;
 };
 
 /// \brief Write v2 manifest files to a manifest list file.
 class ManifestListWriterV2 : public ManifestListWriterImpl {
  public:
   explicit ManifestListWriterV2(int64_t snapshot_id, int64_t parent_snapshot_id,
-                                int64_t sequence_number, int64_t first_row_id,
-                                std::unique_ptr<Writer> writer,
+                                int64_t sequence_number, std::unique_ptr<Writer> writer,
                                 std::shared_ptr<Schema> schema)
-      : ManifestListWriterImpl(snapshot_id, parent_snapshot_id, sequence_number,
-                               first_row_id, std::move(writer), std::move(schema)) {}
+      : ManifestListWriterImpl(snapshot_id, parent_snapshot_id, std::move(writer),
+                               std::move(schema)),
+        wrapper_(snapshot_id, sequence_number) {}
 
   Status WriteManifestFile(const ManifestFile& file) const override;
 
   Status Close() override;
+
+ private:
+  V2MetaData::ManifestFileWrapper wrapper_;
 };
 
 /// \brief Write v3 manifest files to a manifest list file.
@@ -125,12 +145,16 @@ class ManifestListWriterV3 : public ManifestListWriterImpl {
                                 int64_t sequence_number, int64_t first_row_id,
                                 std::unique_ptr<Writer> writer,
                                 std::shared_ptr<Schema> schema)
-      : ManifestListWriterImpl(snapshot_id, parent_snapshot_id, sequence_number,
-                               first_row_id, std::move(writer), std::move(schema)) {}
+      : ManifestListWriterImpl(snapshot_id, parent_snapshot_id, std::move(writer),
+                               std::move(schema)),
+        wrapper_(snapshot_id, sequence_number) {}
 
   Status WriteManifestFile(const ManifestFile& file) const override;
 
   Status Close() override;
+
+ private:
+  V3MetaData::ManifestFileWrapper wrapper_;
 };
 
 }  // namespace iceberg
diff --git a/src/iceberg/v1_metadata.h b/src/iceberg/v1_metadata.h
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#pragma once
+
+/// \file iceberg/v1_metadata.h
+
+#include "iceberg/manifest_entry.h"
+#include "iceberg/manifest_list.h"
+
+namespace iceberg {
+
+/// \brief v1 metadata wrapper.
+///
+/// Wrapper for v1 manifest list and manifest entry.
+class V1MetaData {
+ public:
+  /// \brief v1 manifest file wrapper.
+  struct ManifestFileWrapper : public ManifestFile {
+    explicit ManifestFileWrapper() {}
+
+    ManifestFile wrap(ManifestFile file, int64_t first_row_id) { return *this; }
+  };
+
+  /// \brief v1 manifest entry wrapper.
+  struct ManifestEntryWrapper : public ManifestEntry {
+    explicit ManifestEntryWrapper() {}
+
+    ManifestEntry wrap(ManifestEntry entry) { return *this; }
+  };
+
+  static ManifestFileWrapper manifestFileWrapper() { return ManifestFileWrapper(); }
+
+  static ManifestEntryWrapper manifestEntryWrapper() { return ManifestEntryWrapper(); }
+};
+
+}  // namespace iceberg
diff --git a/src/iceberg/v2_metadata.h b/src/iceberg/v2_metadata.h
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#pragma once
+
+/// \file iceberg/v2_metadata.h
+
+#include "iceberg/manifest_entry.h"
+#include "iceberg/manifest_list.h"
+
+namespace iceberg {
+
+/// \brief v2 metadata wrapper.
+///
+/// Wrapper for v2 manifest list and manifest entry.
+class V2MetaData {
+ public:
+  /// \brief v2 manifest file wrapper.
+  struct ManifestFileWrapper : public ManifestFile {
+    explicit ManifestFileWrapper(int64_t commit_snapshotId, int64_t sequence_number) {}
+
+    ManifestFile wrap(ManifestFile file, int64_t first_row_id) { return *this; }
+  };
+
+  /// \brief v2 manifest entry wrapper.
+  struct ManifestEntryWrapper : public ManifestEntry {
+    explicit ManifestEntryWrapper(int64_t commit_snapshot_id) {}
+
+    ManifestEntry wrap(ManifestEntry entry) { return *this; }
+  };
+
+  static ManifestFileWrapper manifestFileWrapper(int64_t commit_snapshotId,
+                                                 int64_t sequence_number) {
+    return ManifestFileWrapper(commit_snapshotId, sequence_number);
+  }
+
+  static ManifestEntryWrapper manifestEntryWrapper(int64_t commit_snapshot_id) {
+    return ManifestEntryWrapper(commit_snapshot_id);
+  }
+};
+
+}  // namespace iceberg
diff --git a/src/iceberg/v3_metadata.h b/src/iceberg/v3_metadata.h
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#pragma once
+
+/// \file iceberg/v3_metadata.h
+
+#include "iceberg/manifest_entry.h"
+#include "iceberg/manifest_list.h"
+
+namespace iceberg {
+
+/// \brief v3 metadata wrapper.
+///
+/// Wrapper for v3 manifest list and manifest entry.
+class V3MetaData {
+ public:
+  /// \brief v3 manifest file wrapper.
+  struct ManifestFileWrapper : public ManifestFile {
+    explicit ManifestFileWrapper(int64_t commit_snapshotId, int64_t sequence_number) {}
+
+    ManifestFile wrap(ManifestFile file, int64_t first_row_id) { return *this; }
+  };
+
+  /// \brief v3 manifest entry wrapper.
+  struct ManifestEntryWrapper : public ManifestEntry {
+    explicit ManifestEntryWrapper(int64_t commit_snapshot_id) {}
+
+    ManifestEntry wrap(ManifestEntry entry) { return *this; }
+  };
+
+  static ManifestFileWrapper manifestFileWrapper(int64_t commit_snapshotId,
+                                                 int64_t sequence_number) {
+    return ManifestFileWrapper(commit_snapshotId, sequence_number);
+  }
+
+  static ManifestEntryWrapper manifestEntryWrapper(int64_t commit_snapshot_id) {
+    return ManifestEntryWrapper(commit_snapshot_id);
+  }
+};
+
+}  // namespace iceberg
