-
Notifications
You must be signed in to change notification settings - Fork 46
feat: introduce catalog api #92
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,212 @@ | ||
| // 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. | ||
|
|
||
| //! Catalog API for Apache Paimon. | ||
| //! | ||
| //! Design aligns with [Paimon Java Catalog](https://github.com/apache/paimon/blob/master/paimon-core/src/main/java/org/apache/paimon/catalog/Catalog.java) | ||
| //! and follows API patterns from Apache Iceberg Rust. | ||
|
|
||
| use std::collections::HashMap; | ||
| use std::fmt; | ||
|
|
||
| use serde::{Deserialize, Serialize}; | ||
|
|
||
| /// Splitter for system table names (e.g. `table$snapshots`). | ||
| #[allow(dead_code)] | ||
| pub const SYSTEM_TABLE_SPLITTER: &str = "$"; | ||
| /// Prefix for branch in object name (e.g. `table$branch_foo`). | ||
| #[allow(dead_code)] | ||
| pub const SYSTEM_BRANCH_PREFIX: &str = "branch_"; | ||
| /// Default main branch name. | ||
| #[allow(dead_code)] | ||
| pub const DEFAULT_MAIN_BRANCH: &str = "main"; | ||
| /// Database value when the database is not known; [`Identifier::full_name`] returns only the object. | ||
| pub const UNKNOWN_DATABASE: &str = "unknown"; | ||
|
|
||
| // ======================= Identifier =============================== | ||
|
|
||
| /// Identifies a catalog object (e.g. a table) by database and object name. | ||
| /// | ||
| /// Corresponds to [org.apache.paimon.catalog.Identifier](https://github.com/apache/paimon/blob/release-1.3/paimon-api/src/main/java/org/apache/paimon/catalog/Identifier.java). | ||
| /// The object name may be a table name or a qualified name like `table$branch_foo` or | ||
| /// `table$snapshots` for system tables. | ||
| #[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] | ||
| #[serde(rename_all = "camelCase")] | ||
| pub struct Identifier { | ||
| /// Database name. | ||
| database: String, | ||
| /// Object name (table name, or table$branch$system for system tables). | ||
| object: String, | ||
| } | ||
|
|
||
| impl Identifier { | ||
| /// Create an identifier from database and object name. | ||
| pub fn new(database: impl Into<String>, object: impl Into<String>) -> Self { | ||
| Self { | ||
| database: database.into(), | ||
| object: object.into(), | ||
| } | ||
| } | ||
|
|
||
| /// Database name. | ||
| pub fn database(&self) -> &str { | ||
| &self.database | ||
| } | ||
|
|
||
| /// Full object name (table name, or with branch/system suffix). | ||
| pub fn object(&self) -> &str { | ||
| &self.object | ||
| } | ||
|
|
||
| /// Full name: when database is [`UNKNOWN_DATABASE`], returns only the object; | ||
| /// otherwise returns `database.object`. | ||
| pub fn full_name(&self) -> String { | ||
| if self.database == UNKNOWN_DATABASE { | ||
| self.object.clone() | ||
| } else { | ||
| format!("{}.{}", self.database, self.object) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl fmt::Display for Identifier { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| write!(f, "{}", self.full_name()) | ||
| } | ||
| } | ||
|
|
||
| impl fmt::Debug for Identifier { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| f.debug_struct("Identifier") | ||
| .field("database", &self.database) | ||
| .field("object", &self.object) | ||
| .finish() | ||
| } | ||
| } | ||
|
|
||
| // ======================= Catalog trait =============================== | ||
|
|
||
| use async_trait::async_trait; | ||
|
|
||
| use crate::spec::{Schema, SchemaChange}; | ||
| use crate::table::Table; | ||
| use crate::Result; | ||
|
|
||
| /// Catalog API for reading and writing metadata (databases, tables) in Paimon. | ||
| /// | ||
| /// Corresponds to [org.apache.paimon.catalog.Catalog](https://github.com/apache/paimon/blob/release-1.3/paimon-core/src/main/java/org/apache/paimon/catalog/Catalog.java). | ||
| #[async_trait] | ||
| pub trait Catalog: Send + Sync { | ||
| // ======================= database methods =============================== | ||
|
|
||
| /// List names of all databases in this catalog. | ||
| /// | ||
| /// # Errors | ||
| /// Implementations may return other errors (e.g. I/O or backend-specific). | ||
| async fn list_databases(&self) -> Result<Vec<String>>; | ||
|
|
||
| /// Create a database. | ||
| /// | ||
| /// * `ignore_if_exists` - if true, do nothing when the database already exists; | ||
| /// if false, return [`crate::Error::DatabaseAlreadyExist`]. | ||
| /// | ||
| /// # Errors | ||
| /// * [`crate::Error::DatabaseAlreadyExist`] - database already exists when `ignore_if_exists` is false. | ||
| async fn create_database( | ||
| &self, | ||
| name: &str, | ||
| ignore_if_exists: bool, | ||
| properties: HashMap<String, String>, | ||
| ) -> Result<()>; | ||
|
|
||
| /// Drop a database. | ||
| /// | ||
| /// * `ignore_if_not_exists` - if true, do nothing when the database does not exist. | ||
| /// * `cascade` - if true, delete all tables in the database then delete the database; | ||
| /// if false, return [`crate::Error::DatabaseNotEmpty`] when not empty. | ||
| /// | ||
| /// # Errors | ||
| /// * [`crate::Error::DatabaseNotExist`] - database does not exist when `ignore_if_not_exists` is false. | ||
| /// * [`crate::Error::DatabaseNotEmpty`] - database is not empty when `cascade` is false. | ||
| async fn drop_database( | ||
| &self, | ||
| name: &str, | ||
| ignore_if_not_exists: bool, | ||
| cascade: bool, | ||
| ) -> Result<()>; | ||
|
|
||
| // ======================= table methods =============================== | ||
|
|
||
| /// Get table metadata for the given identifier. | ||
| /// | ||
| /// # Errors | ||
| /// * [`crate::Error::DatabaseNotExist`] - database in identifier does not exist. | ||
| /// * [`crate::Error::TableNotExist`] - table does not exist. | ||
| async fn get_table(&self, identifier: &Identifier) -> Result<Table>; | ||
|
|
||
| /// List table names in a database. System tables are not listed. | ||
| /// | ||
| /// # Errors | ||
| /// * [`crate::Error::DatabaseNotExist`] - database does not exist. | ||
| async fn list_tables(&self, database_name: &str) -> Result<Vec<String>>; | ||
|
|
||
| /// Create a table. | ||
| /// | ||
| /// * `ignore_if_exists` - if true, do nothing when the table already exists; | ||
| /// if false, return [`crate::Error::TableAlreadyExist`]. | ||
| /// | ||
| /// # Errors | ||
| /// * [`crate::Error::DatabaseNotExist`] - database in identifier does not exist. | ||
| /// * [`crate::Error::TableAlreadyExist`] - table already exists when `ignore_if_exists` is false. | ||
| async fn create_table( | ||
| &self, | ||
| identifier: &Identifier, | ||
| creation: Schema, | ||
| ignore_if_exists: bool, | ||
| ) -> Result<()>; | ||
|
|
||
| /// Drop a table. System tables cannot be dropped. | ||
| /// | ||
| /// # Errors | ||
| /// * [`crate::Error::TableNotExist`] - table does not exist when `ignore_if_not_exists` is false. | ||
| async fn drop_table(&self, identifier: &Identifier, ignore_if_not_exists: bool) -> Result<()>; | ||
|
|
||
| /// Rename a table. | ||
| /// | ||
| /// # Errors | ||
| /// * [`crate::Error::TableNotExist`] - source table does not exist when `ignore_if_not_exists` is false. | ||
| /// * [`crate::Error::TableAlreadyExist`] - target table already exists. | ||
| async fn rename_table( | ||
| &self, | ||
| from: &Identifier, | ||
| to: &Identifier, | ||
| ignore_if_not_exists: bool, | ||
| ) -> Result<()>; | ||
|
|
||
| /// Apply schema changes to a table. | ||
| /// | ||
| /// # Errors | ||
| /// * [`crate::Error::TableNotExist`] - table does not exist when `ignore_if_not_exists` is false. | ||
| /// * [`crate::Error::ColumnAlreadyExist`] - adding a column that already exists. | ||
| /// * [`crate::Error::ColumnNotExist`] - altering or dropping a column that does not exist. | ||
| async fn alter_table( | ||
| &self, | ||
| identifier: &Identifier, | ||
| changes: Vec<SchemaChange>, | ||
| ignore_if_not_exists: bool, | ||
| ) -> Result<()>; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // 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. | ||
|
|
||
| //! Table API for Apache Paimon | ||
|
|
||
| /// Table represents a table in the catalog. | ||
| #[derive(Debug, Clone)] | ||
| pub struct Table {} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
both iceberg-rust and delta-rust return a rust struct instead of rust trait. And struct is simpler to use than trait. Return struct should also be fine to paimon-rust.