This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-ballista.git
The following commit(s) were added to refs/heads/main by this push:
new d2a8f77f chore: remove unused cache_ options from executor (#1140)
d2a8f77f is described below
commit d2a8f77fedf41b251a888db7665be71cecf7118e
Author: Marko Milenković <[email protected]>
AuthorDate: Wed Nov 27 16:25:26 2024 +0000
chore: remove unused cache_ options from executor (#1140)
Cache functionality has been removed from core
functionality.
---
ballista/core/src/config.rs | 21 ---------------------
ballista/executor/executor_config_spec.toml | 22 ----------------------
ballista/executor/src/config.rs | 4 ----
ballista/executor/src/executor_process.rs | 6 +-----
4 files changed, 1 insertion(+), 52 deletions(-)
diff --git a/ballista/core/src/config.rs b/ballista/core/src/config.rs
index 1ddd952b..10f24c5d 100644
--- a/ballista/core/src/config.rs
+++ b/ballista/core/src/config.rs
@@ -296,27 +296,6 @@ impl parse_arg::ParseArgFromStr for LogRotationPolicy {
}
}
-// an enum used to configure the source data cache policy
-// needs to be visible to code generated by configure_me
-#[derive(Clone, ValueEnum, Copy, Debug, serde::Deserialize)]
-pub enum DataCachePolicy {
- LocalDiskFile,
-}
-
-impl std::str::FromStr for DataCachePolicy {
- type Err = String;
-
- fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
- ValueEnum::from_str(s, true)
- }
-}
-
-impl parse_arg::ParseArgFromStr for DataCachePolicy {
- fn describe_type<W: fmt::Write>(mut writer: W) -> fmt::Result {
- write!(writer, "The data cache policy")
- }
-}
-
#[cfg(test)]
mod tests {
use super::*;
diff --git a/ballista/executor/executor_config_spec.toml
b/ballista/executor/executor_config_spec.toml
index 209069de..4379a0cd 100644
--- a/ballista/executor/executor_config_spec.toml
+++ b/ballista/executor/executor_config_spec.toml
@@ -143,25 +143,3 @@ name = "executor_heartbeat_interval_seconds"
type = "u64"
doc = "The heartbeat interval in seconds to the scheduler for push-based task
scheduling"
default = "60"
-
-[[param]]
-name = "data_cache_policy"
-type = "ballista_core::config::DataCachePolicy"
-doc = "Data cache policy, possible values: local-disk-file"
-
-[[param]]
-name = "cache_dir"
-type = "String"
-doc = "Directory for cached source data"
-
-[[param]]
-name = "cache_capacity"
-type = "u64"
-doc = "The maximum capacity can be used for cache. Default: 1GB"
-default = "1073741824"
-
-[[param]]
-name = "cache_io_concurrency"
-type = "u32"
-doc = "The number of worker threads for the runtime of caching. Default: 2"
-default = "2"
\ No newline at end of file
diff --git a/ballista/executor/src/config.rs b/ballista/executor/src/config.rs
index 78db477f..bbaf2670 100644
--- a/ballista/executor/src/config.rs
+++ b/ballista/executor/src/config.rs
@@ -56,10 +56,6 @@ impl TryFrom<Config> for ExecutorProcessConfig {
grpc_max_decoding_message_size:
opt.grpc_server_max_decoding_message_size,
grpc_max_encoding_message_size:
opt.grpc_server_max_encoding_message_size,
executor_heartbeat_interval_seconds:
opt.executor_heartbeat_interval_seconds,
- data_cache_policy: opt.data_cache_policy,
- cache_dir: opt.cache_dir,
- cache_capacity: opt.cache_capacity,
- cache_io_concurrency: opt.cache_io_concurrency,
override_execution_engine: None,
override_function_registry: None,
override_config_producer: None,
diff --git a/ballista/executor/src/executor_process.rs
b/ballista/executor/src/executor_process.rs
index 817f8599..f87f7127 100644
--- a/ballista/executor/src/executor_process.rs
+++ b/ballista/executor/src/executor_process.rs
@@ -40,7 +40,7 @@ use uuid::Uuid;
use datafusion::execution::runtime_env::{RuntimeConfig, RuntimeEnv};
-use ballista_core::config::{DataCachePolicy, LogRotationPolicy,
TaskSchedulingPolicy};
+use ballista_core::config::{LogRotationPolicy, TaskSchedulingPolicy};
use ballista_core::error::BallistaError;
use ballista_core::serde::protobuf::executor_resource::Resource;
use ballista_core::serde::protobuf::executor_status::Status;
@@ -85,10 +85,6 @@ pub struct ExecutorProcessConfig {
pub log_rotation_policy: LogRotationPolicy,
pub job_data_ttl_seconds: u64,
pub job_data_clean_up_interval_seconds: u64,
- pub data_cache_policy: Option<DataCachePolicy>,
- pub cache_dir: Option<String>,
- pub cache_capacity: u64,
- pub cache_io_concurrency: u32,
/// The maximum size of a decoded message
pub grpc_max_decoding_message_size: u32,
/// The maximum size of an encoded message
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
