From d6d5dad75802c346246e06f2eccfb6fb9717fb83 Mon Sep 17 00:00:00 2001 From: zyy17 Date: Fri, 22 Aug 2025 23:57:25 -0700 Subject: [PATCH] chore: revert #6763 (#6800) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert "refactor: change plugin option type from `&[PluginOptions]` to `Optio…" This reverts commit 5420d6f7fbdf37e8e00fbfb0ebcf856bab675cd6. --- src/cmd/src/datanode/builder.rs | 2 +- src/cmd/src/flownode.rs | 2 +- src/cmd/src/frontend.rs | 4 ++-- src/cmd/src/metasrv.rs | 2 +- src/cmd/src/options.rs | 2 +- src/cmd/src/standalone.rs | 6 +++--- src/plugins/src/datanode.rs | 2 +- src/plugins/src/flownode.rs | 2 +- src/plugins/src/frontend.rs | 2 +- src/plugins/src/meta_srv.rs | 2 +- src/plugins/src/options.rs | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/cmd/src/datanode/builder.rs b/src/cmd/src/datanode/builder.rs index aa028d32ec..e4a5b69864 100644 --- a/src/cmd/src/datanode/builder.rs +++ b/src/cmd/src/datanode/builder.rs @@ -71,7 +71,7 @@ impl InstanceBuilder { maybe_activate_heap_profile(&dn_opts.memory); create_resource_limit_metrics(APP_NAME); - plugins::setup_datanode_plugins(plugins, opts.plugins.as_ref(), dn_opts) + plugins::setup_datanode_plugins(plugins, &opts.plugins, dn_opts) .await .context(StartDatanodeSnafu)?; diff --git a/src/cmd/src/flownode.rs b/src/cmd/src/flownode.rs index 6fdfa62884..5488a2e175 100644 --- a/src/cmd/src/flownode.rs +++ b/src/cmd/src/flownode.rs @@ -291,7 +291,7 @@ impl StartCommand { opts.grpc.detect_server_addr(); let mut plugins = Plugins::new(); - plugins::setup_flownode_plugins(&mut plugins, plugin_opts.as_ref(), &opts) + plugins::setup_flownode_plugins(&mut plugins, &plugin_opts, &opts) .await .context(StartFlownodeSnafu)?; diff --git a/src/cmd/src/frontend.rs b/src/cmd/src/frontend.rs index d8821aae82..4ba504f37c 100644 --- a/src/cmd/src/frontend.rs +++ b/src/cmd/src/frontend.rs @@ -293,7 +293,7 @@ impl StartCommand { let mut opts = opts.component; opts.grpc.detect_server_addr(); let mut plugins = Plugins::new(); - plugins::setup_frontend_plugins(&mut plugins, plugin_opts.as_ref(), &opts) + plugins::setup_frontend_plugins(&mut plugins, &plugin_opts, &opts) .await .context(error::StartFrontendSnafu)?; @@ -526,7 +526,7 @@ mod tests { }; let mut plugins = Plugins::new(); - plugins::setup_frontend_plugins(&mut plugins, None, &fe_opts) + plugins::setup_frontend_plugins(&mut plugins, &[], &fe_opts) .await .unwrap(); diff --git a/src/cmd/src/metasrv.rs b/src/cmd/src/metasrv.rs index 3de226f6d2..8e59559bf1 100644 --- a/src/cmd/src/metasrv.rs +++ b/src/cmd/src/metasrv.rs @@ -337,7 +337,7 @@ impl StartCommand { info!("Metasrv options: {:#?}", opts); let mut plugins = Plugins::new(); - plugins::setup_metasrv_plugins(&mut plugins, plugin_opts.as_ref(), &opts) + plugins::setup_metasrv_plugins(&mut plugins, &plugin_opts, &opts) .await .context(StartMetaServerSnafu)?; diff --git a/src/cmd/src/options.rs b/src/cmd/src/options.rs index ee066b1a12..ecff735294 100644 --- a/src/cmd/src/options.rs +++ b/src/cmd/src/options.rs @@ -42,7 +42,7 @@ pub struct GreptimeOptions { /// The runtime options. pub runtime: RuntimeOptions, /// The plugin options. - pub plugins: Option, + pub plugins: Vec, /// The options of each component (like Datanode or Standalone) of GreptimeDB. #[serde(flatten)] diff --git a/src/cmd/src/standalone.rs b/src/cmd/src/standalone.rs index a6a09925e3..26704bd607 100644 --- a/src/cmd/src/standalone.rs +++ b/src/cmd/src/standalone.rs @@ -503,11 +503,11 @@ impl StartCommand { let fe_opts = opts.frontend_options(); let dn_opts = opts.datanode_options(); - plugins::setup_frontend_plugins(&mut plugins, plugin_opts.as_ref(), &fe_opts) + plugins::setup_frontend_plugins(&mut plugins, &plugin_opts, &fe_opts) .await .context(error::StartFrontendSnafu)?; - plugins::setup_datanode_plugins(&mut plugins, plugin_opts.as_ref(), &dn_opts) + plugins::setup_datanode_plugins(&mut plugins, &plugin_opts, &dn_opts) .await .context(error::StartDatanodeSnafu)?; @@ -878,7 +878,7 @@ mod tests { }; let mut plugins = Plugins::new(); - plugins::setup_frontend_plugins(&mut plugins, None, &fe_opts) + plugins::setup_frontend_plugins(&mut plugins, &[], &fe_opts) .await .unwrap(); diff --git a/src/plugins/src/datanode.rs b/src/plugins/src/datanode.rs index 690f4ed467..60640f05f1 100644 --- a/src/plugins/src/datanode.rs +++ b/src/plugins/src/datanode.rs @@ -22,7 +22,7 @@ use crate::options::PluginOptions; #[allow(unused_mut)] pub async fn setup_datanode_plugins( plugins: &mut Plugins, - plugin_options: Option<&PluginOptions>, + plugin_options: &[PluginOptions], dn_opts: &DatanodeOptions, ) -> Result<()> { Ok(()) diff --git a/src/plugins/src/flownode.rs b/src/plugins/src/flownode.rs index 812cbee4e2..13c1b37a1c 100644 --- a/src/plugins/src/flownode.rs +++ b/src/plugins/src/flownode.rs @@ -21,7 +21,7 @@ use crate::options::PluginOptions; #[allow(unused_mut)] pub async fn setup_flownode_plugins( _plugins: &mut Plugins, - _plugin_options: Option<&PluginOptions>, + _plugin_options: &[PluginOptions], _fn_opts: &FlownodeOptions, ) -> Result<()> { Ok(()) diff --git a/src/plugins/src/frontend.rs b/src/plugins/src/frontend.rs index 4684542d47..240e7a1582 100644 --- a/src/plugins/src/frontend.rs +++ b/src/plugins/src/frontend.rs @@ -23,7 +23,7 @@ use crate::options::PluginOptions; #[allow(unused_mut)] pub async fn setup_frontend_plugins( plugins: &mut Plugins, - _plugin_options: Option<&PluginOptions>, + _plugin_options: &[PluginOptions], fe_opts: &FrontendOptions, ) -> Result<()> { if let Some(user_provider) = fe_opts.user_provider.as_ref() { diff --git a/src/plugins/src/meta_srv.rs b/src/plugins/src/meta_srv.rs index 28b7d2d01b..282ac241c5 100644 --- a/src/plugins/src/meta_srv.rs +++ b/src/plugins/src/meta_srv.rs @@ -21,7 +21,7 @@ use crate::options::PluginOptions; #[allow(unused_variables)] pub async fn setup_metasrv_plugins( _plugins: &mut Plugins, - _plugin_options: Option<&PluginOptions>, + plugin_options: &[PluginOptions], metasrv_opts: &MetasrvOptions, ) -> Result<()> { Ok(()) diff --git a/src/plugins/src/options.rs b/src/plugins/src/options.rs index f97ecb105d..7eb0b32903 100644 --- a/src/plugins/src/options.rs +++ b/src/plugins/src/options.rs @@ -18,6 +18,6 @@ use serde::{Deserialize, Serialize}; pub struct DummyOptions; #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -pub struct PluginOptions { - pub dummy: DummyOptions, +pub enum PluginOptions { + Dummy(DummyOptions), }