Merge pull request #32 from project-tsurugi/wip/schema-maybe-shared

fix: make schema descriptor hold `maybe_shared_ptr`.

include/yugawara/binding/extract.h

@@ -91,7 +91,7 @@ struct descriptor_extract<::takatori::descriptor::schema, schema::declaration> :
     using descriptor_type = ::takatori::descriptor::schema;
     using entity_type = schema::declaration;
     using result_type = ::takatori::util::optional_ptr<entity_type const>;
-    using pointer_type = std::shared_ptr<entity_type const>;
+    using pointer_type = ::takatori::util::maybe_shared_ptr<entity_type const>;
     [[nodiscard]] static result_type extract(descriptor_type const& desc, bool fail_if_mismatch);
     [[nodiscard]] static pointer_type extract_shared(descriptor_type const& desc, bool fail_if_mismatch);
 };

include/yugawara/binding/factory.h

@@ -15,6 +15,7 @@
 
 #include <takatori/plan/exchange.h>
 
+#include <takatori/util/maybe_shared_ptr.h>
 #include <takatori/util/optional_ptr.h>
 
 #include <yugawara/variable/declaration.h>
@@ -52,7 +53,7 @@ class factory {
      * @brief creates a new index descriptor.
      * @param declaration the original declaration
      */
-    [[nodiscard]] ::takatori::descriptor::relation index(std::shared_ptr<storage::index const> declaration);
+    [[nodiscard]] ::takatori::descriptor::relation index(::takatori::util::maybe_shared_ptr<storage::index const> declaration);
 
     /**
      * @brief creates a new exchange descriptor.
@@ -145,7 +146,7 @@ class factory {
      * @brief creates a new schema descriptor.
      * @param declaration the original declaration
      */
-    [[nodiscard]] ::takatori::descriptor::schema schema(std::shared_ptr<schema::declaration const> declaration);
+    [[nodiscard]] ::takatori::descriptor::schema schema(::takatori::util::maybe_shared_ptr<schema::declaration const> declaration);
 
     /**
      * @brief creates a new schema descriptor.
@@ -170,8 +171,8 @@ class factory {
     /// @copydoc index(storage::index const&)
     [[nodiscard]] ::takatori::descriptor::relation operator()(storage::index const& declaration);
 
-    /// @copydoc index(std::shared_ptr<storage::index const>)
-    [[nodiscard]] ::takatori::descriptor::relation operator()(std::shared_ptr<storage::index const> declaration);
+    /// @copydoc index(::takatori::util::maybe_shared_ptr<storage::index const>)
+    [[nodiscard]] ::takatori::descriptor::relation operator()(::takatori::util::maybe_shared_ptr<storage::index const> declaration);
 
     /// @copydoc exchange()
     [[nodiscard]] ::takatori::descriptor::relation operator()(::takatori::plan::exchange const& declaration);
@@ -197,8 +198,8 @@ class factory {
     /// @copydoc aggregate_function(aggregate::declaration&&)
     [[nodiscard]] ::takatori::descriptor::aggregate_function operator()(aggregate::declaration&& declaration);
 
-    /// @copydoc schema(std::shared_ptr<schema::declaration const>)
-    [[nodiscard]] ::takatori::descriptor::schema operator()(std::shared_ptr<schema::declaration const> declaration);
+    /// @copydoc schema(::takatori::util::maybe_shared_ptr<schema::declaration const>)
+    [[nodiscard]] ::takatori::descriptor::schema operator()(::takatori::util::maybe_shared_ptr<schema::declaration const> declaration);
 
     /// @copydoc schema(schema::declaration&&)
     [[nodiscard]] ::takatori::descriptor::schema operator()(schema::declaration&& declaration);

include/yugawara/binding/schema_info.h

@@ -4,6 +4,7 @@
 
 #include <takatori/descriptor/schema.h>
 #include <takatori/util/object.h>
+#include <takatori/util/maybe_shared_ptr.h>
 
 #include <yugawara/schema/declaration.h>
 
@@ -18,7 +19,7 @@ class schema_info : public ::takatori::descriptor::schema::entity_type {
     using descriptor_type = ::takatori::descriptor::schema;
 
     /// @brief the pointer type of schema declaration.
-    using declaration_pointer = std::shared_ptr<schema::declaration const>;
+    using declaration_pointer = ::takatori::util::maybe_shared_ptr<schema::declaration const>;
 
     /**
      * @brief creates a new instance.

src/yugawara/binding/factory.cpp

@@ -17,11 +17,13 @@
 
 namespace yugawara::binding {
 
+using ::takatori::util::maybe_shared_ptr;
+
 ::takatori::descriptor::relation factory::index(storage::index const& declaration) {
     return wrap(std::make_shared<index_info>(declaration));
 }
 
-::takatori::descriptor::relation factory::index(std::shared_ptr<storage::index const> declaration) {
+::takatori::descriptor::relation factory::index(maybe_shared_ptr<storage::index const> declaration) {
     return wrap(std::make_shared<index_info>(std::move(declaration)));
 }
 
@@ -89,7 +91,7 @@ ::takatori::descriptor::aggregate_function factory::aggregate_function(aggregate
     return aggregate_function(std::make_shared<aggregate::declaration>(std::move(declaration)));
 }
 
-::takatori::descriptor::schema factory::schema(std::shared_ptr<schema::declaration const> declaration) {
+::takatori::descriptor::schema factory::schema(maybe_shared_ptr<schema::declaration const> declaration) {
     return wrap(std::make_shared<schema_info>(std::move(declaration)));
 }
 
@@ -109,7 +111,7 @@ ::takatori::descriptor::relation factory::operator()(storage::index const& decla
     return index(declaration);
 }
 
-::takatori::descriptor::relation factory::operator()(std::shared_ptr<storage::index const> declaration) {
+::takatori::descriptor::relation factory::operator()(maybe_shared_ptr<storage::index const> declaration) {
     return index(std::move(declaration));
 }
 
@@ -146,7 +148,7 @@ ::takatori::descriptor::aggregate_function factory::operator()(aggregate::declar
     return aggregate_function(std::move(declaration));
 }
 
-::takatori::descriptor::schema factory::operator()(std::shared_ptr<schema::declaration const> declaration) {
+::takatori::descriptor::schema factory::operator()(maybe_shared_ptr<schema::declaration const> declaration) {
     return schema(std::move(declaration));
 }