Skip to content

Commit

Permalink
remove object store registry
Browse files Browse the repository at this point in the history
... as users can plug in their own.
  • Loading branch information
milenkovicm committed Nov 15, 2024
1 parent a542608 commit 89a42ab
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 157 deletions.
2 changes: 1 addition & 1 deletion ballista-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ rustyline = "14.0.0"
tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot"] }

[features]
s3 = ["ballista/s3"]

2 changes: 0 additions & 2 deletions ballista/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ object_store = { workspace = true, features = ["aws"] }
testcontainers-modules = { version = "0.11", features = ["minio"] }

[features]
azure = ["ballista-core/azure"]
default = []
s3 = ["ballista-core/s3"]
standalone = ["ballista-executor", "ballista-scheduler"]
testcontainers = []
5 changes: 1 addition & 4 deletions ballista/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,10 @@ exclude = ["*.proto"]
rustc-args = ["--cfg", "docsrs"]

[features]
azure = ["object_store/azure"]
docsrs = []
# Used for testing ONLY: causes all values to hash to the same value (test for collisions)
force_hash_collisions = ["datafusion/force_hash_collisions"]
gcs = ["object_store/gcp"]
s3 = ["object_store/aws"]


[dependencies]
arrow-flight = { workspace = true }
Expand All @@ -54,7 +52,6 @@ futures = { workspace = true }
itertools = "0.13"
log = { workspace = true }
md-5 = { version = "^0.10.0" }
object_store = { workspace = true }
parse_arg = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion ballista/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ pub mod consistent_hash;
pub mod error;
pub mod event_loop;
pub mod execution_plans;
pub mod object_store_registry;
pub mod utils;

#[macro_use]
Expand Down
136 changes: 0 additions & 136 deletions ballista/core/src/object_store_registry/mod.rs

This file was deleted.

11 changes: 2 additions & 9 deletions ballista/core/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ use crate::error::{BallistaError, Result};
use crate::execution_plans::{
DistributedQueryExec, ShuffleWriterExec, UnresolvedShuffleExec,
};
use crate::object_store_registry::with_object_store_registry;
use crate::serde::protobuf::KeyValuePair;
use crate::serde::scheduler::PartitionStats;
use crate::serde::{BallistaLogicalExtensionCodec, BallistaPhysicalExtensionCodec};
Expand Down Expand Up @@ -73,10 +72,7 @@ pub fn default_session_builder(config: SessionConfig) -> SessionState {
SessionStateBuilder::new()
.with_default_features()
.with_config(config)
.with_runtime_env(Arc::new(
RuntimeEnv::new(with_object_store_registry(RuntimeConfig::default()))
.unwrap(),
))
.with_runtime_env(Arc::new(RuntimeEnv::new(RuntimeConfig::default()).unwrap()))
.build()
}

Expand Down Expand Up @@ -273,10 +269,7 @@ pub fn create_df_ctx_with_ballista_query_planner<T: 'static + AsLogicalPlan>(
let session_state = SessionStateBuilder::new()
.with_default_features()
.with_config(session_config)
.with_runtime_env(Arc::new(
RuntimeEnv::new(with_object_store_registry(RuntimeConfig::default()))
.unwrap(),
))
.with_runtime_env(Arc::new(RuntimeEnv::new(RuntimeConfig::default()).unwrap()))
.with_query_planner(planner)
.with_session_id(session_id)
.build();
Expand Down
5 changes: 1 addition & 4 deletions ballista/executor/src/standalone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ use ballista_core::serde::scheduler::BallistaFunctionRegistry;
use ballista_core::utils::{default_config_producer, SessionConfigExt};
use ballista_core::{
error::Result,
object_store_registry::with_object_store_registry,
serde::protobuf::{scheduler_grpc_client::SchedulerGrpcClient, ExecutorRegistration},
serde::scheduler::ExecutorSpecification,
serde::BallistaCodec,
Expand Down Expand Up @@ -187,9 +186,7 @@ pub async fn new_standalone_executor<
let config_producer = Arc::new(default_config_producer);
let wd = work_dir.clone();
let runtime_producer: RuntimeProducer = Arc::new(move |_: &SessionConfig| {
let config = with_object_store_registry(
RuntimeConfig::new().with_temp_file_path(wd.clone()),
);
let config = RuntimeConfig::new().with_temp_file_path(wd.clone());
Ok(Arc::new(RuntimeEnv::new(config)?))
});

Expand Down

0 comments on commit 89a42ab

Please sign in to comment.