Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ utoipa-swagger-ui = { version = "9", features = ["axum"] }
lazy_static = { version = "1.5" }
snafu = { version = "0.8.5", features = ["futures"] }
tracing = { version = "0.1", features = ["attributes"] }
icebucket_history = { version = "0.1.0", path = "crates/history" }
embucket_history = { version = "0.1.0", path = "crates/history" }

datafusion = { version = "45.0.0" }
datafusion-common = { version = "45.0.0" }
Expand Down
2 changes: 1 addition & 1 deletion bin/bucketd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license-file = { workspace = true }
[dependencies]
clap = { version = "4.5.27", features = ["env", "derive"] }
dotenv = { version = "0.15.0" }
icebucket_runtime = { path = "../../crates/runtime" }
embucket_runtime = { path = "../../crates/runtime" }
object_store = { workspace = true }
snmalloc-rs = { workspace = true }
tokio = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions bin/bucketd/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use std::sync::Arc;

#[derive(Parser)]
#[command(version, about, long_about=None)]
pub struct IceBucketOpts {
pub struct CliOpts {
#[arg(
short,
long,
Expand Down Expand Up @@ -152,7 +152,7 @@ enum StoreBackend {
Memory,
}

impl IceBucketOpts {
impl CliOpts {
#[allow(clippy::unwrap_used, clippy::as_conversions)]
pub fn object_store_backend(self) -> ObjectStoreResult<Arc<dyn ObjectStore>> {
match self.backend {
Expand Down
27 changes: 13 additions & 14 deletions bin/bucketd/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ pub(crate) mod cli;

use clap::Parser;
use dotenv::dotenv;
use icebucket_runtime::{
config::{IceBucketDbConfig, IceBucketRuntimeConfig},
http::config::IceBucketWebConfig,
run_icebucket,
use embucket_runtime::{
config::{DbConfig, RuntimeConfig},
http::config::WebConfig,
run_binary,
};
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};

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

tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
"bucketd=debug,icebucket_runtime=debug,tower_http=debug".into()
}),
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "bucketd=debug,embucket_runtime=debug,tower_http=debug".into()),
)
.with(tracing_subscriber::fmt::layer())
.init();

let opts = cli::IceBucketOpts::parse();
let opts = cli::CliOpts::parse();
let slatedb_prefix = opts.slatedb_prefix.clone();
let host = opts.host.clone().unwrap();
let iceberg_catalog_url = opts.catalog_url.clone().unwrap();
Expand All @@ -65,13 +64,13 @@ async fn main() {
return;
}
Ok(object_store) => {
tracing::info!("Starting 🧊🪣 IceBucket...");
tracing::info!("Starting embucket");

let runtime_config = IceBucketRuntimeConfig {
db: IceBucketDbConfig {
let runtime_config = RuntimeConfig {
db: DbConfig {
slatedb_prefix: slatedb_prefix.clone(),
},
web: IceBucketWebConfig {
web: WebConfig {
host,
port,
allow_origin,
Expand All @@ -80,8 +79,8 @@ async fn main() {
},
};

if let Err(e) = run_icebucket(object_store, runtime_config).await {
tracing::error!("Error while running IceBucket: {:?}", e);
if let Err(e) = run_binary(object_store, runtime_config).await {
tracing::error!("Error while running: {:?}", e);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions crates/history/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "icebucket_history"
name = "embucket_history"
version = "0.1.0"
edition = "2021"
license-file = { workspace = true }

[dependencies]
icebucket_utils = { path = "../utils" }
embucket_utils = { path = "../utils" }
bytes = { workspace = true }
chrono = { workspace = true, features = ["serde"] }
serde = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/history/src/entities/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use crate::WorksheetId;
use bytes::Bytes;
use chrono::{DateTime, Utc};
use icebucket_utils::iterable::IterableEntity;
use embucket_utils::iterable::IterableEntity;
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;

Expand Down
2 changes: 1 addition & 1 deletion crates/history/src/entities/worksheet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

use bytes::Bytes;
use chrono::{DateTime, Utc};
use icebucket_utils::iterable::IterableEntity;
use embucket_utils::iterable::IterableEntity;
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;

Expand Down
20 changes: 10 additions & 10 deletions crates/history/src/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

use crate::{QueryRecord, QueryRecordId, Worksheet, WorksheetId};
use async_trait::async_trait;
use icebucket_utils::iterable::{IterableCursor, IterableEntity};
use icebucket_utils::Db;
use embucket_utils::iterable::{IterableCursor, IterableEntity};
use embucket_utils::Db;
use snafu::{ResultExt, Snafu};
use std::sync::Arc;

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

#[snafu(display("Error adding worksheet: {source}"))]
WorksheetAdd { source: icebucket_utils::Error },
WorksheetAdd { source: embucket_utils::Error },

#[snafu(display("Error getting worksheet: {source}"))]
WorksheetGet { source: icebucket_utils::Error },
WorksheetGet { source: embucket_utils::Error },

#[snafu(display("Error getting worksheets: {source}"))]
WorksheetsList { source: icebucket_utils::Error },
WorksheetsList { source: embucket_utils::Error },

#[snafu(display("Error deleting worksheet: {source}"))]
WorksheetDelete { source: icebucket_utils::Error },
WorksheetDelete { source: embucket_utils::Error },

#[snafu(display("Error updating worksheet: {source}"))]
WorksheetUpdate { source: icebucket_utils::Error },
WorksheetUpdate { source: embucket_utils::Error },

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

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

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

#[tokio::test]
Expand Down
4 changes: 2 additions & 2 deletions crates/metastore/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "icebucket_metastore"
name = "embucket_metastore"
version = "0.1.0"
edition = "2021"
license-file = { workspace = true }
Expand All @@ -12,7 +12,7 @@ dashmap = "6.1.0"
futures = { workspace = true }
iceberg-rust = { workspace = true }
iceberg-rust-spec = { workspace = true }
icebucket_utils = { path = "../utils" }
embucket_utils = { path = "../utils" }
object_store = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/metastore/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ pub enum MetastoreError {
},

#[snafu(display("SlateDB error: {source}"))]
UtilSlateDB { source: icebucket_utils::Error },
UtilSlateDB { source: embucket_utils::Error },

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