Skip to content

Commit 3c2ed3f

Browse files
authored
Simplify naming for all icebucket entities (icebucket -> embucket) (#444)
* Rename stage #1 * Rename stage #2 * Rename stage #3 * Rename stage #4 * Rename stage #5 * Rename stage #6 * Rename stage #7 * Fixes after rebase
1 parent 90a2d05 commit 3c2ed3f

114 files changed

Lines changed: 727 additions & 4813 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ utoipa-swagger-ui = { version = "9", features = ["axum"] }
3535
lazy_static = { version = "1.5" }
3636
snafu = { version = "0.8.5", features = ["futures"] }
3737
tracing = { version = "0.1", features = ["attributes"] }
38-
icebucket_history = { version = "0.1.0", path = "crates/history" }
38+
embucket_history = { version = "0.1.0", path = "crates/history" }
3939

4040
datafusion = { version = "45.0.0" }
4141
datafusion-common = { version = "45.0.0" }

bin/bucketd/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license-file = { workspace = true }
77
[dependencies]
88
clap = { version = "4.5.27", features = ["env", "derive"] }
99
dotenv = { version = "0.15.0" }
10-
icebucket_runtime = { path = "../../crates/runtime" }
10+
embucket_runtime = { path = "../../crates/runtime" }
1111
object_store = { workspace = true }
1212
snmalloc-rs = { workspace = true }
1313
tokio = { workspace = true }

bin/bucketd/src/cli.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use std::sync::Arc;
2626

2727
#[derive(Parser)]
2828
#[command(version, about, long_about=None)]
29-
pub struct IceBucketOpts {
29+
pub struct CliOpts {
3030
#[arg(
3131
short,
3232
long,
@@ -152,7 +152,7 @@ enum StoreBackend {
152152
Memory,
153153
}
154154

155-
impl IceBucketOpts {
155+
impl CliOpts {
156156
#[allow(clippy::unwrap_used, clippy::as_conversions)]
157157
pub fn object_store_backend(self) -> ObjectStoreResult<Arc<dyn ObjectStore>> {
158158
match self.backend {

bin/bucketd/src/main.rs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ pub(crate) mod cli;
1919

2020
use clap::Parser;
2121
use dotenv::dotenv;
22-
use icebucket_runtime::{
23-
config::{IceBucketDbConfig, IceBucketRuntimeConfig},
24-
http::config::IceBucketWebConfig,
25-
run_icebucket,
22+
use embucket_runtime::{
23+
config::{DbConfig, RuntimeConfig},
24+
http::config::WebConfig,
25+
run_binary,
2626
};
2727
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
2828

@@ -36,14 +36,13 @@ async fn main() {
3636

3737
tracing_subscriber::registry()
3838
.with(
39-
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
40-
"bucketd=debug,icebucket_runtime=debug,tower_http=debug".into()
41-
}),
39+
tracing_subscriber::EnvFilter::try_from_default_env()
40+
.unwrap_or_else(|_| "bucketd=debug,embucket_runtime=debug,tower_http=debug".into()),
4241
)
4342
.with(tracing_subscriber::fmt::layer())
4443
.init();
4544

46-
let opts = cli::IceBucketOpts::parse();
45+
let opts = cli::CliOpts::parse();
4746
let slatedb_prefix = opts.slatedb_prefix.clone();
4847
let host = opts.host.clone().unwrap();
4948
let iceberg_catalog_url = opts.catalog_url.clone().unwrap();
@@ -65,13 +64,13 @@ async fn main() {
6564
return;
6665
}
6766
Ok(object_store) => {
68-
tracing::info!("Starting 🧊🪣 IceBucket...");
67+
tracing::info!("Starting embucket");
6968

70-
let runtime_config = IceBucketRuntimeConfig {
71-
db: IceBucketDbConfig {
69+
let runtime_config = RuntimeConfig {
70+
db: DbConfig {
7271
slatedb_prefix: slatedb_prefix.clone(),
7372
},
74-
web: IceBucketWebConfig {
73+
web: WebConfig {
7574
host,
7675
port,
7776
allow_origin,
@@ -80,8 +79,8 @@ async fn main() {
8079
},
8180
};
8281

83-
if let Err(e) = run_icebucket(object_store, runtime_config).await {
84-
tracing::error!("Error while running IceBucket: {:?}", e);
82+
if let Err(e) = run_binary(object_store, runtime_config).await {
83+
tracing::error!("Error while running: {:?}", e);
8584
}
8685
}
8786
}

crates/history/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
2-
name = "icebucket_history"
2+
name = "embucket_history"
33
version = "0.1.0"
44
edition = "2021"
55
license-file = { workspace = true }
66

77
[dependencies]
8-
icebucket_utils = { path = "../utils" }
8+
embucket_utils = { path = "../utils" }
99
bytes = { workspace = true }
1010
chrono = { workspace = true, features = ["serde"] }
1111
serde = { workspace = true }

crates/history/src/entities/query.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use crate::WorksheetId;
1919
use bytes::Bytes;
2020
use chrono::{DateTime, Utc};
21-
use icebucket_utils::iterable::IterableEntity;
21+
use embucket_utils::iterable::IterableEntity;
2222
use serde::{Deserialize, Serialize};
2323
use utoipa::ToSchema;
2424

crates/history/src/entities/worksheet.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
use bytes::Bytes;
1919
use chrono::{DateTime, Utc};
20-
use icebucket_utils::iterable::IterableEntity;
20+
use embucket_utils::iterable::IterableEntity;
2121
use serde::{Deserialize, Serialize};
2222
use utoipa::ToSchema;
2323

crates/history/src/store.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
use crate::{QueryRecord, QueryRecordId, Worksheet, WorksheetId};
1919
use async_trait::async_trait;
20-
use icebucket_utils::iterable::{IterableCursor, IterableEntity};
21-
use icebucket_utils::Db;
20+
use embucket_utils::iterable::{IterableCursor, IterableEntity};
21+
use embucket_utils::Db;
2222
use snafu::{ResultExt, Snafu};
2323
use std::sync::Arc;
2424

@@ -28,25 +28,25 @@ pub enum WorksheetsStoreError {
2828
BadKey { source: std::str::Utf8Error },
2929

3030
#[snafu(display("Error adding worksheet: {source}"))]
31-
WorksheetAdd { source: icebucket_utils::Error },
31+
WorksheetAdd { source: embucket_utils::Error },
3232

3333
#[snafu(display("Error getting worksheet: {source}"))]
34-
WorksheetGet { source: icebucket_utils::Error },
34+
WorksheetGet { source: embucket_utils::Error },
3535

3636
#[snafu(display("Error getting worksheets: {source}"))]
37-
WorksheetsList { source: icebucket_utils::Error },
37+
WorksheetsList { source: embucket_utils::Error },
3838

3939
#[snafu(display("Error deleting worksheet: {source}"))]
40-
WorksheetDelete { source: icebucket_utils::Error },
40+
WorksheetDelete { source: embucket_utils::Error },
4141

4242
#[snafu(display("Error updating worksheet: {source}"))]
43-
WorksheetUpdate { source: icebucket_utils::Error },
43+
WorksheetUpdate { source: embucket_utils::Error },
4444

4545
#[snafu(display("Error adding query record: {source}"))]
46-
QueryAdd { source: icebucket_utils::Error },
46+
QueryAdd { source: embucket_utils::Error },
4747

4848
#[snafu(display("Error getting query history: {source}"))]
49-
QueryGet { source: icebucket_utils::Error },
49+
QueryGet { source: embucket_utils::Error },
5050

5151
#[snafu(display("Can't locate worksheet by key: {message}"))]
5252
WorksheetNotFound { message: String },
@@ -190,7 +190,7 @@ impl WorksheetsStore for SlateDBWorksheetsStore {
190190
mod tests {
191191
use super::*;
192192
use chrono::{Duration, TimeZone, Utc};
193-
use icebucket_utils::iterable::{IterableCursor, IterableEntity};
193+
use embucket_utils::iterable::{IterableCursor, IterableEntity};
194194
use tokio;
195195

196196
#[tokio::test]

crates/metastore/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "icebucket_metastore"
2+
name = "embucket_metastore"
33
version = "0.1.0"
44
edition = "2021"
55
license-file = { workspace = true }
@@ -12,7 +12,7 @@ dashmap = "6.1.0"
1212
futures = { workspace = true }
1313
iceberg-rust = { workspace = true }
1414
iceberg-rust-spec = { workspace = true }
15-
icebucket_utils = { path = "../utils" }
15+
embucket_utils = { path = "../utils" }
1616
object_store = { workspace = true }
1717
serde = { workspace = true }
1818
serde_json = { workspace = true }

crates/metastore/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub enum MetastoreError {
5656
},
5757

5858
#[snafu(display("SlateDB error: {source}"))]
59-
UtilSlateDB { source: icebucket_utils::Error },
59+
UtilSlateDB { source: embucket_utils::Error },
6060

6161
#[snafu(display("Metastore object of type {type_name} with name {name} already exists"))]
6262
ObjectAlreadyExists { type_name: String, name: String },

0 commit comments

Comments
 (0)