From ae7275159ccb6e5cff6389a5e59e557f918e01d1 Mon Sep 17 00:00:00 2001 From: xuanyuan300 Date: Mon, 20 Jun 2022 20:08:40 +0800 Subject: [PATCH 1/2] Signed-off-by: xuanyuan300 feat(strategy): changed type of `default_target` --- pisa-proxy/proxy/strategy/src/config.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pisa-proxy/proxy/strategy/src/config.rs b/pisa-proxy/proxy/strategy/src/config.rs index 778bec6a..da2228dc 100644 --- a/pisa-proxy/proxy/strategy/src/config.rs +++ b/pisa-proxy/proxy/strategy/src/config.rs @@ -14,15 +14,15 @@ use serde::{Deserialize, Serialize}; -#[derive(Debug, Serialize, Deserialize, Clone, Default)] +#[derive(Debug, Serialize, Deserialize, Clone)] pub struct ReadWriteSplitting { #[serde(rename = "static")] - model: ReadWriteSplittingStatic, + pub undynamic: ReadWriteSplittingStatic, } #[derive(Debug, Serialize, Deserialize, Clone, Default)] pub struct ReadWriteSplittingStatic { - pub default_target: String, + pub default_target: TargetRole, #[serde(rename = "rule")] pub rules: Vec, } @@ -43,9 +43,15 @@ pub struct RegexRule { pub algorithm_name: String, } -#[derive(Debug, Serialize, Deserialize, Clone)] +#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)] #[serde(rename_all = "lowercase")] pub enum TargetRole { Read, ReadWrite, } + +impl Default for TargetRole { + fn default() -> Self { + TargetRole::ReadWrite + } +} From eaf3ffa2f77a873b59fa3d577fbfd814a7af17eb Mon Sep 17 00:00:00 2001 From: xuanyuan300 Date: Mon, 20 Jun 2022 20:16:45 +0800 Subject: [PATCH 2/2] Signed-off-by: xuanyuan300 feat(strategy): add Default --- pisa-proxy/proxy/strategy/src/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisa-proxy/proxy/strategy/src/config.rs b/pisa-proxy/proxy/strategy/src/config.rs index da2228dc..aee77491 100644 --- a/pisa-proxy/proxy/strategy/src/config.rs +++ b/pisa-proxy/proxy/strategy/src/config.rs @@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize}; -#[derive(Debug, Serialize, Deserialize, Clone)] +#[derive(Debug, Serialize, Deserialize, Clone, Default)] pub struct ReadWriteSplitting { #[serde(rename = "static")] pub undynamic: ReadWriteSplittingStatic,