Rename stage #2

Author: rampage644

crates/metastore/src/models/table.rs

@@ -17,7 +17,7 @@
 
 use crate::error::{MetastoreError, MetastoreResult};
 use iceberg_rust::{
-    catalog::commit::{TableRequirement, TableUpdate},
+    catalog::commit::{TableRequirement, TableUpdate as IcebergTableUpdate},
     spec::table_metadata::TableMetadata,
 };
 use iceberg_rust_spec::{
@@ -333,7 +333,7 @@ pub struct IceBucketTableUpdate {
     /// Commit will fail if the requirements are not met.
     pub requirements: Vec<TableRequirement>,
     /// The updates of the table.
-    pub updates: Vec<TableUpdate>,
+    pub updates: Vec<IcebergTableUpdate>,
 }
 
 pub struct TableRequirementExt(TableRequirement);

crates/runtime/src/http/catalog/schemas.rs

@@ -24,7 +24,7 @@ use iceberg_rest_catalog::models::{
     CreateNamespaceRequest, CreateNamespaceResponse, CreateTableRequest, GetNamespaceResponse,
     ListNamespacesResponse, ListTablesResponse,
 };
-use iceberg_rust::catalog::commit::{TableRequirement, TableUpdate};
+use iceberg_rust::catalog::commit::{TableRequirement, TableUpdate as IcebergTableUpdate};
 use iceberg_rust_spec::identifier::Identifier;
 use serde::{Deserialize, Serialize};
 
@@ -121,5 +121,5 @@ pub struct CommitTable {
     /// Assertions about the metadata that must be true to update the metadata
     pub requirements: Vec<TableRequirement>,
     /// Changes to the table metadata
-    pub updates: Vec<TableUpdate>,
+    pub updates: Vec<IcebergTableUpdate>,
 }

crates/runtime/src/http/ui/databases/handlers.rs

@@ -31,7 +31,7 @@ use axum::{
     Json,
 };
 use embucket_metastore::error::MetastoreError;
-use embucket_metastore::IceBucketDatabase;
+use embucket_metastore::IceBucketDatabase as MetastoreDatabase;
 use embucket_utils::list_config::ListConfig;
 use utoipa::OpenApi;
 use validator::Validate;
@@ -78,7 +78,7 @@ pub async fn create_database(
     State(state): State<AppState>,
     Json(database): Json<DatabaseCreatePayload>,
 ) -> DatabasesResult<Json<DatabaseCreateResponse>> {
-    let database: IceBucketDatabase = database.data.into();
+    let database: MetastoreDatabase = database.data.into();
     database.validate().map_err(|e| DatabasesAPIError::Create {
         source: MetastoreError::Validation { source: e },
     })?;
@@ -172,7 +172,7 @@ pub async fn update_database(
     Path(database_name): Path<String>,
     Json(database): Json<DatabaseUpdatePayload>,
 ) -> DatabasesResult<Json<DatabaseUpdateResponse>> {
-    let database: IceBucketDatabase = database.data.into();
+    let database: MetastoreDatabase = database.data.into();
     database.validate().map_err(|e| DatabasesAPIError::Update {
         source: MetastoreError::Validation { source: e },
     })?;

crates/runtime/src/http/ui/databases/models.rs

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use embucket_metastore::models::IceBucketDatabase;
+use embucket_metastore::models::IceBucketDatabase as MetastoreDatabase;
 use serde::{Deserialize, Serialize};
 use utoipa::{IntoParams, ToSchema};
 
@@ -25,8 +25,8 @@ pub struct Database {
     pub volume: String,
 }
 
-impl From<IceBucketDatabase> for Database {
-    fn from(db: IceBucketDatabase) -> Self {
+impl From<MetastoreDatabase> for Database {
+    fn from(db: MetastoreDatabase) -> Self {
         Self {
             name: db.ident,
             volume: db.volume,
@@ -36,9 +36,9 @@ impl From<IceBucketDatabase> for Database {
 
 // TODO: Remove it when found why it can't locate .into() if only From trait implemeted
 #[allow(clippy::from_over_into)]
-impl Into<IceBucketDatabase> for Database {
-    fn into(self) -> IceBucketDatabase {
-        IceBucketDatabase {
+impl Into<MetastoreDatabase> for Database {
+    fn into(self) -> MetastoreDatabase {
+        MetastoreDatabase {
             ident: self.name,
             volume: self.volume,
             properties: None,

crates/runtime/src/http/ui/schemas/handlers.rs

@@ -31,8 +31,8 @@ use axum::{
     Json,
 };
 use embucket_metastore::error::MetastoreError;
-use embucket_metastore::models::IceBucketSchemaIdent;
-use embucket_metastore::IceBucketSchema;
+use embucket_metastore::models::IceBucketSchemaIdent as MetastoreSchemaIdent;
+use embucket_metastore::IceBucketSchema as MetastoreSchema;
 use embucket_utils::list_config::ListConfig;
 use std::collections::HashMap;
 use std::convert::From;
@@ -85,8 +85,8 @@ pub async fn create_schema(
     Path(database_name): Path<String>,
     Json(payload): Json<SchemaCreatePayload>,
 ) -> SchemasResult<Json<SchemaCreateResponse>> {
-    let ident = IceBucketSchemaIdent::new(database_name, payload.name);
-    let schema = IceBucketSchema {
+    let ident = MetastoreSchemaIdent::new(database_name, payload.name);
+    let schema = MetastoreSchema {
         ident,
         properties: Some(HashMap::new()),
     };
@@ -123,7 +123,7 @@ pub async fn delete_schema(
     Query(query): Query<QueryParameters>,
     Path((database_name, schema_name)): Path<(String, String)>,
 ) -> SchemasResult<()> {
-    let ident = IceBucketSchemaIdent::new(database_name, schema_name);
+    let ident = MetastoreSchemaIdent::new(database_name, schema_name);
     state
         .metastore
         .delete_schema(&ident, query.cascade.unwrap_or_default())
@@ -151,7 +151,7 @@ pub async fn get_schema(
     State(state): State<AppState>,
     Path((database_name, schema_name)): Path<(String, String)>,
 ) -> SchemasResult<Json<SchemaResponse>> {
-    let schema_ident = IceBucketSchemaIdent {
+    let schema_ident = MetastoreSchemaIdent {
         database: database_name.clone(),
         schema: schema_name.clone(),
     };
@@ -191,7 +191,7 @@ pub async fn update_schema(
     Path((database_name, schema_name)): Path<(String, String)>,
     Json(schema): Json<SchemaUpdatePayload>,
 ) -> SchemasResult<Json<SchemaUpdateResponse>> {
-    let schema_ident = IceBucketSchemaIdent::new(database_name, schema_name);
+    let schema_ident = MetastoreSchemaIdent::new(database_name, schema_name);
     // TODO: Implement schema renames
     state
         .metastore

crates/runtime/src/http/ui/tables/handlers.rs

@@ -37,7 +37,9 @@ use axum::{
 };
 use datafusion::arrow::csv::reader::Format;
 use embucket_metastore::error::MetastoreError;
-use embucket_metastore::{IceBucketSchemaIdent, IceBucketTableIdent};
+use embucket_metastore::{
+    IceBucketSchemaIdent as MetastoreSchemaIdent, IceBucketTableIdent as MetastoreTableIdent,
+};
 use embucket_utils::list_config::ListConfig;
 use snafu::ResultExt;
 use std::time::Instant;
@@ -94,7 +96,7 @@ pub async fn get_table_statistics(
     State(state): State<AppState>,
     Path((database_name, schema_name, table_name)): Path<(String, String, String)>,
 ) -> TablesResult<Json<TableStatisticsResponse>> {
-    let ident = IceBucketTableIdent::new(&database_name, &schema_name, &table_name);
+    let ident = MetastoreTableIdent::new(&database_name, &schema_name, &table_name);
     match state.metastore.get_table(&ident).await {
         Ok(Some(rw_object)) => {
             let mut total_bytes = 0;
@@ -216,7 +218,7 @@ pub async fn get_table_preview_data(
         database: Some(database_name.clone()),
         schema: Some(schema_name.clone()),
     };
-    let ident = IceBucketTableIdent::new(&database_name, &schema_name, &table_name);
+    let ident = MetastoreTableIdent::new(&database_name, &schema_name, &table_name);
     let column_names = match state.metastore.get_table(&ident).await {
         Ok(Some(rw_object)) => {
             if let Ok(schema) = rw_object.metadata.current_schema(None) {
@@ -338,7 +340,7 @@ pub async fn upload_file(
                 .execution_svc
                 .upload_data_to_table(
                     &session_id,
-                    &IceBucketTableIdent {
+                    &MetastoreTableIdent {
                         table: table_name.clone(),
                         schema: schema_name.clone(),
                         database: database_name.clone(),
@@ -392,7 +394,7 @@ pub async fn get_tables(
     State(state): State<AppState>,
     Path((database_name, schema_name)): Path<(String, String)>,
 ) -> TablesResult<Json<TablesResponse>> {
-    let ident = IceBucketSchemaIdent::new(database_name, schema_name);
+    let ident = MetastoreSchemaIdent::new(database_name, schema_name);
     state
         .metastore
         .list_tables(

crates/runtime/src/http/ui/tests/databases.rs

@@ -24,8 +24,10 @@ use crate::http::ui::databases::models::{
 use crate::http::ui::tests::common::{req, ui_test_op, Entity, Op};
 use crate::http::ui::volumes::models::{Volume, VolumeCreatePayload, VolumeCreateResponse};
 use crate::tests::run_icebucket_test_server;
-use embucket_metastore::IceBucketVolumeType;
-use embucket_metastore::{IceBucketDatabase, IceBucketVolume};
+use embucket_metastore::IceBucketVolumeType as MetastoreVolumeType;
+use embucket_metastore::{
+    IceBucketDatabase as MetastoreDatabase, IceBucketVolume as MetastoreVolume,
+};
 use http::Method;
 
 #[tokio::test]
@@ -42,9 +44,9 @@ async fn test_ui_databases_metastore_update_bug() {
         Op::Create,
         None,
         &Entity::Volume(VolumeCreatePayload {
-            data: Volume::from(IceBucketVolume {
+            data: Volume::from(MetastoreVolume {
                 ident: String::from("t"),
-                volume: IceBucketVolumeType::Memory,
+                volume: MetastoreVolumeType::Memory,
             }),
         }),
     )
@@ -56,7 +58,7 @@ async fn test_ui_databases_metastore_update_bug() {
 
     // Create database, Ok
     let expected = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: "test".to_string(),
             properties: None,
             volume: volume.data.name.clone(),
@@ -73,7 +75,7 @@ async fn test_ui_databases_metastore_update_bug() {
 
     // Update database test -> new-test, Ok
     let new_database = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: "new-test".to_string(),
             properties: None,
             volume: volume.data.name.clone(),
@@ -144,9 +146,9 @@ async fn test_ui_databases() {
         Op::Create,
         None,
         &Entity::Volume(VolumeCreatePayload {
-            data: Volume::from(IceBucketVolume {
+            data: Volume::from(MetastoreVolume {
                 ident: String::new(),
-                volume: IceBucketVolumeType::Memory,
+                volume: MetastoreVolumeType::Memory,
             }),
         }),
     )
@@ -155,7 +157,7 @@ async fn test_ui_databases() {
 
     // Create database with empty name, error 400
     let expected = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: String::new(),
             properties: None,
             volume: volume.data.name.clone(),
@@ -177,7 +179,7 @@ async fn test_ui_databases() {
 
     // Create database, Ok
     let expected1 = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: "test".to_string(),
             properties: None,
             volume: volume.data.name.clone(),
@@ -190,23 +192,23 @@ async fn test_ui_databases() {
     assert_eq!(expected1.data, created_database.data);
 
     let expected2 = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: "test2".to_string(),
             properties: None,
             volume: volume.data.name.clone(),
         }
         .into(),
     };
     let expected3 = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: "test3".to_string(),
             properties: None,
             volume: volume.data.name.clone(),
         }
         .into(),
     };
     let expected4 = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: "test4".to_string(),
             properties: None,
             volume: volume.data.name.clone(),
@@ -281,7 +283,7 @@ async fn test_ui_databases() {
 
     // Create database with another name, Ok
     let expected_another = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: "name".to_string(),
             properties: None,
             volume: volume.data.name.clone(),

crates/runtime/src/http/ui/tests/navigation_trees.rs

@@ -26,8 +26,10 @@ use crate::http::ui::tests::common::{ui_test_op, Entity, Op};
 use crate::http::ui::volumes::models::{Volume, VolumeCreatePayload, VolumeCreateResponse};
 use crate::http::ui::worksheets::models::{WorksheetCreatePayload, WorksheetResponse};
 use crate::tests::run_icebucket_test_server;
-use embucket_metastore::IceBucketVolumeType;
-use embucket_metastore::{IceBucketDatabase, IceBucketVolume};
+use embucket_metastore::IceBucketVolumeType as MetastoreVolumeType;
+use embucket_metastore::{
+    IceBucketDatabase as MetastoreDatabase, IceBucketVolume as MetastoreVolume,
+};
 use http::Method;
 use serde_json::json;
 
@@ -49,9 +51,9 @@ async fn test_ui_databases_navigation() {
         Op::Create,
         None,
         &Entity::Volume(VolumeCreatePayload {
-            data: Volume::from(IceBucketVolume {
+            data: Volume::from(MetastoreVolume {
                 ident: String::new(),
-                volume: IceBucketVolumeType::Memory,
+                volume: MetastoreVolumeType::Memory,
             }),
         }),
     )
@@ -60,31 +62,31 @@ async fn test_ui_databases_navigation() {
 
     // Create database, Ok
     let expected1 = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: "test1".to_string(),
             properties: None,
             volume: volume.data.name.clone(),
         }
         .into(),
     };
     let expected2 = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: "test2".to_string(),
             properties: None,
             volume: volume.data.name.clone(),
         }
         .into(),
     };
     let expected3 = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: "test3".to_string(),
             properties: None,
             volume: volume.data.name.clone(),
         }
         .into(),
     };
     let expected4 = DatabaseCreatePayload {
-        data: IceBucketDatabase {
+        data: MetastoreDatabase {
             ident: "test4".to_string(),
             properties: None,
             volume: volume.data.name.clone(),

crates/runtime/src/http/ui/tests/schemas.rs

@@ -22,7 +22,10 @@ use crate::http::ui::schemas::models::{SchemaCreatePayload, SchemasResponse};
 use crate::http::ui::tests::common::{req, ui_test_op, Entity, Op};
 use crate::http::ui::volumes::models::{Volume, VolumeCreatePayload, VolumeCreateResponse};
 use crate::tests::run_icebucket_test_server;
-use embucket_metastore::{IceBucketDatabase, IceBucketVolume, IceBucketVolumeType};
+use embucket_metastore::{
+    IceBucketDatabase as MetastoreDatabase, IceBucketVolume as MetastoreVolume,
+    IceBucketVolumeType as MetastoreVolumeType,
+};
 use http::Method;
 use serde_json::json;
 
@@ -38,9 +41,9 @@ async fn test_ui_schemas() {
         Op::Create,
         None,
         &Entity::Volume(VolumeCreatePayload {
-            data: Volume::from(IceBucketVolume {
+            data: Volume::from(MetastoreVolume {
                 ident: String::new(),
-                volume: IceBucketVolumeType::Memory,
+                volume: MetastoreVolumeType::Memory,
             }),
         }),
     )
@@ -49,7 +52,7 @@ async fn test_ui_schemas() {
 
     let database_name = "test1".to_string();
     // Create database, Ok
-    let expected1 = IceBucketDatabase {
+    let expected1 = MetastoreDatabase {
         ident: database_name.clone(),
         properties: None,
         volume: volume.data.name.clone(),