mirror of
https://github.com/GreptimeTeam/greptimedb.git
synced 2026-01-04 04:12:55 +00:00
Revert "refactor: change plugin option type from `&[PluginOptions]` to `Optio…"
This reverts commit 5420d6f7fb.
This commit is contained in:
@@ -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)?;
|
||||
|
||||
|
||||
@@ -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)?;
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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)?;
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ pub struct GreptimeOptions<T> {
|
||||
/// The runtime options.
|
||||
pub runtime: RuntimeOptions,
|
||||
/// The plugin options.
|
||||
pub plugins: Option<PluginOptions>,
|
||||
pub plugins: Vec<PluginOptions>,
|
||||
|
||||
/// The options of each component (like Datanode or Standalone) of GreptimeDB.
|
||||
#[serde(flatten)]
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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(())
|
||||
|
||||
@@ -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(())
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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(())
|
||||
|
||||
@@ -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),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user