From 726683dbd1e6cc22e14e9dcc7df79888090ead31 Mon Sep 17 00:00:00 2001 From: Vignesh C Date: Tue, 11 Nov 2025 19:55:21 +0530 Subject: [PATCH v2] Rename sync_error_count to sync_table_error_count in subscription statistics This patch renames the sync_error_count column to sync_table_error_count in the pg_stat_subscription_stats view. The new name makes the purpose explicit now that a separate column exists to track sequence synchronization errors. Additionally, the column seq_sync_error_count is renamed to sync_seq_error_count to maintain a consistent naming pattern, making it easier for users to group, understand, and query all synchronization related error counters. --- doc/src/sgml/monitoring.sgml | 4 ++-- src/backend/catalog/system_views.sql | 4 ++-- .../utils/activity/pgstat_subscription.c | 8 +++---- src/backend/utils/adt/pgstatfuncs.c | 12 +++++----- src/include/catalog/pg_proc.dat | 2 +- src/include/pgstat.h | 8 +++---- src/test/regress/expected/rules.out | 6 ++--- src/test/subscription/t/026_stats.pl | 22 +++++++++---------- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index 7b9fa20df9e..436ef0e8bd0 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -2195,7 +2195,7 @@ description | Waiting for a newly initialized WAL file to reach durable storage - seq_sync_error_count bigint + sync_seq_error_count bigint Number of times an error occurred in the sequence synchronization @@ -2206,7 +2206,7 @@ description | Waiting for a newly initialized WAL file to reach durable storage - sync_error_count bigint + sync_table_error_count bigint Number of times an error occurred during the initial table diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index 059e8778ca7..95ad29a64b9 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -1415,8 +1415,8 @@ CREATE VIEW pg_stat_subscription_stats AS ss.subid, s.subname, ss.apply_error_count, - ss.seq_sync_error_count, - ss.sync_error_count, + ss.sync_seq_error_count, + ss.sync_table_error_count, ss.confl_insert_exists, ss.confl_update_origin_differs, ss.confl_update_exists, diff --git a/src/backend/utils/activity/pgstat_subscription.c b/src/backend/utils/activity/pgstat_subscription.c index 35916772b9d..ad6814ec5ea 100644 --- a/src/backend/utils/activity/pgstat_subscription.c +++ b/src/backend/utils/activity/pgstat_subscription.c @@ -41,11 +41,11 @@ pgstat_report_subscription_error(Oid subid, LogicalRepWorkerType wtype) break; case WORKERTYPE_SEQUENCESYNC: - pending->seq_sync_error_count++; + pending->sync_seq_error_count++; break; case WORKERTYPE_TABLESYNC: - pending->sync_error_count++; + pending->sync_table_error_count++; break; default: @@ -131,8 +131,8 @@ pgstat_subscription_flush_cb(PgStat_EntryRef *entry_ref, bool nowait) #define SUB_ACC(fld) shsubent->stats.fld += localent->fld SUB_ACC(apply_error_count); - SUB_ACC(seq_sync_error_count); - SUB_ACC(sync_error_count); + SUB_ACC(sync_seq_error_count); + SUB_ACC(sync_table_error_count); for (int i = 0; i < CONFLICT_NUM_TYPES; i++) SUB_ACC(conflict_count[i]); #undef SUB_ACC diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 1521d6e2ab4..3d98d064a94 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -2221,9 +2221,9 @@ pg_stat_get_subscription_stats(PG_FUNCTION_ARGS) OIDOID, -1, 0); TupleDescInitEntry(tupdesc, (AttrNumber) 2, "apply_error_count", INT8OID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 3, "seq_sync_error_count", + TupleDescInitEntry(tupdesc, (AttrNumber) 3, "sync_seq_error_count", INT8OID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 4, "sync_error_count", + TupleDescInitEntry(tupdesc, (AttrNumber) 4, "sync_table_error_count", INT8OID, -1, 0); TupleDescInitEntry(tupdesc, (AttrNumber) 5, "confl_insert_exists", INT8OID, -1, 0); @@ -2258,11 +2258,11 @@ pg_stat_get_subscription_stats(PG_FUNCTION_ARGS) /* apply_error_count */ values[i++] = Int64GetDatum(subentry->apply_error_count); - /* seq_sync_error_count */ - values[i++] = Int64GetDatum(subentry->seq_sync_error_count); + /* sync_seq_error_count */ + values[i++] = Int64GetDatum(subentry->sync_seq_error_count); - /* sync_error_count */ - values[i++] = Int64GetDatum(subentry->sync_error_count); + /* sync_table_error_count */ + values[i++] = Int64GetDatum(subentry->sync_table_error_count); /* conflict count */ for (int nconflict = 0; nconflict < CONFLICT_NUM_TYPES; nconflict++) diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index 5cf9e12fcb9..aaadfd8c748 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -5706,7 +5706,7 @@ proparallel => 'r', prorettype => 'record', proargtypes => 'oid', proallargtypes => '{oid,oid,int8,int8,int8,int8,int8,int8,int8,int8,int8,int8,int8,timestamptz}', proargmodes => '{i,o,o,o,o,o,o,o,o,o,o,o,o,o}', - proargnames => '{subid,subid,apply_error_count,seq_sync_error_count,sync_error_count,confl_insert_exists,confl_update_origin_differs,confl_update_exists,confl_update_deleted,confl_update_missing,confl_delete_origin_differs,confl_delete_missing,confl_multiple_unique_conflicts,stats_reset}', + proargnames => '{subid,subid,apply_error_count,sync_seq_error_count,sync_table_error_count,confl_insert_exists,confl_update_origin_differs,confl_update_exists,confl_update_deleted,confl_update_missing,confl_delete_origin_differs,confl_delete_missing,confl_multiple_unique_conflicts,stats_reset}', prosrc => 'pg_stat_get_subscription_stats' }, { oid => '6118', descr => 'statistics: information about subscription', proname => 'pg_stat_get_subscription', prorows => '10', proisstrict => 'f', diff --git a/src/include/pgstat.h b/src/include/pgstat.h index a0610bb3e31..a68e725259a 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -109,8 +109,8 @@ typedef struct PgStat_FunctionCallUsage typedef struct PgStat_BackendSubEntry { PgStat_Counter apply_error_count; - PgStat_Counter seq_sync_error_count; - PgStat_Counter sync_error_count; + PgStat_Counter sync_seq_error_count; + PgStat_Counter sync_table_error_count; PgStat_Counter conflict_count[CONFLICT_NUM_TYPES]; } PgStat_BackendSubEntry; @@ -418,8 +418,8 @@ typedef struct PgStat_SLRUStats typedef struct PgStat_StatSubEntry { PgStat_Counter apply_error_count; - PgStat_Counter seq_sync_error_count; - PgStat_Counter sync_error_count; + PgStat_Counter sync_seq_error_count; + PgStat_Counter sync_table_error_count; PgStat_Counter conflict_count[CONFLICT_NUM_TYPES]; TimestampTz stat_reset_timestamp; } PgStat_StatSubEntry; diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index 7c52181cbcb..372a2188c22 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -2191,8 +2191,8 @@ pg_stat_subscription| SELECT su.oid AS subid, pg_stat_subscription_stats| SELECT ss.subid, s.subname, ss.apply_error_count, - ss.seq_sync_error_count, - ss.sync_error_count, + ss.sync_seq_error_count, + ss.sync_table_error_count, ss.confl_insert_exists, ss.confl_update_origin_differs, ss.confl_update_exists, @@ -2203,7 +2203,7 @@ pg_stat_subscription_stats| SELECT ss.subid, ss.confl_multiple_unique_conflicts, ss.stats_reset FROM pg_subscription s, - LATERAL pg_stat_get_subscription_stats(s.oid) ss(subid, apply_error_count, seq_sync_error_count, sync_error_count, confl_insert_exists, confl_update_origin_differs, confl_update_exists, confl_update_deleted, confl_update_missing, confl_delete_origin_differs, confl_delete_missing, confl_multiple_unique_conflicts, stats_reset); + LATERAL pg_stat_get_subscription_stats(s.oid) ss(subid, apply_error_count, sync_seq_error_count, sync_table_error_count, confl_insert_exists, confl_update_origin_differs, confl_update_exists, confl_update_deleted, confl_update_missing, confl_delete_origin_differs, confl_delete_missing, confl_multiple_unique_conflicts, stats_reset); pg_stat_sys_indexes| SELECT relid, indexrelid, schemaname, diff --git a/src/test/subscription/t/026_stats.pl b/src/test/subscription/t/026_stats.pl index fc0bcee5187..a430ab4feec 100644 --- a/src/test/subscription/t/026_stats.pl +++ b/src/test/subscription/t/026_stats.pl @@ -79,7 +79,7 @@ sub create_sub_pub_w_errors $db, qq[ SELECT count(1) = 1 FROM pg_stat_subscription_stats - WHERE subname = '$sub_name' AND seq_sync_error_count > 0 AND sync_error_count > 0 + WHERE subname = '$sub_name' AND sync_seq_error_count > 0 AND sync_table_error_count > 0 ]) or die qq(Timed out while waiting for sequencesync errors and tablesync errors for subscription '$sub_name'); @@ -175,8 +175,8 @@ my ($pub1_name, $sub1_name) = is( $node_subscriber->safe_psql( $db, qq(SELECT apply_error_count > 0, - seq_sync_error_count > 0, - sync_error_count > 0, + sync_seq_error_count > 0, + sync_table_error_count > 0, confl_insert_exists > 0, confl_delete_missing > 0, stats_reset IS NULL @@ -197,8 +197,8 @@ $node_subscriber->safe_psql($db, is( $node_subscriber->safe_psql( $db, qq(SELECT apply_error_count = 0, - seq_sync_error_count = 0, - sync_error_count = 0, + sync_seq_error_count = 0, + sync_table_error_count = 0, confl_insert_exists = 0, confl_delete_missing = 0, stats_reset IS NOT NULL @@ -242,8 +242,8 @@ my ($pub2_name, $sub2_name) = is( $node_subscriber->safe_psql( $db, qq(SELECT apply_error_count > 0, - seq_sync_error_count > 0, - sync_error_count > 0, + sync_seq_error_count > 0, + sync_table_error_count > 0, confl_insert_exists > 0, confl_delete_missing > 0, stats_reset IS NULL @@ -263,8 +263,8 @@ $node_subscriber->safe_psql($db, is( $node_subscriber->safe_psql( $db, qq(SELECT apply_error_count = 0, - seq_sync_error_count = 0, - sync_error_count = 0, + sync_seq_error_count = 0, + sync_table_error_count = 0, confl_insert_exists = 0, confl_delete_missing = 0, stats_reset IS NOT NULL @@ -278,8 +278,8 @@ is( $node_subscriber->safe_psql( is( $node_subscriber->safe_psql( $db, qq(SELECT apply_error_count = 0, - seq_sync_error_count = 0, - sync_error_count = 0, + sync_seq_error_count = 0, + sync_table_error_count = 0, confl_insert_exists = 0, confl_delete_missing = 0, stats_reset IS NOT NULL -- 2.43.0