Rename stage #5

Author: rampage644

crates/metastore/src/metastore.rs

@@ -125,13 +125,13 @@ pub trait Metastore: std::fmt::Debug + Send + Sync {
 
 ///
 /// vol -> List of volumes
-/// vol/<name> -> `IceBucketVolume`
+/// vol/<name> -> `Volume`
 /// db -> List of databases
-/// db/<name> -> `IceBucketDatabase`
+/// db/<name> -> `Database`
 /// sch/<db> -> List of schemas for <db>
-/// sch/<db>/<name> -> `IceBucketSchema`
+/// sch/<db>/<name> -> `Schema`
 /// tbl/<db>/<schema> -> List of tables for <schema> in <db>
-/// tbl/<db>/<schema>/<table> -> `IceBucketTable`
+/// tbl/<db>/<schema>/<table> -> `Table`
 ///
 const KEY_VOLUME: &str = "vol";
 const KEY_DATABASE: &str = "db";

crates/runtime/src/execution/catalogs/metastore.rs

@@ -43,7 +43,7 @@ use object_store::ObjectStore;
 use snafu::ResultExt;
 use url::Url;
 
-pub const DEFAULT_CATALOG: &str = "icebucket";
+pub const DEFAULT_CATALOG: &str = "embucket";
 
 pub type TableProviderCache = DashMap<String, Arc<dyn TableProvider>>;
 pub type SchemaProviderCache = DashMap<String, TableProviderCache>;

crates/runtime/src/execution/query.rs

@@ -129,7 +129,7 @@ impl IceBucketQuery {
             .database
             .clone()
             .or_else(|| self.session.get_session_variable("database"))
-            .or_else(|| Some("icebucket".to_string()))
+            .or_else(|| Some("embucket".to_string()))
     }
 
     fn current_schema(&self) -> Option<String> {

crates/runtime/src/execution/tests/query.rs

@@ -305,7 +305,7 @@ async fn test_context_name_injection() {
 async fn test_create_table_with_timestamp_nanosecond() {
     let (execution_svc, session_id) = prepare_env().await;
     let table_ident = MetastoreTableIdent {
-        database: "icebucket".to_string(),
+        database: "embucket".to_string(),
         schema: "public".to_string(),
         table: "target_table".to_string(),
     };
@@ -332,7 +332,7 @@ async fn test_create_table_with_timestamp_nanosecond() {
 async fn test_drop_table() {
     let (execution_svc, session_id) = prepare_env().await;
     let table_ident = MetastoreTableIdent {
-        database: "icebucket".to_string(),
+        database: "embucket".to_string(),
         schema: "public".to_string(),
         table: "target_table".to_string(),
     };
@@ -389,17 +389,17 @@ async fn prepare_env() -> (ExecutionService, String) {
         .expect("Failed to create volume");
     metastore
         .create_database(
-            &"icebucket".to_string(),
+            &"embucket".to_string(),
             MetastoreDatabase {
-                ident: "icebucket".to_string(),
+                ident: "embucket".to_string(),
                 properties: None,
                 volume: "test_volume".to_string(),
             },
         )
         .await
         .expect("Failed to create database");
     let schema_ident = MetastoreSchemaIdent {
-        database: "icebucket".to_string(),
+        database: "embucket".to_string(),
         schema: "public".to_string(),
     };
     metastore

crates/runtime/src/execution/tests/service.rs

@@ -74,17 +74,17 @@ async fn test_service_upload_file() {
         .expect("Failed to create volume");
     metastore
         .create_database(
-            &"icebucket".to_string(),
+            &"embucket".to_string(),
             MetastoreDatabase {
-                ident: "icebucket".to_string(),
+                ident: "embucket".to_string(),
                 properties: None,
                 volume: "test_volume".to_string(),
             },
         )
         .await
         .expect("Failed to create database");
     let schema_ident = MetastoreSchemaIdent {
-        database: "icebucket".to_string(),
+        database: "embucket".to_string(),
         schema: "public".to_string(),
     };
     metastore
@@ -100,7 +100,7 @@ async fn test_service_upload_file() {
 
     let file_name = "test.csv";
     let table_ident = MetastoreTableIdent {
-        database: "icebucket".to_string(),
+        database: "embucket".to_string(),
         schema: "public".to_string(),
         table: "target_table".to_string(),
     };
@@ -207,17 +207,17 @@ async fn test_service_create_table_file_volume() {
         .expect("Failed to create volume");
     metastore
         .create_database(
-            &"icebucket".to_string(),
+            &"embucket".to_string(),
             MetastoreDatabase {
-                ident: "icebucket".to_string(),
+                ident: "embucket".to_string(),
                 properties: None,
                 volume: "test_volume".to_string(),
             },
         )
         .await
         .expect("Failed to create database");
     let schema_ident = MetastoreSchemaIdent {
-        database: "icebucket".to_string(),
+        database: "embucket".to_string(),
         schema: "public".to_string(),
     };
     metastore
@@ -232,7 +232,7 @@ async fn test_service_create_table_file_volume() {
         .expect("Failed to create schema");
 
     let table_ident = MetastoreTableIdent {
-        database: "icebucket".to_string(),
+        database: "embucket".to_string(),
         schema: "public".to_string(),
         table: "target_table".to_string(),
     };