Skip to content

Commit 200d1fd

Browse files
author
Michael Paquier
committed
Remove multi-versioning of XLOG_PAGE_MAGIC
This is a pain to maintain, and simplifies the code a bit.
1 parent 8a34a18 commit 200d1fd

File tree

1 file changed

+1
-36
lines changed

1 file changed

+1
-36
lines changed

xlog.c

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@ typedef struct MemoryContextData *MemoryContext;
2121

2222
#include "access/xlog_internal.h"
2323

24-
#define XLOG_PAGE_MAGIC_v80 0xD05C /* 8.0 */
25-
#define XLOG_PAGE_MAGIC_v81 0xD05D /* 8.1 */
26-
#define XLOG_PAGE_MAGIC_v82 0xD05E /* 8.2 */
27-
#define XLOG_PAGE_MAGIC_v83 0xD062 /* 8.3 */
28-
#define XLOG_PAGE_MAGIC_v84 0xD063 /* 8.4 */
29-
#define XLOG_PAGE_MAGIC_v90 0xD064 /* 9.0 */
30-
#define XLOG_PAGE_MAGIC_v91 0xD066 /* 9.1 */
31-
#define XLOG_PAGE_MAGIC_v92 0xD071 /* 9.2 */
32-
#define XLOG_PAGE_MAGIC_v93 0xD075 /* 9.2 */
33-
3424
/*
3525
* XLogLongPageHeaderData is modified in 8.3, but the layout is compatible
3626
* except xlp_xlog_blcksz.
@@ -51,7 +41,6 @@ xlog_is_complete_wal(const pgFile *file, int server_version)
5141
{
5242
FILE *fp;
5343
XLogPage page;
54-
uint16 xlog_page_magic;
5544

5645
fp = fopen(file->path, "r");
5746
if (!fp)
@@ -63,32 +52,8 @@ xlog_is_complete_wal(const pgFile *file, int server_version)
6352
}
6453
fclose(fp);
6554

66-
/* xlog_page_magic from server version */
67-
if (server_version < 80000)
68-
return false; /* never happen */
69-
else if (server_version < 80100)
70-
xlog_page_magic = XLOG_PAGE_MAGIC_v80;
71-
else if (server_version < 80200)
72-
xlog_page_magic = XLOG_PAGE_MAGIC_v81;
73-
else if (server_version < 80300)
74-
xlog_page_magic = XLOG_PAGE_MAGIC_v82;
75-
else if (server_version < 80400)
76-
xlog_page_magic = XLOG_PAGE_MAGIC_v83;
77-
else if (server_version < 90000)
78-
xlog_page_magic = XLOG_PAGE_MAGIC_v84;
79-
else if (server_version < 90100)
80-
xlog_page_magic = XLOG_PAGE_MAGIC_v90;
81-
else if (server_version < 90200)
82-
xlog_page_magic = XLOG_PAGE_MAGIC_v91;
83-
else if (server_version < 90300)
84-
xlog_page_magic = XLOG_PAGE_MAGIC_v92;
85-
else if (server_version < 90400)
86-
xlog_page_magic = XLOG_PAGE_MAGIC_v93;
87-
else
88-
return false; /* not supported */
89-
9055
/* check header */
91-
if (page.header.xlp_magic != xlog_page_magic)
56+
if (page.header.xlp_magic != XLOG_PAGE_MAGIC)
9257
return false;
9358
if ((page.header.xlp_info & ~XLP_ALL_FLAGS) != 0)
9459
return false;

0 commit comments

Comments
 (0)