Skip to content

Fix progress tracking #337

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
rasifr merged 2 commits into from
Feb 9, 2026
Merged

Fix progress tracking #337

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
17f6bcc
Fix progress tracking
mason-sharp Feb 8, 2026
f758b32
Address codacy strlen complaint
mason-sharp Feb 8, 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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ REGRESS = preseed infofuncs init_fail init preseed_check basic conflict_secondar
toasted replication_set matview bidirectional primary_key \
interfaces foreign_key copy sequence triggers parallel functions row_filter \
row_filter_sampling att_list column_filter apply_delay \
extended node_origin_cascade multiple_upstreams tuple_origin autoddl \
extended progress_tracking node_origin_cascade multiple_upstreams tuple_origin autoddl \
drop

# The following test cases are disabled while developing.
Expand Down
34 changes: 17 additions & 17 deletions src/spock_sync.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,14 +395,18 @@ adjust_progress_info(PGconn *origin_conn, PGconn *target_conn)
" last_updated_ts, updated_by_decode "
"FROM spock.progress "
"WHERE node_id = %u AND remote_node_id <> %u";
const char *updateQuery =
"UPDATE spock.progress SET "
" remote_commit_ts = %s, "
" remote_lsn = %s, "
" remote_insert_lsn = %s, "
" last_updated_ts = %s, "
" updated_by_decode = %s "
"WHERE node_id = '%d' AND remote_node_id = '%d'";
const char *upsertQuery =
"INSERT INTO spock.progress "
" (node_id, remote_node_id, remote_commit_ts, "
" remote_lsn, remote_insert_lsn, "
" last_updated_ts, updated_by_decode) "
"VALUES (%u, %s, %s, %s, %s, %s, %s) "
"ON CONFLICT (node_id, remote_node_id) DO UPDATE SET "
" remote_commit_ts = EXCLUDED.remote_commit_ts, "
" remote_lsn = EXCLUDED.remote_lsn, "
" remote_insert_lsn = EXCLUDED.remote_insert_lsn, "
" last_updated_ts = EXCLUDED.last_updated_ts, "
" updated_by_decode = EXCLUDED.updated_by_decode";

StringInfoData query;
PGresult *originRes;
Expand All @@ -428,12 +432,8 @@ adjust_progress_info(PGconn *origin_conn, PGconn *target_conn)
for (rno = 0; rno < PQntuples(originRes); rno++)
{
/*
* Update the remote node's progress entry to what our
* Upsert the remote node's progress entry to what our
* sync provider has included in the COPY snapshot.
*
* We assume here that the progress table entry already
* exists. Turning this into an INSERT if not should be
* easy.
*/
char *remote_node_id = PQgetvalue(originRes, rno, 1);
char *remote_commit_ts = PQgetvalue(originRes, rno, 2);
Expand All @@ -443,7 +443,9 @@ adjust_progress_info(PGconn *origin_conn, PGconn *target_conn)
char *updated_by_decode = PQgetvalue(originRes, rno, 6);

resetStringInfo(&query);
appendStringInfo(&query, updateQuery,
appendStringInfo(&query, upsertQuery,
MySubscription->target->id,
remote_node_id,
PQescapeLiteral(target_conn, remote_commit_ts,
strlen(remote_commit_ts)),
PQescapeLiteral(target_conn, remote_lsn,
Expand All @@ -453,9 +455,7 @@ adjust_progress_info(PGconn *origin_conn, PGconn *target_conn)
PQescapeLiteral(target_conn, last_updated_ts,
strlen(last_updated_ts)),
PQescapeLiteral(target_conn, updated_by_decode,
strlen(updated_by_decode)),
MySubscription->target->id,
MySubscription->origin->id);
strnlen(updated_by_decode, 64)));
updateRes = PQexec(target_conn, query.data);

if (PQresultStatus(updateRes) != PGRES_COMMAND_OK)
Expand Down
Loading