File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -71,7 +71,7 @@ impl InstanceBuilder {
7171 maybe_activate_heap_profile ( & dn_opts. memory ) ;
7272 create_resource_limit_metrics ( APP_NAME ) ;
7373
74- plugins:: setup_datanode_plugins ( plugins, opts. plugins . as_ref ( ) , dn_opts)
74+ plugins:: setup_datanode_plugins ( plugins, & opts. plugins , dn_opts)
7575 . await
7676 . context ( StartDatanodeSnafu ) ?;
7777
Original file line number Diff line number Diff line change @@ -291,7 +291,7 @@ impl StartCommand {
291291 opts. grpc . detect_server_addr ( ) ;
292292
293293 let mut plugins = Plugins :: new ( ) ;
294- plugins:: setup_flownode_plugins ( & mut plugins, plugin_opts. as_ref ( ) , & opts)
294+ plugins:: setup_flownode_plugins ( & mut plugins, & plugin_opts, & opts)
295295 . await
296296 . context ( StartFlownodeSnafu ) ?;
297297
Original file line number Diff line number Diff line change @@ -293,7 +293,7 @@ impl StartCommand {
293293 let mut opts = opts. component ;
294294 opts. grpc . detect_server_addr ( ) ;
295295 let mut plugins = Plugins :: new ( ) ;
296- plugins:: setup_frontend_plugins ( & mut plugins, plugin_opts. as_ref ( ) , & opts)
296+ plugins:: setup_frontend_plugins ( & mut plugins, & plugin_opts, & opts)
297297 . await
298298 . context ( error:: StartFrontendSnafu ) ?;
299299
@@ -526,7 +526,7 @@ mod tests {
526526 } ;
527527
528528 let mut plugins = Plugins :: new ( ) ;
529- plugins:: setup_frontend_plugins ( & mut plugins, None , & fe_opts)
529+ plugins:: setup_frontend_plugins ( & mut plugins, & [ ] , & fe_opts)
530530 . await
531531 . unwrap ( ) ;
532532
Original file line number Diff line number Diff line change @@ -337,7 +337,7 @@ impl StartCommand {
337337 info ! ( "Metasrv options: {:#?}" , opts) ;
338338
339339 let mut plugins = Plugins :: new ( ) ;
340- plugins:: setup_metasrv_plugins ( & mut plugins, plugin_opts. as_ref ( ) , & opts)
340+ plugins:: setup_metasrv_plugins ( & mut plugins, & plugin_opts, & opts)
341341 . await
342342 . context ( StartMetaServerSnafu ) ?;
343343
Original file line number Diff line number Diff line change @@ -42,7 +42,7 @@ pub struct GreptimeOptions<T> {
4242 /// The runtime options.
4343 pub runtime : RuntimeOptions ,
4444 /// The plugin options.
45- pub plugins : Option < PluginOptions > ,
45+ pub plugins : Vec < PluginOptions > ,
4646
4747 /// The options of each component (like Datanode or Standalone) of GreptimeDB.
4848 #[ serde( flatten) ]
Original file line number Diff line number Diff line change @@ -503,11 +503,11 @@ impl StartCommand {
503503 let fe_opts = opts. frontend_options ( ) ;
504504 let dn_opts = opts. datanode_options ( ) ;
505505
506- plugins:: setup_frontend_plugins ( & mut plugins, plugin_opts. as_ref ( ) , & fe_opts)
506+ plugins:: setup_frontend_plugins ( & mut plugins, & plugin_opts, & fe_opts)
507507 . await
508508 . context ( error:: StartFrontendSnafu ) ?;
509509
510- plugins:: setup_datanode_plugins ( & mut plugins, plugin_opts. as_ref ( ) , & dn_opts)
510+ plugins:: setup_datanode_plugins ( & mut plugins, & plugin_opts, & dn_opts)
511511 . await
512512 . context ( error:: StartDatanodeSnafu ) ?;
513513
@@ -878,7 +878,7 @@ mod tests {
878878 } ;
879879
880880 let mut plugins = Plugins :: new ( ) ;
881- plugins:: setup_frontend_plugins ( & mut plugins, None , & fe_opts)
881+ plugins:: setup_frontend_plugins ( & mut plugins, & [ ] , & fe_opts)
882882 . await
883883 . unwrap ( ) ;
884884
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ use crate::options::PluginOptions;
2222#[ allow( unused_mut) ]
2323pub async fn setup_datanode_plugins (
2424 plugins : & mut Plugins ,
25- plugin_options : Option < & PluginOptions > ,
25+ plugin_options : & [ PluginOptions ] ,
2626 dn_opts : & DatanodeOptions ,
2727) -> Result < ( ) > {
2828 Ok ( ( ) )
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ use crate::options::PluginOptions;
2121#[ allow( unused_mut) ]
2222pub async fn setup_flownode_plugins (
2323 _plugins : & mut Plugins ,
24- _plugin_options : Option < & PluginOptions > ,
24+ _plugin_options : & [ PluginOptions ] ,
2525 _fn_opts : & FlownodeOptions ,
2626) -> Result < ( ) > {
2727 Ok ( ( ) )
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ use crate::options::PluginOptions;
2323#[ allow( unused_mut) ]
2424pub async fn setup_frontend_plugins (
2525 plugins : & mut Plugins ,
26- _plugin_options : Option < & PluginOptions > ,
26+ _plugin_options : & [ PluginOptions ] ,
2727 fe_opts : & FrontendOptions ,
2828) -> Result < ( ) > {
2929 if let Some ( user_provider) = fe_opts. user_provider . as_ref ( ) {
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ use crate::options::PluginOptions;
2121#[ allow( unused_variables) ]
2222pub async fn setup_metasrv_plugins (
2323 _plugins : & mut Plugins ,
24- _plugin_options : Option < & PluginOptions > ,
24+ plugin_options : & [ PluginOptions ] ,
2525 metasrv_opts : & MetasrvOptions ,
2626) -> Result < ( ) > {
2727 Ok ( ( ) )
You can’t perform that action at this time.
0 commit comments