refactor: add a manifest dir to hold all manifest related files

src/iceberg/CMakeLists.txt

@@ -33,12 +33,15 @@ set(ICEBERG_SOURCES
     file_writer.cc
     inheritable_metadata.cc
     json_internal.cc
-    manifest_adapter.cc
-    manifest_entry.cc
-    manifest_list.cc
-    manifest_reader.cc
-    manifest_reader_internal.cc
-    manifest_writer.cc
+    manifest/manifest_adapter.cc
+    manifest/manifest_entry.cc
+    manifest/manifest_list.cc
+    manifest/manifest_reader.cc
+    manifest/manifest_reader_internal.cc
+    manifest/manifest_writer.cc
+    manifest/v1_metadata.cc
+    manifest/v2_metadata.cc
+    manifest/v3_metadata.cc
     metadata_columns.cc
     name_mapping.cc
     partition_field.cc
@@ -74,10 +77,7 @@ set(ICEBERG_SOURCES
     util/temporal_util.cc
     util/timepoint.cc
     util/truncate_util.cc
-    util/uuid.cc
-    v1_metadata.cc
-    v2_metadata.cc
-    v3_metadata.cc)
+    util/uuid.cc)
 
 set(ICEBERG_STATIC_BUILD_INTERFACE_LIBS)
 set(ICEBERG_SHARED_BUILD_INTERFACE_LIBS)
@@ -131,6 +131,7 @@ iceberg_install_all_headers(iceberg)
 
 add_subdirectory(catalog)
 add_subdirectory(expression)
+add_subdirectory(manifest)
 add_subdirectory(row)
 add_subdirectory(util)
 

src/iceberg/inheritable_metadata.cc

@@ -23,8 +23,8 @@
 
 #include <iceberg/result.h>
 
-#include "iceberg/manifest_entry.h"
-#include "iceberg/manifest_list.h"
+#include "iceberg/manifest/manifest_entry.h"
+#include "iceberg/manifest/manifest_list.h"
 #include "iceberg/snapshot.h"
 
 namespace iceberg {

src/iceberg/manifest/CMakeLists.txt

@@ -0,0 +1,18 @@
+# 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.
+
+iceberg_install_all_headers(iceberg/manifest)

src/iceberg/manifest_adapter.cc → src/iceberg/manifest/manifest_adapter.cc

@@ -17,16 +17,15 @@
  * under the License.
  */
 
-#include "iceberg/manifest_adapter.h"
-
 #include <memory>
 #include <utility>
 
 #include <nanoarrow/nanoarrow.h>
 
 #include "iceberg/arrow/nanoarrow_status_internal.h"
-#include "iceberg/manifest_entry.h"
-#include "iceberg/manifest_list.h"
+#include "iceberg/manifest/manifest_adapter_internal.h"
+#include "iceberg/manifest/manifest_entry.h"
+#include "iceberg/manifest/manifest_list.h"
 #include "iceberg/result.h"
 #include "iceberg/schema.h"
 #include "iceberg/util/checked_cast.h"

src/iceberg/manifest_adapter.h → src/iceberg/manifest/manifest_adapter_internal.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-/// \file iceberg/manifest_adapter.h
+/// \file iceberg/manifest/manifest_adapter_internal.h
 /// Base class for adapters handling v1/v2/v3/v4 manifest metadata.
 
 #include <memory>

src/iceberg/manifest_entry.cc → src/iceberg/manifest/manifest_entry.cc

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "iceberg/manifest_entry.h"
+#include "iceberg/manifest/manifest_entry.h"
 
 #include <memory>
 #include <vector>

src/iceberg/manifest_entry.h → src/iceberg/manifest/manifest_entry.h

@@ -19,6 +19,8 @@
 
 #pragma once
 
+/// \file iceberg/manifest/manifest_entry.h
+
 #include <cstdint>
 #include <map>
 #include <memory>

src/iceberg/manifest_list.cc → src/iceberg/manifest/manifest_list.cc

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "iceberg/manifest_list.h"
+#include "iceberg/manifest/manifest_list.h"
 
 #include "iceberg/schema.h"
 

src/iceberg/manifest_list.h → src/iceberg/manifest/manifest_list.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-/// \file iceberg/manifest_list.h
+/// \file iceberg/manifest/manifest_list.h
 
 #include <cstdint>
 #include <optional>

src/iceberg/manifest_reader.cc → src/iceberg/manifest/manifest_reader.cc

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-#include "iceberg/manifest_reader.h"
+#include "iceberg/manifest/manifest_reader.h"
 
-#include "iceberg/manifest_entry.h"
-#include "iceberg/manifest_list.h"
-#include "iceberg/manifest_reader_internal.h"
+#include "iceberg/manifest/manifest_entry.h"
+#include "iceberg/manifest/manifest_list.h"
+#include "iceberg/manifest/manifest_reader_internal.h"
 #include "iceberg/schema.h"
 #include "iceberg/schema_internal.h"
 #include "iceberg/type.h"

src/iceberg/manifest_reader.h → src/iceberg/manifest/manifest_reader.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-/// \file iceberg/manifest_reader.h
+/// \file iceberg/manifest/manifest_reader.h
 /// Data reader interface for manifest files.
 
 #include <memory>

src/iceberg/manifest_reader_internal.cc → src/iceberg/manifest/manifest_reader_internal.cc

@@ -24,8 +24,8 @@
 #include "iceberg/arrow/nanoarrow_status_internal.h"
 #include "iceberg/arrow_c_data_guard_internal.h"
 #include "iceberg/file_format.h"
-#include "iceberg/manifest_entry.h"
-#include "iceberg/manifest_list.h"
+#include "iceberg/manifest/manifest_entry.h"
+#include "iceberg/manifest/manifest_list.h"
 #include "iceberg/schema.h"
 #include "iceberg/type.h"
 #include "iceberg/util/checked_cast.h"

src/iceberg/manifest_reader_internal.h → src/iceberg/manifest/manifest_reader_internal.h

@@ -19,12 +19,12 @@
 
 #pragma once
 
-/// \file iceberg/internal/manifest_reader_internal.h
+/// \file iceberg/manifest/manifest_reader_internal.h
 /// Reader implementation for manifest list files and manifest files.
 
 #include "iceberg/file_reader.h"
 #include "iceberg/inheritable_metadata.h"
-#include "iceberg/manifest_reader.h"
+#include "iceberg/manifest/manifest_reader.h"
 
 namespace iceberg {
 

src/iceberg/manifest_writer.cc → src/iceberg/manifest/manifest_writer.cc

@@ -17,20 +17,20 @@
  * under the License.
  */
 
-#include "iceberg/manifest_writer.h"
+#include "iceberg/manifest/manifest_writer.h"
 
 #include <optional>
 
-#include "iceberg/manifest_entry.h"
-#include "iceberg/manifest_list.h"
+#include "iceberg/manifest/manifest_entry.h"
+#include "iceberg/manifest/manifest_list.h"
+#include "iceberg/manifest/v1_metadata_internal.h"
+#include "iceberg/manifest/v2_metadata_internal.h"
+#include "iceberg/manifest/v3_metadata_internal.h"
 #include "iceberg/partition_summary_internal.h"
 #include "iceberg/result.h"
 #include "iceberg/schema.h"
 #include "iceberg/table_metadata.h"
 #include "iceberg/util/macros.h"
-#include "iceberg/v1_metadata.h"
-#include "iceberg/v2_metadata.h"
-#include "iceberg/v3_metadata.h"
 
 namespace iceberg {
 
@@ -294,8 +294,8 @@ Result<std::unique_ptr<ManifestWriter>> ManifestWriter::MakeV1Writer(
       auto writer,
       OpenFileWriter(manifest_location, std::move(schema), std::move(file_io),
                      adapter->metadata(), "manifest_entry"));
-  return std::make_unique<ManifestWriter>(std::move(writer), std::move(adapter),
-                                          manifest_location, std::nullopt);
+  return std::unique_ptr<ManifestWriter>(new ManifestWriter(
+      std::move(writer), std::move(adapter), manifest_location, std::nullopt));
 }
 
 Result<std::unique_ptr<ManifestWriter>> ManifestWriter::MakeV2Writer(
@@ -324,8 +324,8 @@ Result<std::unique_ptr<ManifestWriter>> ManifestWriter::MakeV2Writer(
       auto writer,
       OpenFileWriter(manifest_location, std::move(schema), std::move(file_io),
                      adapter->metadata(), "manifest_entry"));
-  return std::make_unique<ManifestWriter>(std::move(writer), std::move(adapter),
-                                          manifest_location, std::nullopt);
+  return std::unique_ptr<ManifestWriter>(new ManifestWriter(
+      std::move(writer), std::move(adapter), manifest_location, std::nullopt));
 }
 
 Result<std::unique_ptr<ManifestWriter>> ManifestWriter::MakeV3Writer(
@@ -356,10 +356,16 @@ Result<std::unique_ptr<ManifestWriter>> ManifestWriter::MakeV3Writer(
       auto writer,
       OpenFileWriter(manifest_location, std::move(schema), std::move(file_io),
                      adapter->metadata(), "manifest_entry"));
-  return std::make_unique<ManifestWriter>(std::move(writer), std::move(adapter),
-                                          manifest_location, first_row_id);
+  return std::unique_ptr<ManifestWriter>(new ManifestWriter(
+      std::move(writer), std::move(adapter), manifest_location, first_row_id));
 }
 
+ManifestListWriter::ManifestListWriter(std::unique_ptr<Writer> writer,
+                                       std::unique_ptr<ManifestFileAdapter> adapter)
+    : writer_(std::move(writer)), adapter_(std::move(adapter)) {}
+
+ManifestListWriter::~ManifestListWriter() = default;
+
 Status ManifestListWriter::Add(const ManifestFile& file) {
   if (adapter_->size() >= kBatchSize) {
     ICEBERG_ASSIGN_OR_RAISE(auto array, adapter_->FinishAppending());
@@ -400,7 +406,8 @@ Result<std::unique_ptr<ManifestListWriter>> ManifestListWriter::MakeV1Writer(
       auto writer,
       OpenFileWriter(manifest_list_location, std::move(schema), std::move(file_io),
                      adapter->metadata(), "manifest_file"));
-  return std::make_unique<ManifestListWriter>(std::move(writer), std::move(adapter));
+  return std::unique_ptr<ManifestListWriter>(
+      new ManifestListWriter(std::move(writer), std::move(adapter)));
 }
 
 Result<std::unique_ptr<ManifestListWriter>> ManifestListWriter::MakeV2Writer(
@@ -418,7 +425,8 @@ Result<std::unique_ptr<ManifestListWriter>> ManifestListWriter::MakeV2Writer(
       OpenFileWriter(manifest_list_location, std::move(schema), std::move(file_io),
                      adapter->metadata(), "manifest_file"));
 
-  return std::make_unique<ManifestListWriter>(std::move(writer), std::move(adapter));
+  return std::unique_ptr<ManifestListWriter>(
+      new ManifestListWriter(std::move(writer), std::move(adapter)));
 }
 
 Result<std::unique_ptr<ManifestListWriter>> ManifestListWriter::MakeV3Writer(
@@ -435,7 +443,8 @@ Result<std::unique_ptr<ManifestListWriter>> ManifestListWriter::MakeV3Writer(
       auto writer,
       OpenFileWriter(manifest_list_location, std::move(schema), std::move(file_io),
                      adapter->metadata(), "manifest_file"));
-  return std::make_unique<ManifestListWriter>(std::move(writer), std::move(adapter));
+  return std::unique_ptr<ManifestListWriter>(
+      new ManifestListWriter(std::move(writer), std::move(adapter)));
 }
 
 }  // namespace iceberg

src/iceberg/manifest_writer.h → src/iceberg/manifest/manifest_writer.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-/// \file iceberg/manifest_writer.h
+/// \file iceberg/manifest/manifest_writer.h
 /// Data writer interface for manifest files and manifest list files.
 
 #include <memory>
@@ -28,7 +28,6 @@
 
 #include "iceberg/file_writer.h"
 #include "iceberg/iceberg_export.h"
-#include "iceberg/manifest_adapter.h"
 #include "iceberg/metrics.h"
 #include "iceberg/result.h"
 #include "iceberg/type_fwd.h"
@@ -38,10 +37,6 @@ namespace iceberg {
 /// \brief Write manifest entries to a manifest file.
 class ICEBERG_EXPORT ManifestWriter {
  public:
-  ManifestWriter(std::unique_ptr<Writer> writer,
-                 std::unique_ptr<ManifestEntryAdapter> adapter,
-                 std::string_view manifest_location, std::optional<int64_t> first_row_id);
-
   ~ManifestWriter();
 
   /// \brief Write the entry that all its fields are populated correctly.
@@ -160,11 +155,17 @@ class ICEBERG_EXPORT ManifestWriter {
       std::shared_ptr<Schema> current_schema, ManifestContent content);
 
  private:
+  // Private constructor for internal use only, use the static Make*Writer methods
+  // instead.
+  ManifestWriter(std::unique_ptr<Writer> writer,
+                 std::unique_ptr<class ManifestEntryAdapter> adapter,
+                 std::string_view manifest_location, std::optional<int64_t> first_row_id);
+
   Status CheckDataFile(const DataFile& file) const;
 
   static constexpr int64_t kBatchSize = 1024;
   std::unique_ptr<Writer> writer_;
-  std::unique_ptr<ManifestEntryAdapter> adapter_;
+  std::unique_ptr<class ManifestEntryAdapter> adapter_;
   bool closed_{false};
   std::string manifest_location_;
   std::optional<int64_t> first_row_id_;
@@ -182,11 +183,7 @@ class ICEBERG_EXPORT ManifestWriter {
 /// \brief Write manifest files to a manifest list file.
 class ICEBERG_EXPORT ManifestListWriter {
  public:
-  ManifestListWriter(std::unique_ptr<Writer> writer,
-                     std::unique_ptr<ManifestFileAdapter> adapter)
-      : writer_(std::move(writer)), adapter_(std::move(adapter)) {}
-
-  ~ManifestListWriter() = default;
+  ~ManifestListWriter();
 
   /// \brief Write manifest file to manifest list file.
   /// \param file Manifest file to write.
@@ -240,9 +237,14 @@ class ICEBERG_EXPORT ManifestListWriter {
       std::string_view manifest_list_location, std::shared_ptr<FileIO> file_io);
 
  private:
+  // Private constructor for internal use only, use the static Make*Writer methods
+  // instead.
+  ManifestListWriter(std::unique_ptr<Writer> writer,
+                     std::unique_ptr<class ManifestFileAdapter> adapter);
+
   static constexpr int64_t kBatchSize = 1024;
   std::unique_ptr<Writer> writer_;
-  std::unique_ptr<ManifestFileAdapter> adapter_;
+  std::unique_ptr<class ManifestFileAdapter> adapter_;
 };
 
 }  // namespace iceberg

src/iceberg/manifest/meson.build

@@ -0,0 +1,26 @@
+# 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.
+
+install_headers(
+    [
+        'manifest_entry.h',
+        'manifest_list.h',
+        'manifest_reader.h',
+        'manifest_writer.h',
+    ],
+    subdir: 'iceberg/manifest',
+)