Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ lto = true
[workspace.dependencies]
tokio = { version = "1.45.1" }
tracing = { version = "0.1" }
pyo3 = { version = "0.23", features = ["extension-module", "serde", "macros"] }
pyo3 = { version = "0.26", features = ["extension-module", "serde", "macros"] }

[workspace.package]
rust-version = "1.85" # keep in sync with flake.nix
Expand Down
24 changes: 12 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
buildInputs = [
(fenix_pkgs.fromToolchainFile {
file = ./rust-toolchain.toml;
sha256 = "sha256-Hn2uaQzRLidAWpfmRwSRdImifGUCAb9HeAqTYFXWeQk=";
sha256 = "sha256-Qxt8XAuaUR2OMdKbN4u8dBJOhSHxS+uS06Wl9+flVEk=";
})
] ++ common;
};
Expand Down
2 changes: 1 addition & 1 deletion gel-babelfish/src/listener/gel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pub async fn handle_stream_gel_binary(
eprintln!("auth ready");
let built = match identity.clone().build() {
Ok(built) => built,
Err(e) => {
Err(_) => {
server_state
.drive(
ConnectionDrive::Fail(
Expand Down
4 changes: 2 additions & 2 deletions gel-babelfish/src/listener/postgres.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub async fn handle_stream_postgres_ssl(
bound_config: impl IsBoundConfig,
) -> Result<(), std::io::Error> {
// Postgres checks to see if the socket is readable and fails here
let peek = [0; 1];
// let peek = [0; 1];
// let len = socket.peek(&mut peek).await?;
// if len != 0 {
// return Err(std::io::Error::new(
Expand Down Expand Up @@ -111,7 +111,7 @@ pub async fn handle_stream_postgres_initial(
} else if auth_ready.swap(false, Ordering::SeqCst) {
let built = match identity.clone().build() {
Ok(built) => built,
Err(e) => {
Err(_) => {
server_state.drive(ConnectionDrive::Fail(PgError::InvalidAuthorizationSpecification(PgErrorInvalidAuthorizationSpecification::InvalidAuthorizationSpecification), "Missing database or user"), &mut update).unwrap();
return Ok(());
}
Expand Down
Loading