Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit728560d

Browse files
committed
Suppress compiler warnings in new pgstats code.
Some clang versions whine about comparing an enum variable toa value outside the range of the enum, on the grounds that theresult must be constant. In the cases we fix here, the loopswill terminate only if the enum variable can in fact hold avalue one beyond its declared range. While that's very likelyto always be true for these enum types, it still seems like apoor coding practice to assume it; so use "int" loop variablesinstead to silence the warnings. (This matches what we've donein other places, for example loops over the range of ForkNumber.)While at it, let's drop the XXX_FIRST macros for these enums and justwrite zeroes for the loop start values. The apparent flexibilityseems rather illusory given that iterating up to one-less-than-the-number-of-values is only correct for a zero-based range.Melanie PlagemanDiscussion:https://postgr.es/m/20520.1677435600@sss.pgh.pa.us
1 parent53fe7e6 commit728560d

File tree

3 files changed

+10
-20
lines changed

3 files changed

+10
-20
lines changed

‎src/backend/utils/activity/pgstat_io.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,16 @@ pgstat_bktype_io_stats_valid(PgStat_BktypeIO *backend_io,
3636
{
3737
boolbktype_tracked=pgstat_tracks_io_bktype(bktype);
3838

39-
for (IOObjectio_object=IOOBJECT_FIRST;
40-
io_object<IOOBJECT_NUM_TYPES;io_object++)
39+
for (intio_object=0;io_object<IOOBJECT_NUM_TYPES;io_object++)
4140
{
42-
for (IOContextio_context=IOCONTEXT_FIRST;
43-
io_context<IOCONTEXT_NUM_TYPES;io_context++)
41+
for (intio_context=0;io_context<IOCONTEXT_NUM_TYPES;io_context++)
4442
{
4543
/*
4644
* Don't bother trying to skip to the next loop iteration if
4745
* pgstat_tracks_io_object() would return false here. We still
4846
* need to validate that each counter is zero anyway.
4947
*/
50-
for (IOOpio_op=IOOP_FIRST;io_op<IOOP_NUM_TYPES;io_op++)
48+
for (intio_op=0;io_op<IOOP_NUM_TYPES;io_op++)
5149
{
5250
/* No stats, so nothing to validate */
5351
if (backend_io->data[io_object][io_context][io_op]==0)
@@ -111,14 +109,11 @@ pgstat_flush_io(bool nowait)
111109
elseif (!LWLockConditionalAcquire(bktype_lock,LW_EXCLUSIVE))
112110
return true;
113111

114-
for (IOObjectio_object=IOOBJECT_FIRST;
115-
io_object<IOOBJECT_NUM_TYPES;io_object++)
112+
for (intio_object=0;io_object<IOOBJECT_NUM_TYPES;io_object++)
116113
{
117-
for (IOContextio_context=IOCONTEXT_FIRST;
118-
io_context<IOCONTEXT_NUM_TYPES;io_context++)
114+
for (intio_context=0;io_context<IOCONTEXT_NUM_TYPES;io_context++)
119115
{
120-
for (IOOpio_op=IOOP_FIRST;
121-
io_op<IOOP_NUM_TYPES;io_op++)
116+
for (intio_op=0;io_op<IOOP_NUM_TYPES;io_op++)
122117
bktype_shstats->data[io_object][io_context][io_op]+=
123118
PendingIOStats.data[io_object][io_context][io_op];
124119
}

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ pg_stat_get_io(PG_FUNCTION_ARGS)
13061306

13071307
reset_time=TimestampTzGetDatum(backends_io_stats->stat_reset_timestamp);
13081308

1309-
for (BackendTypebktype=B_INVALID;bktype<BACKEND_NUM_TYPES;bktype++)
1309+
for (intbktype=0;bktype<BACKEND_NUM_TYPES;bktype++)
13101310
{
13111311
Datumbktype_desc=CStringGetTextDatum(GetBackendTypeDesc(bktype));
13121312
PgStat_BktypeIO*bktype_stats=&backends_io_stats->stats[bktype];
@@ -1325,13 +1325,11 @@ pg_stat_get_io(PG_FUNCTION_ARGS)
13251325
if (!pgstat_tracks_io_bktype(bktype))
13261326
continue;
13271327

1328-
for (IOObjectio_obj=IOOBJECT_FIRST;
1329-
io_obj<IOOBJECT_NUM_TYPES;io_obj++)
1328+
for (intio_obj=0;io_obj<IOOBJECT_NUM_TYPES;io_obj++)
13301329
{
13311330
constchar*obj_name=pgstat_get_io_object_name(io_obj);
13321331

1333-
for (IOContextio_context=IOCONTEXT_FIRST;
1334-
io_context<IOCONTEXT_NUM_TYPES;io_context++)
1332+
for (intio_context=0;io_context<IOCONTEXT_NUM_TYPES;io_context++)
13351333
{
13361334
constchar*context_name=pgstat_get_io_context_name(io_context);
13371335

@@ -1359,7 +1357,7 @@ pg_stat_get_io(PG_FUNCTION_ARGS)
13591357
*/
13601358
values[IO_COL_CONVERSION]=Int64GetDatum(BLCKSZ);
13611359

1362-
for (IOOpio_op=IOOP_FIRST;io_op<IOOP_NUM_TYPES;io_op++)
1360+
for (intio_op=0;io_op<IOOP_NUM_TYPES;io_op++)
13631361
{
13641362
intcol_idx=pgstat_get_io_op_index(io_op);
13651363

‎src/include/pgstat.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ typedef enum IOObject
287287
IOOBJECT_TEMP_RELATION,
288288
}IOObject;
289289

290-
#defineIOOBJECT_FIRST IOOBJECT_RELATION
291290
#defineIOOBJECT_NUM_TYPES (IOOBJECT_TEMP_RELATION + 1)
292291

293292
typedefenumIOContext
@@ -298,7 +297,6 @@ typedef enum IOContext
298297
IOCONTEXT_VACUUM,
299298
}IOContext;
300299

301-
#defineIOCONTEXT_FIRST IOCONTEXT_BULKREAD
302300
#defineIOCONTEXT_NUM_TYPES (IOCONTEXT_VACUUM + 1)
303301

304302
typedefenumIOOp
@@ -311,7 +309,6 @@ typedef enum IOOp
311309
IOOP_WRITE,
312310
}IOOp;
313311

314-
#defineIOOP_FIRST IOOP_EVICT
315312
#defineIOOP_NUM_TYPES (IOOP_WRITE + 1)
316313

317314
typedefstructPgStat_BktypeIO

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp