From 145e85b5dd8ab3bd206962bab116cefb3f564d2d Mon Sep 17 00:00:00 2001 From: Jan Kaul Date: Mon, 9 Dec 2024 08:18:11 +0100 Subject: [PATCH] move catalogs to separate directory --- Cargo.toml | 10 +++++----- .../iceberg-file-catalog}/Cargo.toml | 4 ++-- .../iceberg-file-catalog}/src/error.rs | 0 .../iceberg-file-catalog}/src/lib.rs | 2 +- .../iceberg-glue-catalog}/Cargo.toml | 4 ++-- .../iceberg-glue-catalog}/src/error.rs | 0 .../iceberg-glue-catalog}/src/lib.rs | 2 +- .../iceberg-glue-catalog}/src/schema.rs | 0 .../iceberg-rest-catalog}/.gitignore | 0 .../iceberg-rest-catalog}/Cargo.toml | 2 +- .../iceberg-rest-catalog}/README.md | 0 .../iceberg-rest-catalog}/src/apis/catalog_api_api.rs | 0 .../iceberg-rest-catalog}/src/apis/configuration.rs | 0 .../src/apis/configuration_api_api.rs | 0 .../iceberg-rest-catalog}/src/apis/mod.rs | 0 .../iceberg-rest-catalog}/src/apis/o_auth2_api_api.rs | 0 .../iceberg-rest-catalog}/src/catalog.rs | 0 .../iceberg-rest-catalog}/src/error.rs | 0 .../iceberg-rest-catalog}/src/lib.rs | 0 .../iceberg-rest-catalog}/src/models/catalog_config.rs | 0 .../src/models/commit_table_response.rs | 0 .../src/models/commit_transaction_request.rs | 0 .../src/models/create_namespace_request.rs | 0 .../src/models/create_namespace_response.rs | 0 .../src/models/create_table_request.rs | 0 .../src/models/create_view_request.rs | 0 .../iceberg-rest-catalog}/src/models/error_model.rs | 0 .../src/models/get_namespace_response.rs | 0 .../src/models/iceberg_error_response.rs | 0 .../src/models/list_namespaces_response.rs | 0 .../src/models/list_tables_response.rs | 0 .../src/models/load_table_result.rs | 0 .../src/models/load_view_result.rs | 0 .../iceberg-rest-catalog}/src/models/metric_result.rs | 0 .../iceberg-rest-catalog}/src/models/mod.rs | 0 .../iceberg-rest-catalog}/src/models/o_auth_error.rs | 0 .../src/models/o_auth_token_response.rs | 0 .../src/models/register_table_request.rs | 0 .../src/models/rename_table_request.rs | 0 .../src/models/report_metrics_request.rs | 0 .../iceberg-rest-catalog}/src/models/token_type.rs | 0 .../src/models/update_namespace_properties_request.rs | 0 .../src/models/update_namespace_properties_response.rs | 0 .../iceberg-s3tables-catalog}/Cargo.toml | 6 +++--- .../iceberg-s3tables-catalog}/src/error.rs | 0 .../iceberg-s3tables-catalog}/src/lib.rs | 0 .../iceberg-sql-catalog}/Cargo.toml | 2 +- .../iceberg-sql-catalog}/src/error.rs | 0 .../iceberg-sql-catalog}/src/lib.rs | 0 datafusion_iceberg/Cargo.toml | 4 ++-- 50 files changed, 18 insertions(+), 18 deletions(-) rename {iceberg-file-catalog => catalogs/iceberg-file-catalog}/Cargo.toml (81%) rename {iceberg-file-catalog => catalogs/iceberg-file-catalog}/src/error.rs (100%) rename {iceberg-file-catalog => catalogs/iceberg-file-catalog}/src/lib.rs (99%) rename {iceberg-glue-catalog => catalogs/iceberg-glue-catalog}/Cargo.toml (82%) rename {iceberg-glue-catalog => catalogs/iceberg-glue-catalog}/src/error.rs (100%) rename {iceberg-glue-catalog => catalogs/iceberg-glue-catalog}/src/lib.rs (99%) rename {iceberg-glue-catalog => catalogs/iceberg-glue-catalog}/src/schema.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/.gitignore (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/Cargo.toml (92%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/README.md (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/apis/catalog_api_api.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/apis/configuration.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/apis/configuration_api_api.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/apis/mod.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/apis/o_auth2_api_api.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/catalog.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/error.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/lib.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/catalog_config.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/commit_table_response.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/commit_transaction_request.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/create_namespace_request.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/create_namespace_response.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/create_table_request.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/create_view_request.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/error_model.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/get_namespace_response.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/iceberg_error_response.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/list_namespaces_response.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/list_tables_response.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/load_table_result.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/load_view_result.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/metric_result.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/mod.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/o_auth_error.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/o_auth_token_response.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/register_table_request.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/rename_table_request.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/report_metrics_request.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/token_type.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/update_namespace_properties_request.rs (100%) rename {iceberg-rest-catalog => catalogs/iceberg-rest-catalog}/src/models/update_namespace_properties_response.rs (100%) rename {iceberg-s3tables-catalog => catalogs/iceberg-s3tables-catalog}/Cargo.toml (71%) rename {iceberg-s3tables-catalog => catalogs/iceberg-s3tables-catalog}/src/error.rs (100%) rename {iceberg-s3tables-catalog => catalogs/iceberg-s3tables-catalog}/src/lib.rs (100%) rename {iceberg-sql-catalog => catalogs/iceberg-sql-catalog}/Cargo.toml (92%) rename {iceberg-sql-catalog => catalogs/iceberg-sql-catalog}/src/error.rs (100%) rename {iceberg-sql-catalog => catalogs/iceberg-sql-catalog}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index f53169fe..4c3a19e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,11 +4,11 @@ members = [ "iceberg-rust", "datafusion_iceberg", "datafusion-iceberg-sql", - "iceberg-sql-catalog", - "iceberg-rest-catalog", - "iceberg-file-catalog", - "iceberg-glue-catalog", - "iceberg-s3tables-catalog", + "catalogs/iceberg-sql-catalog", + "catalogs/iceberg-rest-catalog", + "catalogs/iceberg-file-catalog", + "catalogs/iceberg-glue-catalog", + "catalogs/iceberg-s3tables-catalog", ] resolver = "2" diff --git a/iceberg-file-catalog/Cargo.toml b/catalogs/iceberg-file-catalog/Cargo.toml similarity index 81% rename from iceberg-file-catalog/Cargo.toml rename to catalogs/iceberg-file-catalog/Cargo.toml index 9d9121f9..c70e5014 100644 --- a/iceberg-file-catalog/Cargo.toml +++ b/catalogs/iceberg-file-catalog/Cargo.toml @@ -12,7 +12,7 @@ repository = "https://github.com/JanKaul/iceberg-rust" [dependencies] async-trait.workspace = true futures.workspace = true -iceberg-rust = { path = "../iceberg-rust", version = "0.5.8" } +iceberg-rust = { path = "../../iceberg-rust", version = "0.5.8" } object_store.workspace = true serde_json.workspace = true thiserror.workspace = true @@ -23,5 +23,5 @@ uuid = { version = "1.7.0", features = ["v4"] } tokio = "1" testcontainers-modules = { version = "0.8.0", features = ["localstack"] } testcontainers = "0.20.0" -datafusion_iceberg = { path = "../datafusion_iceberg" , version = "0.5.8" } +datafusion_iceberg = { path = "../../datafusion_iceberg" , version = "0.5.8" } datafusion.workspace = true diff --git a/iceberg-file-catalog/src/error.rs b/catalogs/iceberg-file-catalog/src/error.rs similarity index 100% rename from iceberg-file-catalog/src/error.rs rename to catalogs/iceberg-file-catalog/src/error.rs diff --git a/iceberg-file-catalog/src/lib.rs b/catalogs/iceberg-file-catalog/src/lib.rs similarity index 99% rename from iceberg-file-catalog/src/lib.rs rename to catalogs/iceberg-file-catalog/src/lib.rs index af1e69e8..5bc2357d 100644 --- a/iceberg-file-catalog/src/lib.rs +++ b/catalogs/iceberg-file-catalog/src/lib.rs @@ -719,7 +719,7 @@ pub mod tests { L_RECEIPTDATE DATE NOT NULL, L_SHIPINSTRUCT VARCHAR NOT NULL, L_SHIPMODE VARCHAR NOT NULL, - L_COMMENT VARCHAR NOT NULL ) STORED AS CSV LOCATION '../datafusion_iceberg/testdata/tpch/lineitem.csv' OPTIONS ('has_header' 'false');"; + L_COMMENT VARCHAR NOT NULL ) STORED AS CSV LOCATION '../../datafusion_iceberg/testdata/tpch/lineitem.csv' OPTIONS ('has_header' 'false');"; let plan = ctx.state().create_logical_plan(sql).await.unwrap(); diff --git a/iceberg-glue-catalog/Cargo.toml b/catalogs/iceberg-glue-catalog/Cargo.toml similarity index 82% rename from iceberg-glue-catalog/Cargo.toml rename to catalogs/iceberg-glue-catalog/Cargo.toml index fbcfc8a2..63117eaa 100644 --- a/iceberg-glue-catalog/Cargo.toml +++ b/catalogs/iceberg-glue-catalog/Cargo.toml @@ -14,7 +14,7 @@ async-trait.workspace = true aws-config = "1.5.9" aws-sdk-glue = "1.68.0" futures.workspace = true -iceberg-rust = { path = "../iceberg-rust", version = "0.5.8" } +iceberg-rust = { path = "../../iceberg-rust", version = "0.5.8" } object_store.workspace = true serde_json.workspace = true thiserror.workspace = true @@ -25,5 +25,5 @@ uuid = { version = "1.7.0", features = ["v4"] } tokio = "1" testcontainers-modules = { version = "0.8.0", features = ["localstack"] } testcontainers = "0.20.0" -datafusion_iceberg = { path = "../datafusion_iceberg" , version = "0.5.8" } +datafusion_iceberg = { path = "../../datafusion_iceberg" , version = "0.5.8" } datafusion.workspace = true diff --git a/iceberg-glue-catalog/src/error.rs b/catalogs/iceberg-glue-catalog/src/error.rs similarity index 100% rename from iceberg-glue-catalog/src/error.rs rename to catalogs/iceberg-glue-catalog/src/error.rs diff --git a/iceberg-glue-catalog/src/lib.rs b/catalogs/iceberg-glue-catalog/src/lib.rs similarity index 99% rename from iceberg-glue-catalog/src/lib.rs rename to catalogs/iceberg-glue-catalog/src/lib.rs index 09a0ffb9..bef4a769 100644 --- a/iceberg-glue-catalog/src/lib.rs +++ b/catalogs/iceberg-glue-catalog/src/lib.rs @@ -1008,7 +1008,7 @@ pub mod tests { L_RECEIPTDATE DATE NOT NULL, L_SHIPINSTRUCT VARCHAR NOT NULL, L_SHIPMODE VARCHAR NOT NULL, - L_COMMENT VARCHAR NOT NULL ) STORED AS CSV LOCATION '../datafusion_iceberg/testdata/tpch/lineitem.csv' OPTIONS ('has_header' 'false');"; + L_COMMENT VARCHAR NOT NULL ) STORED AS CSV LOCATION '../../datafusion_iceberg/testdata/tpch/lineitem.csv' OPTIONS ('has_header' 'false');"; let plan = ctx.state().create_logical_plan(sql).await.unwrap(); diff --git a/iceberg-glue-catalog/src/schema.rs b/catalogs/iceberg-glue-catalog/src/schema.rs similarity index 100% rename from iceberg-glue-catalog/src/schema.rs rename to catalogs/iceberg-glue-catalog/src/schema.rs diff --git a/iceberg-rest-catalog/.gitignore b/catalogs/iceberg-rest-catalog/.gitignore similarity index 100% rename from iceberg-rest-catalog/.gitignore rename to catalogs/iceberg-rest-catalog/.gitignore diff --git a/iceberg-rest-catalog/Cargo.toml b/catalogs/iceberg-rest-catalog/Cargo.toml similarity index 92% rename from iceberg-rest-catalog/Cargo.toml rename to catalogs/iceberg-rest-catalog/Cargo.toml index 26a33e7c..7015f615 100644 --- a/iceberg-rest-catalog/Cargo.toml +++ b/catalogs/iceberg-rest-catalog/Cargo.toml @@ -14,7 +14,7 @@ serde_json.workspace = true url.workspace = true uuid.workspace = true reqwest-middleware = "0.2.0" -iceberg-rust = { path = "../iceberg-rust", version = "0.5.8" } +iceberg-rust = { path = "../../iceberg-rust", version = "0.5.8" } object_store.workspace = true async-trait.workspace = true futures.workspace = true diff --git a/iceberg-rest-catalog/README.md b/catalogs/iceberg-rest-catalog/README.md similarity index 100% rename from iceberg-rest-catalog/README.md rename to catalogs/iceberg-rest-catalog/README.md diff --git a/iceberg-rest-catalog/src/apis/catalog_api_api.rs b/catalogs/iceberg-rest-catalog/src/apis/catalog_api_api.rs similarity index 100% rename from iceberg-rest-catalog/src/apis/catalog_api_api.rs rename to catalogs/iceberg-rest-catalog/src/apis/catalog_api_api.rs diff --git a/iceberg-rest-catalog/src/apis/configuration.rs b/catalogs/iceberg-rest-catalog/src/apis/configuration.rs similarity index 100% rename from iceberg-rest-catalog/src/apis/configuration.rs rename to catalogs/iceberg-rest-catalog/src/apis/configuration.rs diff --git a/iceberg-rest-catalog/src/apis/configuration_api_api.rs b/catalogs/iceberg-rest-catalog/src/apis/configuration_api_api.rs similarity index 100% rename from iceberg-rest-catalog/src/apis/configuration_api_api.rs rename to catalogs/iceberg-rest-catalog/src/apis/configuration_api_api.rs diff --git a/iceberg-rest-catalog/src/apis/mod.rs b/catalogs/iceberg-rest-catalog/src/apis/mod.rs similarity index 100% rename from iceberg-rest-catalog/src/apis/mod.rs rename to catalogs/iceberg-rest-catalog/src/apis/mod.rs diff --git a/iceberg-rest-catalog/src/apis/o_auth2_api_api.rs b/catalogs/iceberg-rest-catalog/src/apis/o_auth2_api_api.rs similarity index 100% rename from iceberg-rest-catalog/src/apis/o_auth2_api_api.rs rename to catalogs/iceberg-rest-catalog/src/apis/o_auth2_api_api.rs diff --git a/iceberg-rest-catalog/src/catalog.rs b/catalogs/iceberg-rest-catalog/src/catalog.rs similarity index 100% rename from iceberg-rest-catalog/src/catalog.rs rename to catalogs/iceberg-rest-catalog/src/catalog.rs diff --git a/iceberg-rest-catalog/src/error.rs b/catalogs/iceberg-rest-catalog/src/error.rs similarity index 100% rename from iceberg-rest-catalog/src/error.rs rename to catalogs/iceberg-rest-catalog/src/error.rs diff --git a/iceberg-rest-catalog/src/lib.rs b/catalogs/iceberg-rest-catalog/src/lib.rs similarity index 100% rename from iceberg-rest-catalog/src/lib.rs rename to catalogs/iceberg-rest-catalog/src/lib.rs diff --git a/iceberg-rest-catalog/src/models/catalog_config.rs b/catalogs/iceberg-rest-catalog/src/models/catalog_config.rs similarity index 100% rename from iceberg-rest-catalog/src/models/catalog_config.rs rename to catalogs/iceberg-rest-catalog/src/models/catalog_config.rs diff --git a/iceberg-rest-catalog/src/models/commit_table_response.rs b/catalogs/iceberg-rest-catalog/src/models/commit_table_response.rs similarity index 100% rename from iceberg-rest-catalog/src/models/commit_table_response.rs rename to catalogs/iceberg-rest-catalog/src/models/commit_table_response.rs diff --git a/iceberg-rest-catalog/src/models/commit_transaction_request.rs b/catalogs/iceberg-rest-catalog/src/models/commit_transaction_request.rs similarity index 100% rename from iceberg-rest-catalog/src/models/commit_transaction_request.rs rename to catalogs/iceberg-rest-catalog/src/models/commit_transaction_request.rs diff --git a/iceberg-rest-catalog/src/models/create_namespace_request.rs b/catalogs/iceberg-rest-catalog/src/models/create_namespace_request.rs similarity index 100% rename from iceberg-rest-catalog/src/models/create_namespace_request.rs rename to catalogs/iceberg-rest-catalog/src/models/create_namespace_request.rs diff --git a/iceberg-rest-catalog/src/models/create_namespace_response.rs b/catalogs/iceberg-rest-catalog/src/models/create_namespace_response.rs similarity index 100% rename from iceberg-rest-catalog/src/models/create_namespace_response.rs rename to catalogs/iceberg-rest-catalog/src/models/create_namespace_response.rs diff --git a/iceberg-rest-catalog/src/models/create_table_request.rs b/catalogs/iceberg-rest-catalog/src/models/create_table_request.rs similarity index 100% rename from iceberg-rest-catalog/src/models/create_table_request.rs rename to catalogs/iceberg-rest-catalog/src/models/create_table_request.rs diff --git a/iceberg-rest-catalog/src/models/create_view_request.rs b/catalogs/iceberg-rest-catalog/src/models/create_view_request.rs similarity index 100% rename from iceberg-rest-catalog/src/models/create_view_request.rs rename to catalogs/iceberg-rest-catalog/src/models/create_view_request.rs diff --git a/iceberg-rest-catalog/src/models/error_model.rs b/catalogs/iceberg-rest-catalog/src/models/error_model.rs similarity index 100% rename from iceberg-rest-catalog/src/models/error_model.rs rename to catalogs/iceberg-rest-catalog/src/models/error_model.rs diff --git a/iceberg-rest-catalog/src/models/get_namespace_response.rs b/catalogs/iceberg-rest-catalog/src/models/get_namespace_response.rs similarity index 100% rename from iceberg-rest-catalog/src/models/get_namespace_response.rs rename to catalogs/iceberg-rest-catalog/src/models/get_namespace_response.rs diff --git a/iceberg-rest-catalog/src/models/iceberg_error_response.rs b/catalogs/iceberg-rest-catalog/src/models/iceberg_error_response.rs similarity index 100% rename from iceberg-rest-catalog/src/models/iceberg_error_response.rs rename to catalogs/iceberg-rest-catalog/src/models/iceberg_error_response.rs diff --git a/iceberg-rest-catalog/src/models/list_namespaces_response.rs b/catalogs/iceberg-rest-catalog/src/models/list_namespaces_response.rs similarity index 100% rename from iceberg-rest-catalog/src/models/list_namespaces_response.rs rename to catalogs/iceberg-rest-catalog/src/models/list_namespaces_response.rs diff --git a/iceberg-rest-catalog/src/models/list_tables_response.rs b/catalogs/iceberg-rest-catalog/src/models/list_tables_response.rs similarity index 100% rename from iceberg-rest-catalog/src/models/list_tables_response.rs rename to catalogs/iceberg-rest-catalog/src/models/list_tables_response.rs diff --git a/iceberg-rest-catalog/src/models/load_table_result.rs b/catalogs/iceberg-rest-catalog/src/models/load_table_result.rs similarity index 100% rename from iceberg-rest-catalog/src/models/load_table_result.rs rename to catalogs/iceberg-rest-catalog/src/models/load_table_result.rs diff --git a/iceberg-rest-catalog/src/models/load_view_result.rs b/catalogs/iceberg-rest-catalog/src/models/load_view_result.rs similarity index 100% rename from iceberg-rest-catalog/src/models/load_view_result.rs rename to catalogs/iceberg-rest-catalog/src/models/load_view_result.rs diff --git a/iceberg-rest-catalog/src/models/metric_result.rs b/catalogs/iceberg-rest-catalog/src/models/metric_result.rs similarity index 100% rename from iceberg-rest-catalog/src/models/metric_result.rs rename to catalogs/iceberg-rest-catalog/src/models/metric_result.rs diff --git a/iceberg-rest-catalog/src/models/mod.rs b/catalogs/iceberg-rest-catalog/src/models/mod.rs similarity index 100% rename from iceberg-rest-catalog/src/models/mod.rs rename to catalogs/iceberg-rest-catalog/src/models/mod.rs diff --git a/iceberg-rest-catalog/src/models/o_auth_error.rs b/catalogs/iceberg-rest-catalog/src/models/o_auth_error.rs similarity index 100% rename from iceberg-rest-catalog/src/models/o_auth_error.rs rename to catalogs/iceberg-rest-catalog/src/models/o_auth_error.rs diff --git a/iceberg-rest-catalog/src/models/o_auth_token_response.rs b/catalogs/iceberg-rest-catalog/src/models/o_auth_token_response.rs similarity index 100% rename from iceberg-rest-catalog/src/models/o_auth_token_response.rs rename to catalogs/iceberg-rest-catalog/src/models/o_auth_token_response.rs diff --git a/iceberg-rest-catalog/src/models/register_table_request.rs b/catalogs/iceberg-rest-catalog/src/models/register_table_request.rs similarity index 100% rename from iceberg-rest-catalog/src/models/register_table_request.rs rename to catalogs/iceberg-rest-catalog/src/models/register_table_request.rs diff --git a/iceberg-rest-catalog/src/models/rename_table_request.rs b/catalogs/iceberg-rest-catalog/src/models/rename_table_request.rs similarity index 100% rename from iceberg-rest-catalog/src/models/rename_table_request.rs rename to catalogs/iceberg-rest-catalog/src/models/rename_table_request.rs diff --git a/iceberg-rest-catalog/src/models/report_metrics_request.rs b/catalogs/iceberg-rest-catalog/src/models/report_metrics_request.rs similarity index 100% rename from iceberg-rest-catalog/src/models/report_metrics_request.rs rename to catalogs/iceberg-rest-catalog/src/models/report_metrics_request.rs diff --git a/iceberg-rest-catalog/src/models/token_type.rs b/catalogs/iceberg-rest-catalog/src/models/token_type.rs similarity index 100% rename from iceberg-rest-catalog/src/models/token_type.rs rename to catalogs/iceberg-rest-catalog/src/models/token_type.rs diff --git a/iceberg-rest-catalog/src/models/update_namespace_properties_request.rs b/catalogs/iceberg-rest-catalog/src/models/update_namespace_properties_request.rs similarity index 100% rename from iceberg-rest-catalog/src/models/update_namespace_properties_request.rs rename to catalogs/iceberg-rest-catalog/src/models/update_namespace_properties_request.rs diff --git a/iceberg-rest-catalog/src/models/update_namespace_properties_response.rs b/catalogs/iceberg-rest-catalog/src/models/update_namespace_properties_response.rs similarity index 100% rename from iceberg-rest-catalog/src/models/update_namespace_properties_response.rs rename to catalogs/iceberg-rest-catalog/src/models/update_namespace_properties_response.rs diff --git a/iceberg-s3tables-catalog/Cargo.toml b/catalogs/iceberg-s3tables-catalog/Cargo.toml similarity index 71% rename from iceberg-s3tables-catalog/Cargo.toml rename to catalogs/iceberg-s3tables-catalog/Cargo.toml index 10941124..1bca407f 100644 --- a/iceberg-s3tables-catalog/Cargo.toml +++ b/catalogs/iceberg-s3tables-catalog/Cargo.toml @@ -3,7 +3,7 @@ name = "iceberg-s3tables-catalog" version = "0.5.8" edition = "2021" -description = "Glue catalog for the unofficial Iceberg table format implementation" +description = "S3Tables catalog for the unofficial Iceberg table format implementation" license = "Apache-2.0" @@ -14,7 +14,7 @@ async-trait.workspace = true aws-config = "1.5.9" aws-sdk-s3tables = "1.0.0" futures.workspace = true -iceberg-rust = { path = "../iceberg-rust", version = "0.5.8" } +iceberg-rust = { path = "../../iceberg-rust", version = "0.5.8" } object_store.workspace = true serde_json.workspace = true thiserror.workspace = true @@ -25,5 +25,5 @@ uuid = { version = "1.7.0", features = ["v4"] } tokio = "1" testcontainers-modules = { version = "0.8.0", features = ["localstack"] } testcontainers = "0.20.0" -datafusion_iceberg = { path = "../datafusion_iceberg" , version = "0.5.8" } +datafusion_iceberg = { path = "../../datafusion_iceberg" , version = "0.5.8" } datafusion.workspace = true diff --git a/iceberg-s3tables-catalog/src/error.rs b/catalogs/iceberg-s3tables-catalog/src/error.rs similarity index 100% rename from iceberg-s3tables-catalog/src/error.rs rename to catalogs/iceberg-s3tables-catalog/src/error.rs diff --git a/iceberg-s3tables-catalog/src/lib.rs b/catalogs/iceberg-s3tables-catalog/src/lib.rs similarity index 100% rename from iceberg-s3tables-catalog/src/lib.rs rename to catalogs/iceberg-s3tables-catalog/src/lib.rs diff --git a/iceberg-sql-catalog/Cargo.toml b/catalogs/iceberg-sql-catalog/Cargo.toml similarity index 92% rename from iceberg-sql-catalog/Cargo.toml rename to catalogs/iceberg-sql-catalog/Cargo.toml index cdef7531..4575643f 100644 --- a/iceberg-sql-catalog/Cargo.toml +++ b/catalogs/iceberg-sql-catalog/Cargo.toml @@ -17,7 +17,7 @@ runtime-async-std = ["sqlx/runtime-async-std"] [dependencies] async-trait.workspace = true futures.workspace = true -iceberg-rust = { path = "../iceberg-rust", version = "0.5.8" } +iceberg-rust = { path = "../../iceberg-rust", version = "0.5.8" } object_store.workspace = true serde_json.workspace = true sqlx = { version = "0.8", features = ["tls-rustls", "any", "sqlite", "postgres", "mysql"], default-features = false } diff --git a/iceberg-sql-catalog/src/error.rs b/catalogs/iceberg-sql-catalog/src/error.rs similarity index 100% rename from iceberg-sql-catalog/src/error.rs rename to catalogs/iceberg-sql-catalog/src/error.rs diff --git a/iceberg-sql-catalog/src/lib.rs b/catalogs/iceberg-sql-catalog/src/lib.rs similarity index 100% rename from iceberg-sql-catalog/src/lib.rs rename to catalogs/iceberg-sql-catalog/src/lib.rs diff --git a/datafusion_iceberg/Cargo.toml b/datafusion_iceberg/Cargo.toml index 257ab76c..d19da42a 100644 --- a/datafusion_iceberg/Cargo.toml +++ b/datafusion_iceberg/Cargo.toml @@ -28,8 +28,8 @@ regex = "1.11.0" [dev-dependencies] tokio = "1" -iceberg-sql-catalog = { path = "../iceberg-sql-catalog" } -iceberg-rest-catalog = { path = "../iceberg-rest-catalog" } +iceberg-sql-catalog = { path = "../catalogs/iceberg-sql-catalog" } +iceberg-rest-catalog = { path = "../catalogs/iceberg-rest-catalog" } testcontainers-modules = { version = "0.8.0", features = ["localstack", "postgres"] } testcontainers = "0.20.0" tokio-stream = { version = "0.1.15", features = ["io-util"] }