Skip to content

Replace C-style libpq parameter arrays with std::array in Postgres stores #135

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
MisterVVP merged 1 commit into from
Jul 6, 2026
Merged

Replace C-style libpq parameter arrays with std::array in Postgres stores #135

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
27 changes: 16 additions & 11 deletions src/server/stores/postgres_notification_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <libpq-fe.h>

#include <algorithm>
#include <array>
#include <charconv>
#include <stdexcept>
#include <string>
Expand Down Expand Up @@ -105,14 +106,17 @@ core::Result<lf::a2a::v1::TaskPushNotificationConfig> PostgresPushNotificationSt
" (task_id, config_id, url, config_proto, updated_at) VALUES ($1, $2, $3, $4, now()) "
"ON CONFLICT (task_id, config_id) DO UPDATE SET url = EXCLUDED.url, "
"config_proto = EXCLUDED.config_proto, updated_at = now()";
const char* values[] = {config.task_id().c_str(), config.id().c_str(), config.url().c_str(), payload.data()};
const int lengths[] = {0, 0, 0, static_cast<int>(payload.size())};
const int formats[] = {0, 0, 0, 1};
constexpr int kPushUpsertParameterCount = 4;
const std::array<const char*, kPushUpsertParameterCount> values = {config.task_id().c_str(), config.id().c_str(),
config.url().c_str(), payload.data()};
const std::array<int, kPushUpsertParameterCount> lengths = {0, 0, 0, static_cast<int>(payload.size())};
const std::array<int, kPushUpsertParameterCount> formats = {0, 0, 0, 1};
auto lease = pool_->Acquire();
if (!lease.ok()) {
return lease.error();
}
PgResult result(PQexecParams(lease.value().get(), sql.c_str(), 4, nullptr, values, lengths, formats, 0));
PgResult result(
PQexecParams(lease.value().get(), sql.c_str(), 4, nullptr, values.data(), lengths.data(), formats.data(), 0));
const auto checked = CheckCommand(lease.value().get(), result.get(), "upsert postgres push notification config");
if (!checked.ok()) {
return checked.error();
Expand All @@ -130,19 +134,20 @@ core::Result<lf::a2a::v1::TaskPushNotificationConfig> PostgresPushNotificationSt
const std::string config_id_value(config_id);
const std::string sql =
"SELECT config_proto FROM " + PushTable(options_.schema) + " WHERE task_id = $1 AND config_id = $2";
const char* values[] = {task_id_value.c_str(), config_id_value.c_str()};
const std::array<const char*, 2> values = {task_id_value.c_str(), config_id_value.c_str()};
auto lease = pool_->Acquire();
if (!lease.ok()) {
return lease.error();
}
PgResult result(PQexecParams(lease.value().get(), sql.c_str(), 2, nullptr, values, nullptr, nullptr, 1));
PgResult result(PQexecParams(lease.value().get(), sql.c_str(), 2, nullptr, values.data(), nullptr, nullptr, 1));
const auto checked = CheckTuples(lease.value().get(), result.get(), "get postgres push notification config");
if (!checked.ok()) {
return checked.error();
}
if (PQntuples(result.get()) == 0) {
const std::string exists_sql = "SELECT 1 FROM " + PushTable(options_.schema) + " WHERE task_id = $1 LIMIT 1";
PgResult exists(PQexecParams(lease.value().get(), exists_sql.c_str(), 1, nullptr, &values[0], nullptr, nullptr, 0));
PgResult exists(
PQexecParams(lease.value().get(), exists_sql.c_str(), 1, nullptr, values.data(), nullptr, nullptr, 0));
const auto exists_checked =
CheckTuples(lease.value().get(), exists.get(), "check postgres push notification task configs");
if (!exists_checked.ok()) {
Expand Down Expand Up @@ -173,15 +178,15 @@ core::Result<lf::a2a::v1::ListTaskPushNotificationConfigsResponse> PostgresPushN
return offset.error();
}
const std::string task_id_value(task_id);
const char* count_values[] = {task_id_value.c_str()};
const std::array<const char*, 1> count_values = {task_id_value.c_str()};
auto lease = pool_->Acquire();
if (!lease.ok()) {
return lease.error();
}

const std::string count_sql = "SELECT count(*) FROM " + PushTable(options_.schema) + " WHERE task_id = $1";
PgResult count_result(
PQexecParams(lease.value().get(), count_sql.c_str(), 1, nullptr, count_values, nullptr, nullptr, 0));
PQexecParams(lease.value().get(), count_sql.c_str(), 1, nullptr, count_values.data(), nullptr, nullptr, 0));
const auto count_checked =
CheckTuples(lease.value().get(), count_result.get(), "count postgres push notification configs");
if (!count_checked.ok()) {
Expand Down Expand Up @@ -245,12 +250,12 @@ core::Result<void> PostgresPushNotificationStore::Delete(std::string_view task_i
const std::string task_id_value(task_id);
const std::string config_id_value(config_id);
const std::string sql = "DELETE FROM " + PushTable(options_.schema) + " WHERE task_id = $1 AND config_id = $2";
const char* values[] = {task_id_value.c_str(), config_id_value.c_str()};
const std::array<const char*, 2> values = {task_id_value.c_str(), config_id_value.c_str()};
auto lease = pool_->Acquire();
if (!lease.ok()) {
return lease.error();
}
PgResult result(PQexecParams(lease.value().get(), sql.c_str(), 2, nullptr, values, nullptr, nullptr, 0));
PgResult result(PQexecParams(lease.value().get(), sql.c_str(), 2, nullptr, values.data(), nullptr, nullptr, 0));
return CheckCommand(lease.value().get(), result.get(), "delete postgres push notification config");
}

Expand Down
24 changes: 13 additions & 11 deletions src/server/stores/postgres_task_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <libpq-fe.h>

#include <algorithm>
#include <array>
#include <charconv>
#include <mutex>
#include <stdexcept>
Expand Down Expand Up @@ -38,14 +39,15 @@ namespace {
"ON CONFLICT (id) DO UPDATE SET context_id = EXCLUDED.context_id, state = EXCLUDED.state, "
"has_status_timestamp = EXCLUDED.has_status_timestamp, status_seconds = EXCLUDED.status_seconds, "
"status_nanos = EXCLUDED.status_nanos, task_proto = EXCLUDED.task_proto, updated_at = now()";
const char* values[] = {task.id().c_str(), task.context_id().c_str(), state.c_str(),
has_timestamp.c_str(), seconds.c_str(), nanos.c_str(),
payload.data()};
const int lengths[] = {0, 0, 0, 0, 0, 0, static_cast<int>(payload.size())};
const int formats[] = {0, 0, 0, 0, 0, 0, 1};
constexpr int kTaskUpsertParameterCount = 7;
PgResult result(
PQexecParams(connection, sql.c_str(), kTaskUpsertParameterCount, nullptr, values, lengths, formats, 0));
const std::array<const char*, kTaskUpsertParameterCount> values = {task.id().c_str(), task.context_id().c_str(),
state.c_str(), has_timestamp.c_str(),
seconds.c_str(), nanos.c_str(),
payload.data()};
const std::array<int, kTaskUpsertParameterCount> lengths = {0, 0, 0, 0, 0, 0, static_cast<int>(payload.size())};
const std::array<int, kTaskUpsertParameterCount> formats = {0, 0, 0, 0, 0, 0, 1};
PgResult result(PQexecParams(connection, sql.c_str(), kTaskUpsertParameterCount, nullptr, values.data(),
lengths.data(), formats.data(), 0));
return CheckCommand(connection, result.get(), "upsert postgres task");
}

Expand All @@ -64,8 +66,8 @@ namespace {
std::string_view id) {
const std::string id_value(id);
const std::string sql = "SELECT task_proto FROM " + TaskTable(options.schema) + " WHERE id = $1 FOR UPDATE";
const char* values[] = {id_value.c_str()};
PgResult result(PQexecParams(connection, sql.c_str(), 1, nullptr, values, nullptr, nullptr, 1));
const std::array<const char*, 1> values = {id_value.c_str()};
PgResult result(PQexecParams(connection, sql.c_str(), 1, nullptr, values.data(), nullptr, nullptr, 1));
const auto checked = CheckTuples(connection, result.get(), "select postgres task for update");
if (!checked.ok()) {
return checked.error();
Expand Down Expand Up @@ -179,12 +181,12 @@ core::Result<lf::a2a::v1::Task> PostgresTaskStore::Get(std::string_view id) cons
}
const std::string id_value(id);
const std::string sql = "SELECT task_proto FROM " + TaskTable(options_.schema) + " WHERE id = $1";
const char* values[] = {id_value.c_str()};
const std::array<const char*, 1> values = {id_value.c_str()};
auto lease = pool_->Acquire();
if (!lease.ok()) {
return lease.error();
}
PgResult result(PQexecParams(lease.value().get(), sql.c_str(), 1, nullptr, values, nullptr, nullptr, 1));
PgResult result(PQexecParams(lease.value().get(), sql.c_str(), 1, nullptr, values.data(), nullptr, nullptr, 1));
const auto checked = CheckTuples(lease.value().get(), result.get(), "get postgres task");
if (!checked.ok()) {
return checked.error();
Expand Down
Loading