Skip to content

fix: resolve compiler warnings on macOS (clang) and Linux #1140

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
dimitri merged 2 commits into from
Jul 10, 2026
Merged

fix: resolve compiler warnings on macOS (clang) and Linux #1140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f057d3
fix: resolve compiler warnings on macOS and Linux
dimitri Jul 10, 2026
ec7feb5
Merge branch 'main' into fix/compiler-warnings
dimitri Jul 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
6 changes: 6 additions & 0 deletions src/bin/pg_autoctl/cli_formation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,12 @@ keeper_cli_formation_create_getopts(int argc, char **argv)
}
}

if (errors > 0)
{
commandline_help(stderr);
exit(EXIT_CODE_BAD_ARGS);
}

/* when we have a monitor URI we don't need PGDATA */
if (cli_formation_use_monitor_option(&options))
{
Expand Down
43 changes: 30 additions & 13 deletions src/bin/pg_autoctl/coordinator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,12 @@ coordinator_add_node(Coordinator *coordinator, Keeper *keeper,

SingleValueResultContext parseContext = { { 0 }, PGSQL_RESULT_INT, false };

IntString pgPortStr = intToString(keeper->config.pgSetup.pgport);
IntString groupIdStr = intToString(keeper->config.groupId);

paramValues[0] = keeper->config.hostname;
paramValues[1] = intToString(keeper->config.pgSetup.pgport).strValue;
paramValues[2] = intToString(keeper->config.groupId).strValue;
paramValues[1] = pgPortStr.strValue;
paramValues[2] = groupIdStr.strValue;
paramValues[3] = citusRoleStr;
paramValues[4] = clusterName;

Expand Down Expand Up @@ -230,6 +233,8 @@ coordinator_add_inactive_node(Coordinator *coordinator, Keeper *keeper,
: keeper->config.pgSetup.citusClusterName;

SingleValueResultContext parseContext = { { 0 }, PGSQL_RESULT_INT, false };
IntString pgPortStr = intToString(keeper->config.pgSetup.pgport);
IntString groupIdStr = intToString(keeper->config.groupId);

if (!coordinator_master_activate_node_returns_record(pgsql, &returnsRecord))
{
Expand All @@ -248,8 +253,8 @@ coordinator_add_inactive_node(Coordinator *coordinator, Keeper *keeper,
}

paramValues[0] = keeper->config.hostname;
paramValues[1] = intToString(keeper->config.pgSetup.pgport).strValue;
paramValues[2] = intToString(keeper->config.groupId).strValue;
paramValues[1] = pgPortStr.strValue;
paramValues[2] = groupIdStr.strValue;
paramValues[3] = citusRoleStr;
paramValues[4] = clusterName;

Expand Down Expand Up @@ -323,8 +328,10 @@ coordinator_activate_node(Coordinator *coordinator, Keeper *keeper,
sql = sqlInteger;
}

IntString pgPortStr = intToString(keeper->config.pgSetup.pgport);

paramValues[0] = keeper->config.hostname;
paramValues[1] = intToString(keeper->config.pgSetup.pgport).strValue;
paramValues[1] = pgPortStr.strValue;

if (!pgsql_execute_with_params(pgsql, sql,
paramCount, paramTypes, paramValues,
Expand Down Expand Up @@ -372,8 +379,10 @@ coordinator_remove_node(Coordinator *coordinator, Keeper *keeper)
Oid paramTypes[2] = { TEXTOID, INT4OID };
const char *paramValues[2];

IntString pgPortStr = intToString(keeper->config.pgSetup.pgport);

paramValues[0] = keeper->config.hostname;
paramValues[1] = intToString(keeper->config.pgSetup.pgport).strValue;
paramValues[1] = pgPortStr.strValue;

if (!pgsql_execute_with_params(pgsql, sql,
paramCount, paramTypes, paramValues,
Expand Down Expand Up @@ -621,12 +630,16 @@ coordinator_update_node_prepare(Coordinator *coordinator, Keeper *keeper)
" and not exists"
" (select 1 from pg_prepared_xacts where gid = $4)");

paramValues[0] = intToString(groupId).strValue;
IntString groupIdStr = intToString(groupId);
IntString pgPortStr = intToString(keeper->config.pgSetup.pgport);
IntString lockCooldownStr = intToString(
keeper->config.citus_master_update_node_lock_cooldown);

paramValues[0] = groupIdStr.strValue;
paramValues[1] = keeper->config.hostname;
paramValues[2] = intToString(keeper->config.pgSetup.pgport).strValue;
paramValues[2] = pgPortStr.strValue;
paramValues[3] = transactionName;
paramValues[4] = intToString(
keeper->config.citus_master_update_node_lock_cooldown).strValue;
paramValues[4] = lockCooldownStr.strValue;

if (!pgsql_execute_with_params(pgsql, sql,
paramCount, paramTypes, paramValues,
Expand All @@ -642,6 +655,8 @@ coordinator_update_node_prepare(Coordinator *coordinator, Keeper *keeper)
const int paramCount = 4;
Oid paramTypes[4] = { INT4OID, TEXTOID, INT4OID, TEXTOID };
const char *paramValues[4];
IntString groupIdStr = intToString(groupId);
IntString pgPortStr = intToString(keeper->config.pgSetup.pgport);

sformat(sql,
sizeof(sql),
Expand All @@ -652,9 +667,9 @@ coordinator_update_node_prepare(Coordinator *coordinator, Keeper *keeper)
" and not exists"
" (select 1 from pg_prepared_xacts where gid = $4)");

paramValues[0] = intToString(groupId).strValue;
paramValues[0] = groupIdStr.strValue;
paramValues[1] = keeper->config.hostname;
paramValues[2] = intToString(keeper->config.pgSetup.pgport).strValue;
paramValues[2] = pgPortStr.strValue;
paramValues[3] = transactionName;

if (!pgsql_execute_with_params(pgsql, sql,
Expand Down Expand Up @@ -798,14 +813,16 @@ coordinator_upsert_poolinfo_port(Coordinator *coordinator, Keeper *keeper)
Oid paramTypes[2] = { INT4OID, TEXTOID };
const char *paramValues[2];
char proxyInfo[MAXCONNINFO];
IntString groupIdStr;

/*
* Prepare a argument for pg_dist_poolinfo table
*/
sformat(proxyInfo, sizeof(proxyInfo), "host=%s port=%d",
keeper->config.hostname, keeper->config.pgSetup.proxyport);

paramValues[0] = intToString(keeper->config.groupId).strValue;
groupIdStr = intToString(keeper->config.groupId);
paramValues[0] = groupIdStr.strValue;
paramValues[1] = proxyInfo;

if (!pgsql_execute_with_params(pgsql, sql,
Expand Down
33 changes: 23 additions & 10 deletions src/bin/pg_autoctl/demoapp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,10 +482,15 @@ demoapp_register_client(const char *pguri,
const Oid paramTypes[4] = { INT4OID, INT4OID, INT4OID, INT4OID };
const char *paramValues[4] = { 0 };

paramValues[0] = intToString(clientId).strValue;
paramValues[1] = intToString(getpid()).strValue;
paramValues[2] = intToString(retrySleep).strValue;
paramValues[3] = intToString(retryCap).strValue;
IntString clientIdStr = intToString(clientId);
IntString pidStr = intToString(getpid());
IntString retrySleepStr = intToString(retrySleep);
IntString retryCapStr = intToString(retryCap);

paramValues[0] = clientIdStr.strValue;
paramValues[1] = pidStr.strValue;
paramValues[2] = retrySleepStr.strValue;
paramValues[3] = retryCapStr.strValue;

pgsql_init(&pgsql, (char *) pguri, PGSQL_CONN_APP);

Expand Down Expand Up @@ -519,8 +524,11 @@ demoapp_update_client_failovers(const char *pguri, int clientId, int failovers)
const Oid paramTypes[2] = { INT4OID, INT4OID };
const char *paramValues[2] = { 0 };

paramValues[0] = intToString(clientId).strValue;
paramValues[1] = intToString(failovers).strValue;
IntString clientIdStr = intToString(clientId);
IntString failoversStr = intToString(failovers);

paramValues[0] = clientIdStr.strValue;
paramValues[1] = failoversStr.strValue;

pgsql_init(&pgsql, (char *) pguri, PGSQL_CONN_APP);

Expand Down Expand Up @@ -699,10 +707,15 @@ demoapp_start_client(const char *pguri, int clientId,
const Oid paramTypes[5] = { INT4OID, INT4OID, INT8OID, INT8OID, BOOLOID };
const char *paramValues[5] = { 0 };

paramValues[0] = intToString(clientId).strValue;
paramValues[1] = intToString(index).strValue;
paramValues[2] = intToString(pgsql.retryPolicy.attempts).strValue;
paramValues[3] = intToString(INSTR_TIME_GET_MICROSEC(duration)).strValue;
IntString clientIdStr = intToString(clientId);
IntString indexStr = intToString(index);
IntString attemptsStr = intToString(pgsql.retryPolicy.attempts);
IntString durationStr = intToString(INSTR_TIME_GET_MICROSEC(duration));

paramValues[0] = clientIdStr.strValue;
paramValues[1] = indexStr.strValue;
paramValues[2] = attemptsStr.strValue;
paramValues[3] = durationStr.strValue;
paramValues[4] = is_in_recovery ? "true" : "false";

if (!pgsql_execute_with_params(&pgsql, sql, 5, paramTypes, paramValues,
Expand Down
2 changes: 1 addition & 1 deletion src/bin/pg_autoctl/primary_standby.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,7 @@ postgres_maybe_do_crash_recovery(LocalPostgresServer *postgres)
default:
{
/* wait until postgres crash recovery is done */
for (int attempts = 0;; attempts++)
for (;;)
{
int timeout = 30;

Expand Down