mirror of
https://github.com/neondatabase/neon.git
synced 2026-05-24 00:20:37 +00:00
1d642d6a57
Our rust-postgres fork is getting messy. Mostly because proxy wants more
control over the raw protocol than tokio-postgres provides. As such,
it's diverging more and more. Storage and compute also make use of
rust-postgres, but in more normal usage, thus they don't need our crazy
changes.
Idea:
* proxy maintains their subset
* other teams use a minimal patch set against upstream rust-postgres
Reviewing this code will be difficult. To implement it, I
1. Copied tokio-postgres, postgres-protocol and postgres-types from
00940fcdb5
2. Updated their package names with the `2` suffix to make them compile
in the workspace.
3. Updated proxy to use those packages
4. Copied in the code from tokio-postgres-rustls 0.13 (with some patches
applied https://github.com/jbg/tokio-postgres-rustls/pull/32
https://github.com/jbg/tokio-postgres-rustls/pull/33)
5. Removed as much dead code as I could find in the vendored libraries
6. Updated the tokio-postgres-rustls code to use our existing channel
binding implementation
30 lines
763 B
Rust
30 lines
763 B
Rust
use crate::config::SslMode;
|
|
use crate::tls::TlsConnect;
|
|
use crate::{connect_tls, Error};
|
|
use bytes::BytesMut;
|
|
use postgres_protocol2::message::frontend;
|
|
use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
|
|
|
|
pub async fn cancel_query_raw<S, T>(
|
|
stream: S,
|
|
mode: SslMode,
|
|
tls: T,
|
|
process_id: i32,
|
|
secret_key: i32,
|
|
) -> Result<(), Error>
|
|
where
|
|
S: AsyncRead + AsyncWrite + Unpin,
|
|
T: TlsConnect<S>,
|
|
{
|
|
let mut stream = connect_tls::connect_tls(stream, mode, tls).await?;
|
|
|
|
let mut buf = BytesMut::new();
|
|
frontend::cancel_request(process_id, secret_key, &mut buf);
|
|
|
|
stream.write_all(&buf).await.map_err(Error::io)?;
|
|
stream.flush().await.map_err(Error::io)?;
|
|
stream.shutdown().await.map_err(Error::io)?;
|
|
|
|
Ok(())
|
|
}
|