chore: consolidate avro and parquet register api

Author: wgtmac

example/demo_example.cc

@@ -19,11 +19,13 @@
 
 #include <iostream>
 
-#include "iceberg/avro/avro_reader.h"
+#include "iceberg/avro/avro_register.h"
 #include "iceberg/file_reader.h"
+#include "iceberg/parquet/parquet_register.h"
 
 int main() {
-  iceberg::avro::AvroReader::Register();
+  iceberg::avro::RegisterAll();
+  iceberg::parquet::RegisterAll();
   auto open_result = iceberg::ReaderFactoryRegistry::Open(
       iceberg::FileFormatType::kAvro, {.path = "non-existing-file.avro"});
   if (!open_result.has_value()) {

src/iceberg/CMakeLists.txt

@@ -109,11 +109,12 @@ if(ICEBERG_BUILD_BUNDLE)
       avro/avro_data_util.cc
       avro/avro_reader.cc
       avro/avro_writer.cc
-      avro/avro_schema_util.cc
       avro/avro_register.cc
+      avro/avro_schema_util.cc
       avro/avro_stream_internal.cc
       parquet/parquet_data_util.cc
       parquet/parquet_reader.cc
+      parquet/parquet_register.cc
       parquet/parquet_schema_util.cc)
 
   # Libraries to link with exported libiceberg_bundle.{so,a}.

src/iceberg/avro/avro_register.cc

@@ -19,18 +19,27 @@
 
 #include "iceberg/avro/avro_register.h"
 
+#include "iceberg/avro/avro_reader.h"
 #include "iceberg/avro/avro_schema_util_internal.h"
+#include "iceberg/avro/avro_writer.h"
 
 namespace iceberg::avro {
 
 void RegisterLogicalTypes() {
-  static std::once_flag flag{};
-  std::call_once(flag, []() {
-    // Register the map logical type with the avro custom logical type registry.
-    // See https://github.com/apache/avro/pull/3326 for details.
-    ::avro::CustomLogicalTypeRegistry::instance().registerType(
-        "map", [](const std::string&) { return std::make_shared<MapLogicalType>(); });
-  });
+  // Register the map logical type with the avro custom logical type registry.
+  // See https://github.com/apache/avro/pull/3326 for details.
+  ::avro::CustomLogicalTypeRegistry::instance().registerType(
+      "map", [](const std::string&) { return std::make_shared<MapLogicalType>(); });
+}
+
+void RegisterReader() { AvroReader::Register(); }
+
+void RegisterWriter() { AvroWriter::Register(); }
+
+void RegisterAll() {
+  RegisterLogicalTypes();
+  RegisterReader();
+  RegisterWriter();
 }
 
 }  // namespace iceberg::avro

src/iceberg/avro/avro_register.h

@@ -19,10 +19,23 @@
 
 #pragma once
 
+/// \file iceberg/avro/avro_register.h
+/// \brief Provide functions to register Avro implementations.
+
 #include "iceberg/iceberg_bundle_export.h"
 
 namespace iceberg::avro {
 
+/// \brief Register all the logical types.
 ICEBERG_BUNDLE_EXPORT void RegisterLogicalTypes();
 
+/// \brief Register Avro reader implementation.
+ICEBERG_BUNDLE_EXPORT void RegisterReader();
+
+/// \brief Register Avro writer implementation.
+ICEBERG_BUNDLE_EXPORT void RegisterWriter();
+
+/// \brief Register all the logical types, Avro reader, and Avro writer.
+ICEBERG_BUNDLE_EXPORT void RegisterAll();
+
 }  // namespace iceberg::avro

src/iceberg/avro/avro_schema_util.cc

@@ -45,15 +45,7 @@ namespace iceberg::avro {
 
 namespace {
 
-constexpr std::string_view kIcebergFieldNameProp = "iceberg-field-name";
-constexpr std::string_view kFieldIdProp = "field-id";
-constexpr std::string_view kKeyIdProp = "key-id";
-constexpr std::string_view kValueIdProp = "value-id";
-constexpr std::string_view kElementIdProp = "element-id";
-constexpr std::string_view kAdjustToUtcProp = "adjust-to-utc";
-
 ::avro::LogicalType GetMapLogicalType() {
-  RegisterLogicalTypes();
   return ::avro::LogicalType(std::make_shared<MapLogicalType>());
 }
 

src/iceberg/avro/constants.h

@@ -31,4 +31,12 @@ constexpr std::string_view kElement = "element";
 constexpr std::string_view kKey = "key";
 constexpr std::string_view kValue = "value";
 
+// Avro custom attributes constants
+constexpr std::string_view kIcebergFieldNameProp = "iceberg-field-name";
+constexpr std::string_view kFieldIdProp = "field-id";
+constexpr std::string_view kKeyIdProp = "key-id";
+constexpr std::string_view kValueIdProp = "value-id";
+constexpr std::string_view kElementIdProp = "element-id";
+constexpr std::string_view kAdjustToUtcProp = "adjust-to-utc";
+
 }  // namespace iceberg::avro

src/iceberg/parquet/parquet_register.cc

@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#include "iceberg/parquet/parquet_register.h"
+
+#include "iceberg/parquet/parquet_reader.h"
+
+namespace iceberg::parquet {
+
+void RegisterReader() { ParquetReader::Register(); }
+
+void RegisterWriter() {}
+
+void RegisterAll() {
+  RegisterReader();
+  RegisterWriter();
+}
+
+}  // namespace iceberg::parquet

src/iceberg/parquet/parquet_register.h

@@ -0,0 +1,38 @@
+/*
+ * 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/parquet/parquet_register.h
+/// \brief Provide functions to register Parquet implementations.
+
+#include "iceberg/iceberg_bundle_export.h"
+
+namespace iceberg::parquet {
+
+/// \brief Register Parquet reader implementation.
+ICEBERG_BUNDLE_EXPORT void RegisterReader();
+
+/// \brief Register Parquet writer implementation.
+ICEBERG_BUNDLE_EXPORT void RegisterWriter();
+
+/// \brief Register Parquet reader and writer implementations.
+ICEBERG_BUNDLE_EXPORT void RegisterAll();
+
+}  // namespace iceberg::parquet

test/avro_test.cc

@@ -30,7 +30,8 @@
 #include <gtest/gtest.h>
 
 #include "iceberg/arrow/arrow_fs_file_io_internal.h"
-#include "iceberg/avro/avro_reader.h"
+#include "iceberg/avro/avro_register.h"
+#include "iceberg/file_reader.h"
 #include "iceberg/schema.h"
 #include "iceberg/type.h"
 #include "matchers.h"
@@ -40,7 +41,7 @@ namespace iceberg::avro {
 
 class AvroReaderTest : public TempFileTestBase {
  protected:
-  static void SetUpTestSuite() { AvroReader::Register(); }
+  static void SetUpTestSuite() { RegisterAll(); }
 
   void SetUp() override {
     TempFileTestBase::SetUp();

test/manifest_list_reader_test.cc

@@ -22,7 +22,7 @@
 #include <gtest/gtest.h>
 
 #include "iceberg/arrow/arrow_fs_file_io_internal.h"
-#include "iceberg/avro/avro_reader.h"
+#include "iceberg/avro/avro_register.h"
 #include "iceberg/manifest_list.h"
 #include "iceberg/manifest_reader.h"
 #include "temp_file_test_base.h"
@@ -32,7 +32,7 @@ namespace iceberg {
 
 class ManifestListReaderTestBase : public TempFileTestBase {
  protected:
-  static void SetUpTestSuite() { avro::AvroReader::Register(); }
+  static void SetUpTestSuite() { avro::RegisterAll(); }
 
   void SetUp() override {
     TempFileTestBase::SetUp();