Skip to content

Commit 66dcb09

Browse files
michaelpqmichaelpq
committed
Fix macro definitions in pgstatfuncs.c
Buildfarm member wrasse has been complaining about empty declarations as an effect of 8018ffb and 83a1a1b due to extra semicolons. While on it, remove also the last backslash of the macros definitions, causing more lines to be eaten in it than necessary, per comment from Tom Lane. Reported-by: Tom Lane, and buildfarm member wrasse Author: Nathan Bossart, Michael Paquier Discussion: https://postgr.es/m/1188769.1670640236@sss.pgh.pa.us
1 parent 4dd6875 commit 66dcb09

File tree

1 file changed

+52
-52
lines changed

1 file changed

+52
-52
lines changed

‎src/backend/utils/adt/pgstatfuncs.c‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -50,58 +50,58 @@ CppConcat(pg_stat_get_,stat)(PG_FUNCTION_ARGS) \
5050
result = (int64) (tabentry->stat); \
5151
\
5252
PG_RETURN_INT64(result); \
53-
} \
53+
}
5454

5555
/* pg_stat_get_analyze_count */
56-
PG_STAT_GET_RELENTRY_INT64(analyze_count);
56+
PG_STAT_GET_RELENTRY_INT64(analyze_count)
5757

5858
/* pg_stat_get_autoanalyze_count */
59-
PG_STAT_GET_RELENTRY_INT64(autoanalyze_count);
59+
PG_STAT_GET_RELENTRY_INT64(autoanalyze_count)
6060

6161
/* pg_stat_get_autovacuum_count */
62-
PG_STAT_GET_RELENTRY_INT64(autovacuum_count);
62+
PG_STAT_GET_RELENTRY_INT64(autovacuum_count)
6363

6464
/* pg_stat_get_blocks_fetched */
65-
PG_STAT_GET_RELENTRY_INT64(blocks_fetched);
65+
PG_STAT_GET_RELENTRY_INT64(blocks_fetched)
6666

6767
/* pg_stat_get_blocks_hit */
68-
PG_STAT_GET_RELENTRY_INT64(blocks_hit);
68+
PG_STAT_GET_RELENTRY_INT64(blocks_hit)
6969

7070
/* pg_stat_get_dead_tuples */
71-
PG_STAT_GET_RELENTRY_INT64(dead_tuples);
71+
PG_STAT_GET_RELENTRY_INT64(dead_tuples)
7272

7373
/* pg_stat_get_ins_since_vacuum */
74-
PG_STAT_GET_RELENTRY_INT64(ins_since_vacuum);
74+
PG_STAT_GET_RELENTRY_INT64(ins_since_vacuum)
7575

7676
/* pg_stat_get_live_tuples */
77-
PG_STAT_GET_RELENTRY_INT64(live_tuples);
77+
PG_STAT_GET_RELENTRY_INT64(live_tuples)
7878

7979
/* pg_stat_get_mods_since_analyze */
80-
PG_STAT_GET_RELENTRY_INT64(mod_since_analyze);
80+
PG_STAT_GET_RELENTRY_INT64(mod_since_analyze)
8181

8282
/* pg_stat_get_numscans */
83-
PG_STAT_GET_RELENTRY_INT64(numscans);
83+
PG_STAT_GET_RELENTRY_INT64(numscans)
8484

8585
/* pg_stat_get_tuples_deleted */
86-
PG_STAT_GET_RELENTRY_INT64(tuples_deleted);
86+
PG_STAT_GET_RELENTRY_INT64(tuples_deleted)
8787

8888
/* pg_stat_get_tuples_fetched */
89-
PG_STAT_GET_RELENTRY_INT64(tuples_fetched);
89+
PG_STAT_GET_RELENTRY_INT64(tuples_fetched)
9090

9191
/* pg_stat_get_tuples_hot_updated */
92-
PG_STAT_GET_RELENTRY_INT64(tuples_hot_updated);
92+
PG_STAT_GET_RELENTRY_INT64(tuples_hot_updated)
9393

9494
/* pg_stat_get_tuples_inserted */
95-
PG_STAT_GET_RELENTRY_INT64(tuples_inserted);
95+
PG_STAT_GET_RELENTRY_INT64(tuples_inserted)
9696

9797
/* pg_stat_get_tuples_returned */
98-
PG_STAT_GET_RELENTRY_INT64(tuples_returned);
98+
PG_STAT_GET_RELENTRY_INT64(tuples_returned)
9999

100100
/* pg_stat_get_tuples_updated */
101-
PG_STAT_GET_RELENTRY_INT64(tuples_updated);
101+
PG_STAT_GET_RELENTRY_INT64(tuples_updated)
102102

103103
/* pg_stat_get_vacuum_count */
104-
PG_STAT_GET_RELENTRY_INT64(vacuum_count);
104+
PG_STAT_GET_RELENTRY_INT64(vacuum_count)
105105

106106
#define PG_STAT_GET_RELENTRY_TIMESTAMPTZ(stat) \
107107
Datum \
@@ -120,22 +120,22 @@ CppConcat(pg_stat_get_,stat)(PG_FUNCTION_ARGS) \
120120
PG_RETURN_NULL(); \
121121
else \
122122
PG_RETURN_TIMESTAMPTZ(result); \
123-
} \
123+
}
124124

125125
/* pg_stat_get_last_analyze_time */
126-
PG_STAT_GET_RELENTRY_TIMESTAMPTZ(last_analyze_time);
126+
PG_STAT_GET_RELENTRY_TIMESTAMPTZ(last_analyze_time)
127127

128128
/* pg_stat_get_last_autoanalyze_time */
129-
PG_STAT_GET_RELENTRY_TIMESTAMPTZ(last_autoanalyze_time);
129+
PG_STAT_GET_RELENTRY_TIMESTAMPTZ(last_autoanalyze_time)
130130

131131
/* pg_stat_get_last_autovacuum_time */
132-
PG_STAT_GET_RELENTRY_TIMESTAMPTZ(last_autovacuum_time);
132+
PG_STAT_GET_RELENTRY_TIMESTAMPTZ(last_autovacuum_time)
133133

134134
/* pg_stat_get_last_vacuum_time */
135-
PG_STAT_GET_RELENTRY_TIMESTAMPTZ(last_vacuum_time);
135+
PG_STAT_GET_RELENTRY_TIMESTAMPTZ(last_vacuum_time)
136136

137137
/* pg_stat_get_lastscan */
138-
PG_STAT_GET_RELENTRY_TIMESTAMPTZ(lastscan);
138+
PG_STAT_GET_RELENTRY_TIMESTAMPTZ(lastscan)
139139

140140
Datum
141141
pg_stat_get_function_calls(PG_FUNCTION_ARGS)
@@ -952,70 +952,70 @@ CppConcat(pg_stat_get_db_,stat)(PG_FUNCTION_ARGS) \
952952
result = (int64) (dbentry->stat); \
953953
\
954954
PG_RETURN_INT64(result); \
955-
} \
955+
}
956956

957957
/* pg_stat_get_db_blocks_fetched */
958-
PG_STAT_GET_DBENTRY_INT64(blocks_fetched);
958+
PG_STAT_GET_DBENTRY_INT64(blocks_fetched)
959959

960960
/* pg_stat_get_db_blocks_hit */
961-
PG_STAT_GET_DBENTRY_INT64(blocks_hit);
961+
PG_STAT_GET_DBENTRY_INT64(blocks_hit)
962962

963963
/* pg_stat_get_db_conflict_bufferpin */
964-
PG_STAT_GET_DBENTRY_INT64(conflict_bufferpin);
964+
PG_STAT_GET_DBENTRY_INT64(conflict_bufferpin)
965965

966966
/* pg_stat_get_db_conflict_lock */
967-
PG_STAT_GET_DBENTRY_INT64(conflict_lock);
967+
PG_STAT_GET_DBENTRY_INT64(conflict_lock)
968968

969969
/* pg_stat_get_db_conflict_snapshot */
970-
PG_STAT_GET_DBENTRY_INT64(conflict_snapshot);
970+
PG_STAT_GET_DBENTRY_INT64(conflict_snapshot)
971971

972972
/* pg_stat_get_db_conflict_startup_deadlock */
973-
PG_STAT_GET_DBENTRY_INT64(conflict_startup_deadlock);
973+
PG_STAT_GET_DBENTRY_INT64(conflict_startup_deadlock)
974974

975975
/* pg_stat_get_db_conflict_tablespace */
976-
PG_STAT_GET_DBENTRY_INT64(conflict_tablespace);
976+
PG_STAT_GET_DBENTRY_INT64(conflict_tablespace)
977977

978978
/* pg_stat_get_db_deadlocks */
979-
PG_STAT_GET_DBENTRY_INT64(deadlocks);
979+
PG_STAT_GET_DBENTRY_INT64(deadlocks)
980980

981981
/* pg_stat_get_db_sessions */
982-
PG_STAT_GET_DBENTRY_INT64(sessions);
982+
PG_STAT_GET_DBENTRY_INT64(sessions)
983983

984984
/* pg_stat_get_db_sessions_abandoned */
985-
PG_STAT_GET_DBENTRY_INT64(sessions_abandoned);
985+
PG_STAT_GET_DBENTRY_INT64(sessions_abandoned)
986986

987987
/* pg_stat_get_db_sessions_fatal */
988-
PG_STAT_GET_DBENTRY_INT64(sessions_fatal);
988+
PG_STAT_GET_DBENTRY_INT64(sessions_fatal)
989989

990990
/* pg_stat_get_db_sessions_killed */
991-
PG_STAT_GET_DBENTRY_INT64(sessions_killed);
991+
PG_STAT_GET_DBENTRY_INT64(sessions_killed)
992992

993993
/* pg_stat_get_db_temp_bytes */
994-
PG_STAT_GET_DBENTRY_INT64(temp_bytes);
994+
PG_STAT_GET_DBENTRY_INT64(temp_bytes)
995995

996996
/* pg_stat_get_db_temp_files */
997-
PG_STAT_GET_DBENTRY_INT64(temp_files);
997+
PG_STAT_GET_DBENTRY_INT64(temp_files)
998998

999999
/* pg_stat_get_db_tuples_deleted */
1000-
PG_STAT_GET_DBENTRY_INT64(tuples_deleted);
1000+
PG_STAT_GET_DBENTRY_INT64(tuples_deleted)
10011001

10021002
/* pg_stat_get_db_tuples_fetched */
1003-
PG_STAT_GET_DBENTRY_INT64(tuples_fetched);
1003+
PG_STAT_GET_DBENTRY_INT64(tuples_fetched)
10041004

10051005
/* pg_stat_get_db_tuples_inserted */
1006-
PG_STAT_GET_DBENTRY_INT64(tuples_inserted);
1006+
PG_STAT_GET_DBENTRY_INT64(tuples_inserted)
10071007

10081008
/* pg_stat_get_db_tuples_returned */
1009-
PG_STAT_GET_DBENTRY_INT64(tuples_returned);
1009+
PG_STAT_GET_DBENTRY_INT64(tuples_returned)
10101010

10111011
/* pg_stat_get_db_tuples_updated */
1012-
PG_STAT_GET_DBENTRY_INT64(tuples_updated);
1012+
PG_STAT_GET_DBENTRY_INT64(tuples_updated)
10131013

10141014
/* pg_stat_get_db_xact_commit */
1015-
PG_STAT_GET_DBENTRY_INT64(xact_commit);
1015+
PG_STAT_GET_DBENTRY_INT64(xact_commit)
10161016

10171017
/* pg_stat_get_db_xact_rollback */
1018-
PG_STAT_GET_DBENTRY_INT64(xact_rollback);
1018+
PG_STAT_GET_DBENTRY_INT64(xact_rollback)
10191019

10201020

10211021
Datum
@@ -1109,22 +1109,22 @@ CppConcat(pg_stat_get_db_,stat)(PG_FUNCTION_ARGS) \
11091109
result = ((double) dbentry->stat) / 1000.0; \
11101110
\
11111111
PG_RETURN_FLOAT8(result); \
1112-
} \
1112+
}
11131113

11141114
/* pg_stat_get_db_active_time */
1115-
PG_STAT_GET_DBENTRY_FLOAT8(active_time);
1115+
PG_STAT_GET_DBENTRY_FLOAT8(active_time)
11161116

11171117
/* pg_stat_get_db_blk_read_time */
1118-
PG_STAT_GET_DBENTRY_FLOAT8(blk_read_time);
1118+
PG_STAT_GET_DBENTRY_FLOAT8(blk_read_time)
11191119

11201120
/* pg_stat_get_db_blk_write_time */
1121-
PG_STAT_GET_DBENTRY_FLOAT8(blk_write_time);
1121+
PG_STAT_GET_DBENTRY_FLOAT8(blk_write_time)
11221122

11231123
/* pg_stat_get_db_idle_in_transaction_time */
1124-
PG_STAT_GET_DBENTRY_FLOAT8(idle_in_transaction_time);
1124+
PG_STAT_GET_DBENTRY_FLOAT8(idle_in_transaction_time)
11251125

11261126
/* pg_stat_get_db_session_time */
1127-
PG_STAT_GET_DBENTRY_FLOAT8(session_time);
1127+
PG_STAT_GET_DBENTRY_FLOAT8(session_time)
11281128

11291129
Datum
11301130
pg_stat_get_bgwriter_timed_checkpoints(PG_FUNCTION_ARGS)

0 commit comments

Comments
 (0)