mappers for postgres

wader · Jul 21, 2022 · fcd7fbc · fcd7fbc
1 parent 441ecee
commit fcd7fbc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/format/postgres/common/common.go b/format/postgres/common/common.go
@@ -55,12 +55,13 @@ var IcuVersionMapper = icuVersionMapper{}
 type xLogRecPtrMapper struct{}
 
 func (m xLogRecPtrMapper) MapScalar(s scalar.S) (scalar.S, error) {
-	lsn := s.ActualU()
-	s.Sym = fmt.Sprintf("%X/%X", lsn>>32, uint32(lsn))
+	v := s.ActualU()
+	s.Sym = fmt.Sprintf("%X/%X", v>>32, uint32(v))
 	return s, nil
 }
 
 var XLogRecPtrMapper = xLogRecPtrMapper{}
+var LocPtrMapper = xLogRecPtrMapper{}
 
 type timeMapper struct{}
 

diff --git a/format/postgres/flavours/pgproee14/pg_control.go b/format/postgres/flavours/pgproee14/pg_control.go
@@ -147,17 +147,17 @@ func DecodePgControl(d *decode.D, in any) any {
 	/*  168      |     8 */ // XLogRecPtr minRecoveryPoint;
 	/*  176      |     4 */ // TimeLineID minRecoveryPointTLI;
 	/* XXX  4-byte hole  */
-	d.FieldU64("unloggedLSN")
-	d.FieldU64("minRecoveryPoint")
+	d.FieldU64("unloggedLSN", common.LocPtrMapper)
+	d.FieldU64("minRecoveryPoint", common.LocPtrMapper)
 	d.FieldU32("minRecoveryPointTLI")
 	d.U32()
 
 	/*  184      |     8 */ // XLogRecPtr backupStartPoint;
 	/*  192      |     8 */ // XLogRecPtr backupEndPoint;
 	/*  200      |     1 */ // _Bool backupEndRequired;
 	/* XXX  3-byte hole  */
-	d.FieldU64("backupStartPoint")
-	d.FieldU64("backupEndPoint")
+	d.FieldU64("backupStartPoint", common.LocPtrMapper)
+	d.FieldU64("backupEndPoint", common.LocPtrMapper)
 	d.FieldU8("backupEndRequired")
 	d.U24()
 

diff --git a/format/postgres/flavours/postgres11/pg_control.go b/format/postgres/flavours/postgres11/pg_control.go
@@ -140,17 +140,17 @@ func DecodePgControl(d *decode.D, in any) any {
 	/*  128      |     8 */ // XLogRecPtr minRecoveryPoint;
 	/*  136      |     4 */ // TimeLineID minRecoveryPointTLI;
 	/* XXX  4-byte hole */
-	d.FieldU64("unloggedLSN")
-	d.FieldU64("minRecoveryPoint")
+	d.FieldU64("unloggedLSN", common.LocPtrMapper)
+	d.FieldU64("minRecoveryPoint", common.LocPtrMapper)
 	d.FieldU32("minRecoveryPointTLI")
 	d.U32()
 
 	/*  144      |     8 */ // XLogRecPtr backupStartPoint;
 	/*  152      |     8 */ // XLogRecPtr backupEndPoint;
 	/*  160      |     1 */ // _Bool backupEndRequired;
 	/* XXX  3-byte hole */
-	d.FieldU64("backupStartPoint")
-	d.FieldU64("backupEndPoint")
+	d.FieldU64("backupStartPoint", common.LocPtrMapper)
+	d.FieldU64("backupEndPoint", common.LocPtrMapper)
 	d.FieldU8("backupEndRequired")
 	d.U24()
 

diff --git a/format/postgres/flavours/postgres14/pg_control.go b/format/postgres/flavours/postgres14/pg_control.go
@@ -139,17 +139,17 @@ func DecodePgControl(d *decode.D, in any) any {
 	/*  136      |     8 */ // XLogRecPtr minRecoveryPoint;
 	/*  144      |     4 */ // TimeLineID minRecoveryPointTLI;
 	/* XXX  4-byte hole  */
-	d.FieldU64("unloggedLSN")
-	d.FieldU64("minRecoveryPoint")
+	d.FieldU64("unloggedLSN", common.LocPtrMapper)
+	d.FieldU64("minRecoveryPoint", common.LocPtrMapper)
 	d.FieldU32("minRecoveryPointTLI")
 	d.U32()
 
 	/*  152      |     8 */ // XLogRecPtr backupStartPoint;
 	/*  160      |     8 */ // XLogRecPtr backupEndPoint;
 	/*  168      |     1 */ // _Bool backupEndRequired;
 	/* XXX  3-byte hole  */
-	d.FieldU64("backupStartPoint")
-	d.FieldU64("backupEndPoint")
+	d.FieldU64("backupStartPoint", common.LocPtrMapper)
+	d.FieldU64("backupEndPoint", common.LocPtrMapper)
 	d.FieldU8("backupEndRequired")
 	d.U24()