Skip to content

postgres: record which connection counter a request bumped as one enum #38000

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
alii merged 1 commit into from
Aug 13, 2026
Merged

postgres: record which connection counter a request bumped as one enum #38000

Show file tree
Hide file tree
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
41 changes: 18 additions & 23 deletions src/sql_jsc/postgres/PostgresSQLConnection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use crate::postgres::data_cell as DataCell;
use crate::postgres::error_jsc::{create_postgres_error, postgres_error_to_js};
use crate::postgres::postgres_request as PostgresRequest;
use crate::postgres::postgres_request::MessageType;
use crate::postgres::postgres_sql_query::{self, Status as QueryStatus};
use crate::postgres::postgres_sql_query::{self, RequestCounter, Status as QueryStatus};
use crate::postgres::postgres_sql_statement::{Error as StatementError, Status as StatementStatus};
use crate::postgres::sasl::SASLStatus;
use crate::shared::CachedStructure as PostgresCachedStructure;
Expand Down Expand Up @@ -1763,19 +1763,20 @@ impl PostgresSQLConnection {
fn finish_request(&self, item: &PostgresSQLQuery) {
match item.status.get() {
QueryStatus::Running | QueryStatus::Binding | QueryStatus::PartialResponse => {
let flags = item.flags.get();
if !flags.counted {
return;
}
item.update_flags(|f| f.counted = false);
if flags.simple {
let n = self.nonpipelinable_requests.get();
debug_assert!(n > 0, "nonpipelinable_requests underflow");
self.nonpipelinable_requests.set(n.saturating_sub(1));
} else if flags.pipelined {
let n = self.pipelined_requests.get();
debug_assert!(n > 0, "pipelined_requests underflow");
self.pipelined_requests.set(n.saturating_sub(1));
let counter = item.flags.get().counter;
item.update_flags(|f| f.counter = RequestCounter::None);
match counter {
RequestCounter::None => {}
RequestCounter::Nonpipelinable => {
let n = self.nonpipelinable_requests.get();
debug_assert!(n > 0, "nonpipelinable_requests underflow");
self.nonpipelinable_requests.set(n.saturating_sub(1));
}
RequestCounter::Pipelined => {
let n = self.pipelined_requests.get();
debug_assert!(n > 0, "pipelined_requests underflow");
self.pipelined_requests.set(n.saturating_sub(1));
}
}
}
QueryStatus::Pending => {
Expand Down Expand Up @@ -1895,7 +1896,7 @@ impl PostgresSQLConnection {
}
self.nonpipelinable_requests
.set(self.nonpipelinable_requests.get() + 1);
req.update_flags(|f| f.counted = true);
req.update_flags(|f| f.counter = RequestCounter::Nonpipelinable);
self.update_flags(|f| f.remove(ConnectionFlags::IS_READY_FOR_QUERY));
req.status.set(QueryStatus::Running);
defer_cleanup!(self);
Expand Down Expand Up @@ -2028,10 +2029,7 @@ impl PostgresSQLConnection {
f.remove(ConnectionFlags::IS_READY_FOR_QUERY)
});
req.status.set(QueryStatus::Binding);
req.update_flags(|f| {
f.pipelined = true;
f.counted = true;
});
req.update_flags(|f| f.counter = RequestCounter::Pipelined);
self.pipelined_requests
.set(self.pipelined_requests.get() + 1);

Expand Down Expand Up @@ -2194,10 +2192,7 @@ impl PostgresSQLConnection {
});
req.status.set(QueryStatus::Binding);
statement.status = StatementStatus::Parsing;
req.update_flags(|f| {
f.pipelined = true;
f.counted = true;
});
req.update_flags(|f| f.counter = RequestCounter::Pipelined);
self.pipelined_requests
.set(self.pipelined_requests.get() + 1);
self.flush_data_and_reset_timeout();
Expand Down
29 changes: 16 additions & 13 deletions src/sql_jsc/postgres/PostgresSQLQuery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,30 @@ pub struct Flags {
pub(crate) binary: bool,
pub(crate) bigint: bool,
pub(crate) simple: bool,
pub(crate) pipelined: bool,
/// Set when this request's dispatch incremented the connection's
/// `pipelined_requests` / `nonpipelinable_requests` counter; cleared when
/// `finish_request` consumes that contribution. Makes the decrement
/// idempotent across the three `finish_request` call sites.
pub(crate) counted: bool,
/// Which connection counter this request's dispatch incremented; reset to
/// `None` when `finish_request` consumes that contribution, so the
/// decrement is idempotent across its call sites.
pub(crate) counter: RequestCounter,
pub(crate) result_mode: PostgresSQLQueryResultMode,
}

#[derive(Clone, Copy, PartialEq, Eq)]
pub enum RequestCounter {
None,
/// `PostgresSQLConnection::nonpipelinable_requests`
Nonpipelinable,
/// `PostgresSQLConnection::pipelined_requests`
Pipelined,
}

impl Default for Flags {
fn default() -> Self {
Self {
is_done: false,
binary: false,
bigint: false,
simple: false,
pipelined: false,
counted: false,
counter: RequestCounter::None,
result_mode: PostgresSQLQueryResultMode::Objects,
}
}
Expand Down Expand Up @@ -547,7 +553,7 @@ impl PostgresSQLQuery {
connection
.nonpipelinable_requests
.set(connection.nonpipelinable_requests.get() + 1);
this.update_flags(|f| f.counted = true);
this.update_flags(|f| f.counter = RequestCounter::Nonpipelinable);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
this.status.set(Status::Running);
} else {
this.status.set(Status::Pending);
Expand Down Expand Up @@ -681,10 +687,7 @@ impl PostgresSQLQuery {
connection.flags.set(f);
}
this.status.set(Status::Binding);
this.update_flags(|f| {
f.pipelined = true;
f.counted = true;
});
this.update_flags(|f| f.counter = RequestCounter::Pipelined);
connection
.pipelined_requests
.set(connection.pipelined_requests.get() + 1);
Expand Down