docker/pgcat
1
0
Fork 0
mirror of https://github.com/postgresml/pgcat.git synced 2026-03-23 01:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverted an unwanted change + Applied cargo fmt.

Browse Source
This commit is contained in:
Mohammad Dashti
2023-10-06 13:29:48 -07:00
parent 50654c2ae9
commit 6bd37b6479
3 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/admin.rs
View File

@@ -283,7 +283,8 @@ where
{ {
let mut res = BytesMut::new(); let mut res = BytesMut::new();
let detail_msg = ["", let detail_msg = [
"",
"SHOW HELP|CONFIG|DATABASES|POOLS|CLIENTS|SERVERS|USERS|VERSION", "SHOW HELP|CONFIG|DATABASES|POOLS|CLIENTS|SERVERS|USERS|VERSION",
// "SHOW PEERS|PEER_POOLS", // missing PEERS|PEER_POOLS // "SHOW PEERS|PEER_POOLS", // missing PEERS|PEER_POOLS
// "SHOW FDS|SOCKETS|ACTIVE_SOCKETS|LISTS|MEM|STATE", // missing FDS|SOCKETS|ACTIVE_SOCKETS|MEM|STATE // "SHOW FDS|SOCKETS|ACTIVE_SOCKETS|LISTS|MEM|STATE", // missing FDS|SOCKETS|ACTIVE_SOCKETS|MEM|STATE
@@ -299,7 +300,9 @@ where
// "RECONNECT [<db>]", missing // "RECONNECT [<db>]", missing
// "KILL <db>", // "KILL <db>",
// "SUSPEND", // "SUSPEND",
"SHUTDOWN"]; // "WAIT_CLOSE [<db>]", // missing
"SHUTDOWN",
];
res.put(notify("Console usage", detail_msg.join("\n\t"))); res.put(notify("Console usage", detail_msg.join("\n\t")));
res.put(command_complete("SHOW")); res.put(command_complete("SHOW"));

50
src/messages.rs
View File

@@ -163,12 +163,10 @@ where
match stream.write_all(&startup).await { match stream.write_all(&startup).await {
Ok(_) => Ok(()), Ok(_) => Ok(()),
Err(err) => { Err(err) => Err(Error::SocketError(format!(
Err(Error::SocketError(format!( "Error writing startup to server socket - Error: {:?}",
"Error writing startup to server socket - Error: {:?}", err
err ))),
)))
}
} }
} }
@@ -571,12 +569,10 @@ where
{ {
match stream.write_all(&buf).await { match stream.write_all(&buf).await {
Ok(_) => Ok(()), Ok(_) => Ok(()),
Err(err) => { Err(err) => Err(Error::SocketError(format!(
Err(Error::SocketError(format!( "Error writing to socket - Error: {:?}",
"Error writing to socket - Error: {:?}", err
err ))),
)))
}
} }
} }
@@ -587,12 +583,10 @@ where
{ {
match stream.write_all(buf).await { match stream.write_all(buf).await {
Ok(_) => Ok(()), Ok(_) => Ok(()),
Err(err) => { Err(err) => Err(Error::SocketError(format!(
Err(Error::SocketError(format!( "Error writing to socket - Error: {:?}",
"Error writing to socket - Error: {:?}", err
err ))),
)))
}
} }
} }
@@ -603,19 +597,15 @@ where
match stream.write_all(buf).await { match stream.write_all(buf).await {
Ok(_) => match stream.flush().await { Ok(_) => match stream.flush().await {
Ok(_) => Ok(()), Ok(_) => Ok(()),
Err(err) => { Err(err) => Err(Error::SocketError(format!(
Err(Error::SocketError(format!( "Error flushing socket - Error: {:?}",
"Error flushing socket - Error: {:?}",
err
)))
}
},
Err(err) => {
Err(Error::SocketError(format!(
"Error writing to socket - Error: {:?}",
err err
))) ))),
} },
Err(err) => Err(Error::SocketError(format!(
"Error writing to socket - Error: {:?}",
err
))),
} }
} }

8
src/sharding.rs
View File

@@ -202,8 +202,12 @@ mod test {
#[test] #[test]
fn test_sha1_hash() { fn test_sha1_hash() {
let sharder = Sharder::new(12, ShardingFunction::Sha1); let sharder = Sharder::new(12, ShardingFunction::Sha1);
let ids = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]; let ids = [
let shards = [4, 7, 8, 3, 6, 0, 0, 10, 3, 11, 1, 7, 4, 4, 11, 2, 5, 0, 8, 3]; 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
];
let shards = [
4, 7, 8, 3, 6, 0, 0, 10, 3, 11, 1, 7, 4, 4, 11, 2, 5, 0, 8, 3,
];
for (i, id) in ids.iter().enumerate() { for (i, id) in ids.iter().enumerate() {
assert_eq!(sharder.shard(*id), shards[i]); assert_eq!(sharder.shard(*id), shards[i]);