Merge pull request #90 from JanKaul/move-catalogs

move catalogs to separate directory
JanKaul · Dec 9, 2024 · eadb764 · eadb764
2 parents 1c27df5 + 145e85b
commit eadb764
Show file tree

Hide file tree

Showing 50 changed files with 18 additions and 18 deletions.
diff --git 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 → catalogs/iceberg-file-catalog/Cargo.toml b/iceberg-file-catalog/Cargo.toml → 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 → catalogs/iceberg-file-catalog/src/error.rs b/iceberg-file-catalog/src/error.rs → catalogs/iceberg-file-catalog/src/error.rs
diff --git a/iceberg-file-catalog/src/lib.rs → catalogs/iceberg-file-catalog/src/lib.rs b/iceberg-file-catalog/src/lib.rs → 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 → catalogs/iceberg-glue-catalog/Cargo.toml b/iceberg-glue-catalog/Cargo.toml → 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 → catalogs/iceberg-glue-catalog/src/error.rs b/iceberg-glue-catalog/src/error.rs → catalogs/iceberg-glue-catalog/src/error.rs
diff --git a/iceberg-glue-catalog/src/lib.rs → catalogs/iceberg-glue-catalog/src/lib.rs b/iceberg-glue-catalog/src/lib.rs → 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 → catalogs/iceberg-glue-catalog/src/schema.rs b/iceberg-glue-catalog/src/schema.rs → catalogs/iceberg-glue-catalog/src/schema.rs
diff --git a/iceberg-rest-catalog/.gitignore → catalogs/iceberg-rest-catalog/.gitignore b/iceberg-rest-catalog/.gitignore → catalogs/iceberg-rest-catalog/.gitignore
diff --git a/iceberg-rest-catalog/Cargo.toml → catalogs/iceberg-rest-catalog/Cargo.toml b/iceberg-rest-catalog/Cargo.toml → 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 → catalogs/iceberg-rest-catalog/README.md b/iceberg-rest-catalog/README.md → catalogs/iceberg-rest-catalog/README.md
diff --git a/...-rest-catalog/src/apis/catalog_api_api.rs → ...-rest-catalog/src/apis/catalog_api_api.rs b/...-rest-catalog/src/apis/catalog_api_api.rs → ...-rest-catalog/src/apis/catalog_api_api.rs
diff --git a/...rg-rest-catalog/src/apis/configuration.rs → ...rg-rest-catalog/src/apis/configuration.rs b/...rg-rest-catalog/src/apis/configuration.rs → ...rg-rest-catalog/src/apis/configuration.rs
diff --git a/...catalog/src/apis/configuration_api_api.rs → ...catalog/src/apis/configuration_api_api.rs b/...catalog/src/apis/configuration_api_api.rs → ...catalog/src/apis/configuration_api_api.rs
diff --git a/iceberg-rest-catalog/src/apis/mod.rs → ...logs/iceberg-rest-catalog/src/apis/mod.rs b/iceberg-rest-catalog/src/apis/mod.rs → ...logs/iceberg-rest-catalog/src/apis/mod.rs
diff --git a/...-rest-catalog/src/apis/o_auth2_api_api.rs → ...-rest-catalog/src/apis/o_auth2_api_api.rs b/...-rest-catalog/src/apis/o_auth2_api_api.rs → ...-rest-catalog/src/apis/o_auth2_api_api.rs
diff --git a/iceberg-rest-catalog/src/catalog.rs → catalogs/iceberg-rest-catalog/src/catalog.rs b/iceberg-rest-catalog/src/catalog.rs → catalogs/iceberg-rest-catalog/src/catalog.rs
diff --git a/iceberg-rest-catalog/src/error.rs → catalogs/iceberg-rest-catalog/src/error.rs b/iceberg-rest-catalog/src/error.rs → catalogs/iceberg-rest-catalog/src/error.rs
diff --git a/iceberg-rest-catalog/src/lib.rs → catalogs/iceberg-rest-catalog/src/lib.rs b/iceberg-rest-catalog/src/lib.rs → catalogs/iceberg-rest-catalog/src/lib.rs
diff --git a/...rest-catalog/src/models/catalog_config.rs → ...rest-catalog/src/models/catalog_config.rs b/...rest-catalog/src/models/catalog_config.rs → ...rest-catalog/src/models/catalog_config.rs
diff --git a/...talog/src/models/commit_table_response.rs → ...talog/src/models/commit_table_response.rs b/...talog/src/models/commit_table_response.rs → ...talog/src/models/commit_table_response.rs
diff --git a/.../src/models/commit_transaction_request.rs → .../src/models/commit_transaction_request.rs b/.../src/models/commit_transaction_request.rs → .../src/models/commit_transaction_request.rs
diff --git a/...og/src/models/create_namespace_request.rs → ...og/src/models/create_namespace_request.rs b/...og/src/models/create_namespace_request.rs → ...og/src/models/create_namespace_request.rs
diff --git a/...g/src/models/create_namespace_response.rs → ...g/src/models/create_namespace_response.rs b/...g/src/models/create_namespace_response.rs → ...g/src/models/create_namespace_response.rs
diff --git a/...atalog/src/models/create_table_request.rs → ...atalog/src/models/create_table_request.rs b/...atalog/src/models/create_table_request.rs → ...atalog/src/models/create_table_request.rs
diff --git a/...catalog/src/models/create_view_request.rs → ...catalog/src/models/create_view_request.rs b/...catalog/src/models/create_view_request.rs → ...catalog/src/models/create_view_request.rs
diff --git a/...rg-rest-catalog/src/models/error_model.rs → ...rg-rest-catalog/src/models/error_model.rs b/...rg-rest-catalog/src/models/error_model.rs → ...rg-rest-catalog/src/models/error_model.rs
diff --git a/...alog/src/models/get_namespace_response.rs → ...alog/src/models/get_namespace_response.rs b/...alog/src/models/get_namespace_response.rs → ...alog/src/models/get_namespace_response.rs
diff --git a/...alog/src/models/iceberg_error_response.rs → ...alog/src/models/iceberg_error_response.rs b/...alog/src/models/iceberg_error_response.rs → ...alog/src/models/iceberg_error_response.rs
diff --git a/...og/src/models/list_namespaces_response.rs → ...og/src/models/list_namespaces_response.rs b/...og/src/models/list_namespaces_response.rs → ...og/src/models/list_namespaces_response.rs
diff --git a/...atalog/src/models/list_tables_response.rs → ...atalog/src/models/list_tables_response.rs b/...atalog/src/models/list_tables_response.rs → ...atalog/src/models/list_tables_response.rs
diff --git a/...t-catalog/src/models/load_table_result.rs → ...t-catalog/src/models/load_table_result.rs b/...t-catalog/src/models/load_table_result.rs → ...t-catalog/src/models/load_table_result.rs
diff --git a/...st-catalog/src/models/load_view_result.rs → ...st-catalog/src/models/load_view_result.rs b/...st-catalog/src/models/load_view_result.rs → ...st-catalog/src/models/load_view_result.rs
diff --git a/...-rest-catalog/src/models/metric_result.rs → ...-rest-catalog/src/models/metric_result.rs b/...-rest-catalog/src/models/metric_result.rs → ...-rest-catalog/src/models/metric_result.rs
diff --git a/iceberg-rest-catalog/src/models/mod.rs → ...gs/iceberg-rest-catalog/src/models/mod.rs b/iceberg-rest-catalog/src/models/mod.rs → ...gs/iceberg-rest-catalog/src/models/mod.rs
diff --git a/...g-rest-catalog/src/models/o_auth_error.rs → ...g-rest-catalog/src/models/o_auth_error.rs b/...g-rest-catalog/src/models/o_auth_error.rs → ...g-rest-catalog/src/models/o_auth_error.rs
diff --git a/...talog/src/models/o_auth_token_response.rs → ...talog/src/models/o_auth_token_response.rs b/...talog/src/models/o_auth_token_response.rs → ...talog/src/models/o_auth_token_response.rs
diff --git a/...alog/src/models/register_table_request.rs → ...alog/src/models/register_table_request.rs b/...alog/src/models/register_table_request.rs → ...alog/src/models/register_table_request.rs
diff --git a/...atalog/src/models/rename_table_request.rs → ...atalog/src/models/rename_table_request.rs b/...atalog/src/models/rename_table_request.rs → ...atalog/src/models/rename_table_request.rs
diff --git a/...alog/src/models/report_metrics_request.rs → ...alog/src/models/report_metrics_request.rs b/...alog/src/models/report_metrics_request.rs → ...alog/src/models/report_metrics_request.rs
diff --git a/...erg-rest-catalog/src/models/token_type.rs → ...erg-rest-catalog/src/models/token_type.rs b/...erg-rest-catalog/src/models/token_type.rs → ...erg-rest-catalog/src/models/token_type.rs
diff --git a/...ls/update_namespace_properties_request.rs → ...ls/update_namespace_properties_request.rs b/...ls/update_namespace_properties_request.rs → ...ls/update_namespace_properties_request.rs
diff --git a/...s/update_namespace_properties_response.rs → ...s/update_namespace_properties_response.rs b/...s/update_namespace_properties_response.rs → ...s/update_namespace_properties_response.rs
diff --git a/iceberg-s3tables-catalog/Cargo.toml → catalogs/iceberg-s3tables-catalog/Cargo.toml b/iceberg-s3tables-catalog/Cargo.toml → 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 → ...ogs/iceberg-s3tables-catalog/src/error.rs b/iceberg-s3tables-catalog/src/error.rs → ...ogs/iceberg-s3tables-catalog/src/error.rs
diff --git a/iceberg-s3tables-catalog/src/lib.rs → catalogs/iceberg-s3tables-catalog/src/lib.rs b/iceberg-s3tables-catalog/src/lib.rs → catalogs/iceberg-s3tables-catalog/src/lib.rs
diff --git a/iceberg-sql-catalog/Cargo.toml → catalogs/iceberg-sql-catalog/Cargo.toml b/iceberg-sql-catalog/Cargo.toml → 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 → catalogs/iceberg-sql-catalog/src/error.rs b/iceberg-sql-catalog/src/error.rs → catalogs/iceberg-sql-catalog/src/error.rs
diff --git a/iceberg-sql-catalog/src/lib.rs → catalogs/iceberg-sql-catalog/src/lib.rs b/iceberg-sql-catalog/src/lib.rs → catalogs/iceberg-sql-catalog/src/lib.rs
diff --git 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"] }