From 33d126ecbe9a3854d349ccf075cb9b6cdb6a4c9c Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Thu, 6 May 2021 21:57:01 +0300
Subject: [PATCH] Tidy up usage of a few constants from PostgreSQL headers.

---
 pageserver/src/restore_local_repo.rs | 10 ++--------
 pageserver/src/restore_s3.rs         | 11 +++--------
 postgres_ffi/src/pg_constants.rs     | 24 ++++++++++++++++++------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pageserver/src/restore_local_repo.rs b/pageserver/src/restore_local_repo.rs
index ce43c1efc5..143c84fd8d 100644
--- a/pageserver/src/restore_local_repo.rs
+++ b/pageserver/src/restore_local_repo.rs
@@ -34,12 +34,6 @@ use postgres_ffi::pg_constants;
 use postgres_ffi::xlog_utils::*;
 use zenith_utils::lsn::Lsn;
 
-// From pg_tablespace_d.h
-//
-// FIXME: we'll probably need these elsewhere too, move to some common location
-const DEFAULTTABLESPACE_OID: u32 = 1663;
-const GLOBALTABLESPACE_OID: u32 = 1664;
-
 //
 // Load it all into the page cache.
 //
@@ -130,7 +124,7 @@ fn restore_snapshot(
             _ => restore_relfile(
                 timeline,
                 snapshot,
-                GLOBALTABLESPACE_OID,
+                pg_constants::GLOBALTABLESPACE_OID,
                 0,
                 &direntry.path(),
             )?,
@@ -157,7 +151,7 @@ fn restore_snapshot(
                 _ => restore_relfile(
                     timeline,
                     snapshot,
-                    DEFAULTTABLESPACE_OID,
+                    pg_constants::DEFAULTTABLESPACE_OID,
                     dboid,
                     &direntry.path(),
                 )?,
diff --git a/pageserver/src/restore_s3.rs b/pageserver/src/restore_s3.rs
index 2a4351e3c9..e3c4b2fffc 100644
--- a/pageserver/src/restore_s3.rs
+++ b/pageserver/src/restore_s3.rs
@@ -23,6 +23,7 @@ use tokio::runtime;
 use futures::future;
 
 use crate::{page_cache, PageServerConf};
+use postgres_ffi::pg_constants;
 
 struct Storage {
     region: Region,
@@ -127,12 +128,6 @@ async fn restore_chunk(conf: &PageServerConf) -> Result<(), S3Error> {
     Ok(())
 }
 
-// From pg_tablespace_d.h
-//
-// FIXME: we'll probably need these elsewhere too, move to some common location
-const DEFAULTTABLESPACE_OID: u32 = 1663;
-const GLOBALTABLESPACE_OID: u32 = 1664;
-
 #[derive(Debug)]
 struct FilePathError {
     msg: String,
@@ -237,7 +232,7 @@ fn parse_rel_file_path(path: &str) -> Result<ParsedBaseImageFileName, FilePathEr
         let (relnode, forknum, segno, lsn) = parse_filename(fname)?;
 
         Ok(ParsedBaseImageFileName {
-            spcnode: GLOBALTABLESPACE_OID,
+            spcnode: pg_constants::GLOBALTABLESPACE_OID,
             dbnode: 0,
             relnode,
             forknum,
@@ -260,7 +255,7 @@ fn parse_rel_file_path(path: &str) -> Result<ParsedBaseImageFileName, FilePathEr
         let (relnode, forknum, segno, lsn) = parse_filename(fname)?;
 
         Ok(ParsedBaseImageFileName {
-            spcnode: DEFAULTTABLESPACE_OID,
+            spcnode: pg_constants::DEFAULTTABLESPACE_OID,
             dbnode,
             relnode,
             forknum,
diff --git a/postgres_ffi/src/pg_constants.rs b/postgres_ffi/src/pg_constants.rs
index 392270bf41..ba923799e2 100644
--- a/postgres_ffi/src/pg_constants.rs
+++ b/postgres_ffi/src/pg_constants.rs
@@ -1,15 +1,31 @@
+//!
+//! Misc constants, copied from PostgreSQL headers.
+//!
+
+//
 // From pg_tablespace_d.h
 //
 pub const DEFAULTTABLESPACE_OID: u32 = 1663;
 pub const GLOBALTABLESPACE_OID: u32 = 1664;
-//Special values for non-rel files' tags
-//TODO maybe use enum?
+
+//
+// Fork numbers, from relpath.h
+//
+pub const MAIN_FORKNUM: u8 = 0;
+pub const FSM_FORKNUM: u8 = 1;
+pub const VISIBILITYMAP_FORKNUM: u8 = 2;
+pub const INIT_FORKNUM: u8 = 3;
+
+// Special values for non-rel files' tags (Zenith-specific)
 pub const PG_CONTROLFILE_FORKNUM: u32 = 42;
 pub const PG_FILENODEMAP_FORKNUM: u32 = 43;
 pub const PG_XACT_FORKNUM: u32 = 44;
 pub const PG_MXACT_OFFSETS_FORKNUM: u32 = 45;
 pub const PG_MXACT_MEMBERS_FORKNUM: u32 = 46;
 
+// From storage_xlog.h
+pub const SMGR_TRUNCATE_HEAP: u32 = 0x0001;
+
 //
 // constants from clog.h
 //
@@ -98,7 +114,3 @@ pub const BKPBLOCK_SAME_REL: u8 = 0x80; /* RelFileNode omitted, same as previous
 pub const BKPIMAGE_HAS_HOLE: u8 = 0x01; /* page image has "hole" */
 pub const BKPIMAGE_IS_COMPRESSED: u8 = 0x02; /* page image is compressed */
 pub const BKPIMAGE_APPLY: u8 = 0x04; /* page image should be restored during replay */
-
-
-pub const MAIN_FORKNUM: u8 = 0;
-pub const SMGR_TRUNCATE_HEAP: u32 = 0x0001;