diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2015-05-08 21:58:57 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2015-05-08 21:58:57 +0300 |
| commit | 179cdd098196338880bdbb39c39a788abdad4dd8 (patch) | |
| tree | ba94b277b326f1599d2835f0fe50b791016dd532 /src/backend/access/transam/xlog.c | |
| parent | 16c73e773bc5f2eee6a71c5ec311b8691bf9e832 (diff) | |
| download | postgresql-179cdd098196338880bdbb39c39a788abdad4dd8.tar.gz postgresql-179cdd098196338880bdbb39c39a788abdad4dd8.zip | |
Add macros to check if a filename is a WAL segment or other such file.
We had many instances of the strlen + strspn combination to check for that.
This makes the code a bit easier to read.
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 92822a192b0..5097173c609 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -3577,8 +3577,7 @@ RemoveOldXlogFiles(XLogSegNo segno, XLogRecPtr PriorRedoPtr, XLogRecPtr endptr) while ((xlde = ReadDir(xldir, XLOGDIR)) != NULL) { /* Ignore files that are not XLOG segments */ - if (strlen(xlde->d_name) != 24 || - strspn(xlde->d_name, "0123456789ABCDEF") != 24) + if (!IsXLogFileName(xlde->d_name)) continue; /* @@ -3650,8 +3649,7 @@ RemoveNonParentXlogFiles(XLogRecPtr switchpoint, TimeLineID newTLI) while ((xlde = ReadDir(xldir, XLOGDIR)) != NULL) { /* Ignore files that are not XLOG segments */ - if (strlen(xlde->d_name) != 24 || - strspn(xlde->d_name, "0123456789ABCDEF") != 24) + if (!IsXLogFileName(xlde->d_name)) continue; /* @@ -3839,10 +3837,7 @@ CleanupBackupHistory(void) while ((xlde = ReadDir(xldir, XLOGDIR)) != NULL) { - if (strlen(xlde->d_name) > 24 && - strspn(xlde->d_name, "0123456789ABCDEF") == 24 && - strcmp(xlde->d_name + strlen(xlde->d_name) - strlen(".backup"), - ".backup") == 0) + if (IsBackupHistoryFileName(xlde->d_name)) { if (XLogArchiveCheckDone(xlde->d_name)) { |