summaryrefslogtreecommitdiff
path: root/src/include/common
diff options
context:
space:
mode:
authorRobert Haas2022-09-28 13:45:27 +0000
committerRobert Haas2022-09-28 13:55:28 +0000
commita448e49bcbe40fb72e1ed85af910dd216d45bad8 (patch)
tree2815aed4f5e89bdea91cdd35ec89facaa846e438 /src/include/common
parent6af082723277eeca74f2da65e7759666bf7c7f9c (diff)
Revert 56-bit relfilenode change and follow-up commits.
There are still some alignment-related failures in the buildfarm, which might or might not be able to be fixed quickly, but I've also just realized that it increased the size of many WAL records by 4 bytes because a block reference contains a RelFileLocator. The effect of that hasn't been studied or discussed, so revert for now.
Diffstat (limited to 'src/include/common')
-rw-r--r--src/include/common/relpath.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/include/common/relpath.h b/src/include/common/relpath.h
index 2d3b52fe0b8..4bbd94393c8 100644
--- a/src/include/common/relpath.h
+++ b/src/include/common/relpath.h
@@ -22,12 +22,10 @@
/*
* RelFileNumber data type identifies the specific relation file name.
*/
-typedef uint64 RelFileNumber;
-#define InvalidRelFileNumber ((RelFileNumber) 0)
+typedef Oid RelFileNumber;
+#define InvalidRelFileNumber ((RelFileNumber) InvalidOid)
#define RelFileNumberIsValid(relnumber) \
((bool) ((relnumber) != InvalidRelFileNumber))
-#define atorelnumber(x) ((RelFileNumber) strtou64((x), NULL, 10))
-#define MAX_RELFILENUMBER UINT64CONST(0x00FFFFFFFFFFFFFF)
/*
* Name of major-version-specific tablespace subdirectories
@@ -37,7 +35,6 @@ typedef uint64 RelFileNumber;
/* Characters to allow for an OID in a relation path */
#define OIDCHARS 10 /* max chars printed by %u */
-#define RELNUMBERCHARS 20 /* max chars printed by UINT64_FORMAT */
/*
* Stuff for fork names.