Skip to content

RUST-1844 Consolidate server ID fields in ConnectionInfo #1041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2024
Merged

RUST-1844 Consolidate server ID fields in ConnectionInfo #1041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 2 additions & 10 deletions src/cmap/conn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,7 @@ pub struct ConnectionInfo {

/// A server-generated identifier that uniquely identifies the connection. Available on server
/// versions 4.2+. This may be used to correlate driver connections with server logs.
/// If the connection ID sent by the server is too large for an i32, this will be a truncated
/// value.
pub server_id: Option<i32>,

/// A server-generated identifier that uniquely identifies the connection. Available on server
/// versions 4.2+. This may be used to correlate driver connections with server logs. This
/// value will not be truncated and should be used rather than `server_id`.
pub server_id_i64: Option<i64>,
pub server_id: Option<i64>,

/// The address that the connection is connected to.
pub address: ServerAddress,
Expand Down Expand Up @@ -183,8 +176,7 @@ impl Connection {
pub(crate) fn info(&self) -> ConnectionInfo {
ConnectionInfo {
id: self.id,
server_id: self.server_id.map(|value| value as i32),
server_id_i64: self.server_id,
server_id: self.server_id,
address: self.address.clone(),
}
}
Expand Down