wgtmac commented on code in PR #80: URL: https://github.com/apache/iceberg-cpp/pull/80#discussion_r2059685178
########## src/iceberg/catalog/memory_catalog.h: ########## @@ -0,0 +1,204 @@ +/* + * 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 + +#include <mutex> +#include <optional> +#include <unordered_map> + +#include "iceberg/catalog.h" + +namespace iceberg { + +class InMemoryNamespace; + +class ICEBERG_EXPORT InMemoryCatalog : public Catalog { + public: + InMemoryCatalog(std::shared_ptr<FileIO> file_io, std::string warehouse_location); + + void Initialize( + const std::string& name, + const std::unordered_map<std::string, std::string>& properties) override; + + std::string_view name() const override; + + Result<std::vector<TableIdentifier>> ListTables(const Namespace& ns) const override; + + Result<std::unique_ptr<Table>> CreateTable( + const TableIdentifier& identifier, const Schema& schema, const PartitionSpec& spec, + const std::string& location, + const std::unordered_map<std::string, std::string>& properties) override; + + Result<std::unique_ptr<Table>> UpdateTable( + const TableIdentifier& identifier, + const std::vector<std::unique_ptr<UpdateRequirement>>& requirements, + const std::vector<std::unique_ptr<MetadataUpdate>>& updates) override; + + Result<std::shared_ptr<Transaction>> StageCreateTable( + const TableIdentifier& identifier, const Schema& schema, const PartitionSpec& spec, + const std::string& location, + const std::unordered_map<std::string, std::string>& properties) override; + + Status TableExists(const TableIdentifier& identifier) const override; + + Status DropTable(const TableIdentifier& identifier, bool purge) override; + + Result<std::shared_ptr<Table>> LoadTable( + const TableIdentifier& identifier) const override; + + Result<std::shared_ptr<Table>> RegisterTable( + const TableIdentifier& identifier, + const std::string& metadata_file_location) override; + + std::unique_ptr<iceberg::TableBuilder> BuildTable(const TableIdentifier& identifier, + const Schema& schema) const override; + + private: + std::string catalog_name_; + std::unordered_map<std::string, std::string> properties_; + std::shared_ptr<FileIO> file_io_; + std::string warehouse_location_; + std::unique_ptr<InMemoryNamespace> root_namespace_; + mutable std::recursive_mutex mutex_; +}; + +/** + * \brief A hierarchical namespace that manages namespaces and table metadata in-memory. + * + * Each InMemoryNamespace represents a namespace level and can contain properties, + * tables, and child namespaces. This structure enables a tree-like representation + * of nested namespaces. + */ +class ICEBERG_EXPORT InMemoryNamespace { Review Comment: I was simply mirroring the Java impl when I added the `Catalog` without notice of `SupportsNamespace`: https://github.com/apache/iceberg/blob/main/api/src/main/java/org/apache/iceberg/catalog/SupportsNamespaces.java. Does it make sense to add all interfaces from `SupportsNamespace` to our `Catalog` API? `iceberg-python` did the same thing: https://github.com/apache/iceberg-python/blob/main/pyiceberg/catalog/__init__.py#L588 This aligns with the rest catalog api. @Fokko Do you have an opinion? ########## src/iceberg/catalog/memory_catalog.h: ########## @@ -0,0 +1,204 @@ +/* + * 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 + +#include <mutex> +#include <optional> +#include <unordered_map> + +#include "iceberg/catalog.h" + +namespace iceberg { + +class InMemoryNamespace; Review Comment: nit: you can forward declare it when it appears for the 1st time to use less lines :) ########## src/iceberg/catalog/memory_catalog.h: ########## @@ -0,0 +1,204 @@ +/* + * 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 + +#include <mutex> +#include <optional> +#include <unordered_map> + +#include "iceberg/catalog.h" + +namespace iceberg { + +class InMemoryNamespace; + +class ICEBERG_EXPORT InMemoryCatalog : public Catalog { + public: + InMemoryCatalog(std::shared_ptr<FileIO> file_io, std::string warehouse_location); + + void Initialize( + const std::string& name, + const std::unordered_map<std::string, std::string>& properties) override; + + std::string_view name() const override; + + Result<std::vector<TableIdentifier>> ListTables(const Namespace& ns) const override; + + Result<std::unique_ptr<Table>> CreateTable( + const TableIdentifier& identifier, const Schema& schema, const PartitionSpec& spec, + const std::string& location, + const std::unordered_map<std::string, std::string>& properties) override; + + Result<std::unique_ptr<Table>> UpdateTable( + const TableIdentifier& identifier, + const std::vector<std::unique_ptr<UpdateRequirement>>& requirements, + const std::vector<std::unique_ptr<MetadataUpdate>>& updates) override; + + Result<std::shared_ptr<Transaction>> StageCreateTable( + const TableIdentifier& identifier, const Schema& schema, const PartitionSpec& spec, + const std::string& location, + const std::unordered_map<std::string, std::string>& properties) override; + + Status TableExists(const TableIdentifier& identifier) const override; + + Status DropTable(const TableIdentifier& identifier, bool purge) override; + + Result<std::shared_ptr<Table>> LoadTable( + const TableIdentifier& identifier) const override; + + Result<std::shared_ptr<Table>> RegisterTable( + const TableIdentifier& identifier, + const std::string& metadata_file_location) override; + + std::unique_ptr<iceberg::TableBuilder> BuildTable(const TableIdentifier& identifier, + const Schema& schema) const override; + + private: + std::string catalog_name_; + std::unordered_map<std::string, std::string> properties_; + std::shared_ptr<FileIO> file_io_; + std::string warehouse_location_; + std::unique_ptr<InMemoryNamespace> root_namespace_; + mutable std::recursive_mutex mutex_; +}; + +/** + * \brief A hierarchical namespace that manages namespaces and table metadata in-memory. + * + * Each InMemoryNamespace represents a namespace level and can contain properties, + * tables, and child namespaces. This structure enables a tree-like representation + * of nested namespaces. + */ +class ICEBERG_EXPORT InMemoryNamespace { + public: + /** + * \brief Checks whether the given namespace exists. + * \param[in] namespace_ident The namespace to check. + * \return Status indicating success or failure. + */ + Status NamespaceExists(const Namespace& namespace_ident) const; + + /** + * \brief Lists immediate child namespaces under the given parent namespace. + * \param[in] parent_namespace_ident The optional parent namespace. If not provided, + * the children of the root are returned. + * \return A vector of child namespace names. + */ + Result<std::vector<std::string>> ListChildrenNamespaces( Review Comment: nit: use std::span -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
