docker/pgcat
1
0
Fork 0
mirror of https://github.com/postgresml/pgcat.git synced 2026-03-24 17:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Reverted an unwanted change + Applied cargo fmt."

Browse Source 
This reverts commit 6bd37b6479.
This commit is contained in:
Mohammad Dashti
2023-10-06 15:15:27 -07:00
parent 49164a733c
commit 69fc1caca1
3 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/admin.rs
View File

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

50
src/messages.rs
View File

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

8
src/sharding.rs
View File

@@ -202,12 +202,8 @@ mod test {
#[test]
fn test_sha1_hash() {
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 shards = [
4, 7, 8, 3, 6, 0, 0, 10, 3, 11, 1, 7, 4, 4, 11, 2, 5, 0, 8, 3,
];
let ids = [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() {
assert_eq!(sharder.shard(*id), shards[i]);