diff options
| author | Robert Haas | 2022-09-28 13:45:27 +0000 |
|---|---|---|
| committer | Robert Haas | 2022-09-28 13:55:28 +0000 |
| commit | a448e49bcbe40fb72e1ed85af910dd216d45bad8 (patch) | |
| tree | 2815aed4f5e89bdea91cdd35ec89facaa846e438 /src/common | |
| parent | 6af082723277eeca74f2da65e7759666bf7c7f9c (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/common')
| -rw-r--r-- | src/common/relpath.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/common/relpath.c b/src/common/relpath.c index d0d83e593b5..1b6b620ce83 100644 --- a/src/common/relpath.c +++ b/src/common/relpath.c @@ -149,10 +149,10 @@ GetRelationPath(Oid dbOid, Oid spcOid, RelFileNumber relNumber, Assert(dbOid == 0); Assert(backendId == InvalidBackendId); if (forkNumber != MAIN_FORKNUM) - path = psprintf("global/" UINT64_FORMAT "_%s", + path = psprintf("global/%u_%s", relNumber, forkNames[forkNumber]); else - path = psprintf("global/" UINT64_FORMAT, relNumber); + path = psprintf("global/%u", relNumber); } else if (spcOid == DEFAULTTABLESPACE_OID) { @@ -160,21 +160,21 @@ GetRelationPath(Oid dbOid, Oid spcOid, RelFileNumber relNumber, if (backendId == InvalidBackendId) { if (forkNumber != MAIN_FORKNUM) - path = psprintf("base/%u/" UINT64_FORMAT "_%s", + path = psprintf("base/%u/%u_%s", dbOid, relNumber, forkNames[forkNumber]); else - path = psprintf("base/%u/" UINT64_FORMAT, + path = psprintf("base/%u/%u", dbOid, relNumber); } else { if (forkNumber != MAIN_FORKNUM) - path = psprintf("base/%u/t%d_" UINT64_FORMAT "_%s", + path = psprintf("base/%u/t%d_%u_%s", dbOid, backendId, relNumber, forkNames[forkNumber]); else - path = psprintf("base/%u/t%d_" UINT64_FORMAT, + path = psprintf("base/%u/t%d_%u", dbOid, backendId, relNumber); } } @@ -184,24 +184,24 @@ GetRelationPath(Oid dbOid, Oid spcOid, RelFileNumber relNumber, if (backendId == InvalidBackendId) { if (forkNumber != MAIN_FORKNUM) - path = psprintf("pg_tblspc/%u/%s/%u/" UINT64_FORMAT "_%s", + path = psprintf("pg_tblspc/%u/%s/%u/%u_%s", spcOid, TABLESPACE_VERSION_DIRECTORY, dbOid, relNumber, forkNames[forkNumber]); else - path = psprintf("pg_tblspc/%u/%s/%u/" UINT64_FORMAT, + path = psprintf("pg_tblspc/%u/%s/%u/%u", spcOid, TABLESPACE_VERSION_DIRECTORY, dbOid, relNumber); } else { if (forkNumber != MAIN_FORKNUM) - path = psprintf("pg_tblspc/%u/%s/%u/t%d_" UINT64_FORMAT "_%s", + path = psprintf("pg_tblspc/%u/%s/%u/t%d_%u_%s", spcOid, TABLESPACE_VERSION_DIRECTORY, dbOid, backendId, relNumber, forkNames[forkNumber]); else - path = psprintf("pg_tblspc/%u/%s/%u/t%d_" UINT64_FORMAT, + path = psprintf("pg_tblspc/%u/%s/%u/t%d_%u", spcOid, TABLESPACE_VERSION_DIRECTORY, dbOid, backendId, relNumber); } |