Skip to content

Commit 972bb5f

Browse files
authored
chore: add PartialEq to config (#710)
1. chore: add `PartialEq` implementation to all config structs 2. chore: remove unused `Stats` struct in config
1 parent d27ea98 commit 972bb5f

File tree

10 files changed

+12
-20
lines changed

10 files changed

+12
-20
lines changed

pgdog-config/src/core.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ use super::database::Database;
1414
use super::error::Error;
1515
use super::general::General;
1616
use super::networking::{MultiTenant, Tcp};
17-
use super::pooling::{PoolerMode, Stats};
17+
use super::pooling::PoolerMode;
1818
use super::replication::{MirrorConfig, Mirroring, ReplicaLag, Replication};
1919
use super::rewrite::Rewrite;
2020
use super::sharding::{ManualQuery, OmnishardedTables, ShardedMapping, ShardedTable};
2121
use super::users::{Admin, Plugin, Users};
2222

23-
#[derive(Debug, Clone)]
23+
#[derive(Debug, Clone, PartialEq)]
2424
pub struct ConfigAndUsers {
2525
/// pgdog.toml
2626
pub config: Config,
@@ -124,7 +124,7 @@ impl Default for ConfigAndUsers {
124124
}
125125

126126
/// Configuration.
127-
#[derive(Serialize, Deserialize, Debug, Clone, Default)]
127+
#[derive(Serialize, Deserialize, Debug, Clone, Default, PartialEq)]
128128
#[serde(deny_unknown_fields)]
129129
pub struct Config {
130130
/// General configuration.
@@ -135,10 +135,6 @@ pub struct Config {
135135
#[serde(default)]
136136
pub rewrite: Rewrite,
137137

138-
/// Statistics.
139-
#[serde(default)]
140-
pub stats: Stats,
141-
142138
/// TCP settings
143139
#[serde(default)]
144140
pub tcp: Tcp,

pgdog-config/src/general.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use super::database::{LoadBalancingStrategy, ReadWriteSplit, ReadWriteStrategy};
1212
use super::networking::TlsVerifyMode;
1313
use super::pooling::{PoolerMode, PreparedStatements};
1414

15-
#[derive(Serialize, Deserialize, Debug, Clone)]
15+
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
1616
#[serde(deny_unknown_fields)]
1717
pub struct General {
1818
/// Run on this address.

pgdog-config/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub use general::General;
2727
pub use memory::*;
2828
pub use networking::{MultiTenant, Tcp, TlsVerifyMode};
2929
pub use overrides::Overrides;
30-
pub use pooling::{PoolerMode, PreparedStatements, Stats};
30+
pub use pooling::{PoolerMode, PreparedStatements};
3131
pub use replication::*;
3232
pub use rewrite::{Rewrite, RewriteMode};
3333
pub use sharding::*;

pgdog-config/src/memory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use serde::{Deserialize, Serialize};
22

3-
#[derive(Serialize, Deserialize, Debug, Clone)]
3+
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
44
#[serde(deny_unknown_fields)]
55
pub struct Memory {
66
#[serde(default = "default_net_buffer")]

pgdog-config/src/pooling.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ impl FromStr for PreparedStatements {
3939
}
4040
}
4141

42-
/// Empty struct for stats
43-
#[derive(Serialize, Deserialize, Debug, Clone, Default)]
44-
pub struct Stats {}
45-
4642
#[derive(Serialize, Deserialize, Debug, Clone, Copy, Default, PartialEq, Eq, Ord, PartialOrd)]
4743
#[serde(rename_all = "snake_case")]
4844
pub enum PoolerMode {

pgdog-config/src/replication.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ struct RawReplicaLag {
1111
max_age: Option<u64>,
1212
}
1313

14-
#[derive(Debug, Clone)]
14+
#[derive(Debug, Clone, PartialEq)]
1515
pub struct ReplicaLag {
1616
pub check_interval: Duration,
1717
pub max_age: Duration,
@@ -119,7 +119,7 @@ impl Default for Replication {
119119
}
120120

121121
/// Mirroring configuration.
122-
#[derive(Serialize, Deserialize, Debug, Clone, Default)]
122+
#[derive(Serialize, Deserialize, Debug, Clone, Default, PartialEq)]
123123
#[serde(deny_unknown_fields)]
124124
pub struct Mirroring {
125125
/// Source database name to mirror from.

pgdog-config/src/rewrite.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl FromStr for RewriteMode {
4040
}
4141
}
4242

43-
#[derive(Serialize, Deserialize, Debug, Clone)]
43+
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
4444
#[serde(deny_unknown_fields)]
4545
pub struct Rewrite {
4646
/// Global rewrite toggle. When disabled, rewrite-specific features remain

pgdog-config/src/users.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub struct Plugin {
1616
}
1717

1818
/// Users and passwords.
19-
#[derive(Serialize, Deserialize, Debug, Clone, Default)]
19+
#[derive(Serialize, Deserialize, Debug, Clone, Default, PartialEq)]
2020
#[serde(deny_unknown_fields)]
2121
pub struct Users {
2222
pub admin: Option<Admin>,

pgdog/src/config/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub use networking::{MultiTenant, Tcp, TlsVerifyMode};
2424
pub use overrides::Overrides;
2525
pub use pgdog_config::auth::{AuthType, PassthoughAuth};
2626
pub use pgdog_config::{LoadBalancingStrategy, ReadWriteSplit, ReadWriteStrategy};
27-
pub use pooling::{ConnectionRecovery, PoolerMode, PreparedStatements, Stats};
27+
pub use pooling::{ConnectionRecovery, PoolerMode, PreparedStatements};
2828
pub use rewrite::{Rewrite, RewriteMode};
2929
pub use users::{Admin, Plugin, User, Users};
3030

pgdog/src/config/pooling.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pub use pgdog_config::{pooling::ConnectionRecovery, PoolerMode, PreparedStatements, Stats};
1+
pub use pgdog_config::{pooling::ConnectionRecovery, PoolerMode, PreparedStatements};

0 commit comments

Comments
 (0)