From 7ae7e1e41df935c046c10471bdce7f72fc12331b Mon Sep 17 00:00:00 2001
From: Euler Taveira <euler.taveira@enterprisedb.com>
Date: Wed, 11 Nov 2020 11:25:48 -0300
Subject: [PATCH 2/2] Print checkpoint timestamp for xlog_desc

Checkpoint timestamp might be useful for debug purposes. Let's expose
it. Since this function is used by frontend (pg_waldump) and backend
(WAL_DEBUG), use different code paths to print the timestamp.
---
 src/backend/access/rmgrdesc/xlogdesc.c |  3 ++-
 src/bin/pg_waldump/compat.c            | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/backend/access/rmgrdesc/xlogdesc.c b/src/backend/access/rmgrdesc/xlogdesc.c
index 3200f777f5..02a6dacfdd 100644
--- a/src/backend/access/rmgrdesc/xlogdesc.c
+++ b/src/backend/access/rmgrdesc/xlogdesc.c
@@ -44,12 +44,13 @@ xlog_desc(StringInfo buf, XLogReaderState *record)
 	{
 		CheckPoint *checkpoint = (CheckPoint *) rec;
 
-		appendStringInfo(buf, "redo %X/%X; "
+		appendStringInfo(buf, "redo %X/%X; timestamp %s; "
 						 "tli %u; prev tli %u; fpw %s; xid %u:%u; oid %u; multi %u; offset %u; "
 						 "oldest xid %u in DB %u; oldest multi %u in DB %u; "
 						 "oldest/newest commit timestamp xid: %u/%u; "
 						 "oldest running xid %u; %s",
 						 (uint32) (checkpoint->redo >> 32), (uint32) checkpoint->redo,
+						 timestamptz_to_str(time_t_to_timestamptz(checkpoint->time)),
 						 checkpoint->ThisTimeLineID,
 						 checkpoint->PrevTimeLineID,
 						 checkpoint->fullPageWrites ? "true" : "false",
diff --git a/src/bin/pg_waldump/compat.c b/src/bin/pg_waldump/compat.c
index 7cb0539e74..2a1e7f8140 100644
--- a/src/bin/pg_waldump/compat.c
+++ b/src/bin/pg_waldump/compat.c
@@ -33,6 +33,19 @@ timestamptz_to_time_t(TimestampTz t)
 	return result;
 }
 
+/* copied from timestamp.c */
+TimestampTz
+time_t_to_timestamptz(pg_time_t tm)
+{
+	TimestampTz result;
+
+	result = (TimestampTz) tm -
+		((POSTGRES_EPOCH_JDATE - UNIX_EPOCH_JDATE) * SECS_PER_DAY);
+	result *= USECS_PER_SEC;
+
+	return result;
+}
+
 /*
  * Stopgap implementation of timestamptz_to_str that doesn't depend on backend
  * infrastructure.  This will work for timestamps that are within the range
-- 
2.20.1

