Skip to content

fix(taskbroker): Return explicit columns instead of * from postgres updates #861

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

Open
evanh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(taskbroker): Return explicit columns instead of * from postgres updates #861

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45bb4a8
fix(taskbroker): Disable the postgres prepared statement cache
evanh Nov 10, 2026
89d86c5
fix(taskbroker): Return explicit columns instead of * from postgres u…
evanh Nov 10, 2026
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
35 changes: 20 additions & 15 deletions src/store/adapters/postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ pub async fn migrate(config: &StoreConfig) -> Result<()> {
Ok(())
}

// Explicit columns instead of `*` so cached prepared statements survive migrations that add columns.
const RETURNING_COLUMNS: &str = " RETURNING inflight_taskactivations.id, activation, topic, partition,
kafka_offset AS offset, added_at, received_at, processing_attempts, expires_at, delay_until,
processing_deadline_duration, processing_deadline, claim_expires_at, heartbeat, heartbeat_deadline,
status, at_most_once, application, namespace, taskname, on_attempts_exceeded, bucket";

/// Database representation of an [`Activation`], used for both reads and
/// writes.
///
Expand Down Expand Up @@ -621,7 +627,7 @@ impl ActivationStore for PostgresStore {

query_builder.push(" FROM selected_activations ");
query_builder.push(" WHERE inflight_taskactivations.id = selected_activations.id");
query_builder.push(" RETURNING *, kafka_offset AS offset");
query_builder.push(RETURNING_COLUMNS);

let mut conn = self.acquire_write_conn_metric("claim_activations").await?;
let rows: Vec<TableRow> = query_builder
Expand Down Expand Up @@ -928,13 +934,14 @@ impl ActivationStore for PostgresStore {
retry_query(&self.config.retry, "set_status", || async {
let mut tx = self.begin_write_tx_metric("set_status").await?;

let result: Option<TableRow> = sqlx::query_as(
"UPDATE inflight_taskactivations SET status = $1 WHERE id = $2 RETURNING *, kafka_offset AS offset",
)
.bind(status.to_string())
.bind(id)
.fetch_optional(&mut *tx)
.await?;
let sql = format!(
"UPDATE inflight_taskactivations SET status = $1 WHERE id = $2{RETURNING_COLUMNS}"
);
let result: Option<TableRow> = sqlx::query_as(&sql)
.bind(status.to_string())
.bind(id)
.fetch_optional(&mut *tx)
.await?;

let Some(mut row) = result else {
return Ok(None);
Expand Down Expand Up @@ -964,13 +971,11 @@ impl ActivationStore for PostgresStore {

if needs_update {
let updated_activation = activation.encode_to_vec();
sqlx::query(
"UPDATE inflight_taskactivations SET activation = $1 WHERE id = $2",
)
.bind(&updated_activation)
.bind(id)
.execute(&mut *tx)
.await?;
sqlx::query("UPDATE inflight_taskactivations SET activation = $1 WHERE id = $2")
.bind(&updated_activation)
.bind(id)
.execute(&mut *tx)
.await?;

row.activation = Cow::Owned(updated_activation);
}
Expand Down
Loading