From 7efcf868d519faf095243565658d41388f4694dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=90=AC=E6=AD=A3?= <32613835+WangTingZheng@users.noreply.github.com> Date: Mon, 12 Jun 2023 11:00:24 +0800 Subject: [PATCH] refactor: Remove MySQL related options from Datanode (#1756) * refactor: Remove MySQL related options from Datanode remove mysql_addr and mysql_runtime_size in datanode.rs, remove command line argument mysql_addr in cmd/src/datanode.rs #1739 * feat: remove --mysql-addr from command line in pre commit, sqlness can not find --mysql-addrr, because we remove it issue#1739 * refactor: remove --mysql-addr from command line in pre commit, sqlness can not find --mysql-addrr, because we remove it issue#1739 --- src/cmd/src/datanode.rs | 12 ------------ src/datanode/src/datanode.rs | 4 ---- tests/runner/src/env.rs | 1 - 3 files changed, 17 deletions(-) diff --git a/src/cmd/src/datanode.rs b/src/cmd/src/datanode.rs index 448f11ffe5..5e35cb21fb 100644 --- a/src/cmd/src/datanode.rs +++ b/src/cmd/src/datanode.rs @@ -84,8 +84,6 @@ struct StartCommand { rpc_addr: Option, #[clap(long)] rpc_hostname: Option, - #[clap(long)] - mysql_addr: Option, #[clap(long, multiple = true, value_delimiter = ',')] metasrv_addr: Option>, #[clap(short, long)] @@ -126,10 +124,6 @@ impl StartCommand { opts.rpc_hostname = self.rpc_hostname.clone(); } - if let Some(addr) = &self.mysql_addr { - opts.mysql_addr = addr.clone(); - } - if let Some(node_id) = self.node_id { opts.node_id = Some(node_id); } @@ -205,8 +199,6 @@ mod tests { rpc_addr = "127.0.0.1:3001" rpc_hostname = "127.0.0.1" rpc_runtime_size = 8 - mysql_addr = "127.0.0.1:4406" - mysql_runtime_size = 2 [meta_client_options] metasrv_addrs = ["127.0.0.1:3002"] @@ -252,8 +244,6 @@ mod tests { cmd.load_options(TopLevelOptions::default()).unwrap() else { unreachable!() }; assert_eq!("127.0.0.1:3001".to_string(), options.rpc_addr); - assert_eq!("127.0.0.1:4406".to_string(), options.mysql_addr); - assert_eq!(2, options.mysql_runtime_size); assert_eq!(Some(42), options.node_id); assert_eq!("/other/wal", options.wal.dir.unwrap()); @@ -368,8 +358,6 @@ mod tests { rpc_addr = "127.0.0.1:3001" rpc_hostname = "127.0.0.1" rpc_runtime_size = 8 - mysql_addr = "127.0.0.1:4406" - mysql_runtime_size = 2 [meta_client_options] timeout_millis = 3000 diff --git a/src/datanode/src/datanode.rs b/src/datanode/src/datanode.rs index 3ccc1b6470..54d777d3f6 100644 --- a/src/datanode/src/datanode.rs +++ b/src/datanode/src/datanode.rs @@ -340,8 +340,6 @@ pub struct DatanodeOptions { pub rpc_addr: String, pub rpc_hostname: Option, pub rpc_runtime_size: usize, - pub mysql_addr: String, - pub mysql_runtime_size: usize, pub http_opts: HttpOptions, pub meta_client_options: Option, pub wal: WalConfig, @@ -359,8 +357,6 @@ impl Default for DatanodeOptions { rpc_addr: "127.0.0.1:3001".to_string(), rpc_hostname: None, rpc_runtime_size: 8, - mysql_addr: "127.0.0.1:4406".to_string(), - mysql_runtime_size: 2, http_opts: HttpOptions::default(), meta_client_options: None, wal: WalConfig::default(), diff --git a/tests/runner/src/env.rs b/tests/runner/src/env.rs index 73ec466b84..875e266da8 100644 --- a/tests/runner/src/env.rs +++ b/tests/runner/src/env.rs @@ -208,7 +208,6 @@ impl Env { "start".to_string(), ]; args.push(format!("--rpc-addr=0.0.0.0:410{id}")); - args.push(format!("--mysql-addr=0.0.0.0:420{id}")); args.push(format!("--http-addr=0.0.0.0:430{id}")); args.push(format!( "--data-home=/tmp/greptimedb_datanode_{}",