From 96f1175a8010b577cc64ac992f81f16a54702463 Mon Sep 17 00:00:00 2001
From: Arseny Sher <sher-ars@yandex.ru>
Date: Wed, 13 Oct 2021 10:52:47 +0300
Subject: [PATCH] Cleanup hardcoded oids.

---
 walkeeper/src/send_wal.rs    | 15 ++++++---------
 zenith_utils/src/pq_proto.rs |  3 ++-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/walkeeper/src/send_wal.rs b/walkeeper/src/send_wal.rs
index e458939b3c..fcd8595e15 100644
--- a/walkeeper/src/send_wal.rs
+++ b/walkeeper/src/send_wal.rs
@@ -13,7 +13,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 use zenith_utils::postgres_backend;
 use zenith_utils::postgres_backend::PostgresBackend;
-use zenith_utils::pq_proto::{BeMessage, FeStartupMessage, RowDescriptor};
+use zenith_utils::pq_proto::{BeMessage, FeStartupMessage, RowDescriptor, INT4_OID, TEXT_OID};
 use zenith_utils::zid::{ZTenantId, ZTimelineId};
 
 use crate::timeline::CreateControlFile;
@@ -71,19 +71,16 @@ impl postgres_backend::Handler for SendWalHandler {
         }
         if query_string.starts_with(b"IDENTIFY_SYSTEM") {
             self.handle_identify_system(pgb)?;
-            Ok(())
         } else if query_string.starts_with(b"START_REPLICATION") {
             ReplicationConn::new(pgb).run(self, pgb, &query_string)?;
-            Ok(())
         } else if query_string.starts_with(b"START_WAL_PUSH") {
             ReceiveWalConn::new(pgb)?.run(self)?;
-            Ok(())
         } else if query_string.starts_with(b"JSON_CTRL") {
             handle_json_ctrl(self, pgb, &query_string)?;
-            Ok(())
         } else {
             bail!("Unexpected command {:?}", query_string);
         }
+        Ok(())
     }
 }
 
@@ -113,25 +110,25 @@ impl SendWalHandler {
         pgb.write_message_noflush(&BeMessage::RowDescription(&[
             RowDescriptor {
                 name: b"systemid",
-                typoid: 25,
+                typoid: TEXT_OID,
                 typlen: -1,
                 ..Default::default()
             },
             RowDescriptor {
                 name: b"timeline",
-                typoid: 23,
+                typoid: INT4_OID,
                 typlen: 4,
                 ..Default::default()
             },
             RowDescriptor {
                 name: b"xlogpos",
-                typoid: 25,
+                typoid: TEXT_OID,
                 typlen: -1,
                 ..Default::default()
             },
             RowDescriptor {
                 name: b"dbname",
-                typoid: 25,
+                typoid: TEXT_OID,
                 typlen: -1,
                 ..Default::default()
             },
diff --git a/zenith_utils/src/pq_proto.rs b/zenith_utils/src/pq_proto.rs
index 3a87906b22..fe66f9d5a2 100644
--- a/zenith_utils/src/pq_proto.rs
+++ b/zenith_utils/src/pq_proto.rs
@@ -15,8 +15,9 @@ use std::str;
 pub type Oid = u32;
 pub type SystemId = u64;
 
-pub const TEXT_OID: Oid = 25;
 pub const INT8_OID: Oid = 20;
+pub const INT4_OID: Oid = 23;
+pub const TEXT_OID: Oid = 25;
 
 #[derive(Debug)]
 pub enum FeMessage {