PostgreSQL: fixes

wader · Aug 2, 2022 · 96a86e2 · 96a86e2
1 parent ffd7c9b
commit 96a86e2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/format/postgres/flavours/pgproee14/pgheap.go b/format/postgres/flavours/pgproee14/pgheap.go
@@ -126,8 +126,10 @@ func DecodePageSpecial(d *decode.D) {
 	specialPos := int64(page.PagePosBegin*8) + int64(page.PdSpecial*8)
 	d.SeekAbs(specialPos)
 
-	page.PdXidBase = d.FieldU64("pd_xid_base")
-	page.PdMultiBase = d.FieldU64("pd_multi_base")
-	page.PdPruneXid = d.FieldU32("pd_prune_xid")
-	page.PdMagic = d.FieldU32("pd_magic")
+	d.FieldStruct("HeapPageSpecialData", func(d *decode.D) {
+		page.PdXidBase = d.FieldU64("pd_xid_base")
+		page.PdMultiBase = d.FieldU64("pd_multi_base")
+		page.PdPruneXid = d.FieldU32("pd_prune_xid")
+		page.PdMagic = d.FieldU32("pd_magic")
+	})
 }
diff --git a/format/postgres/flavours/postgres14/common14/pgheap.go b/format/postgres/flavours/postgres14/common14/pgheap.go
@@ -80,7 +80,7 @@ const (
 //
 /* total size (bytes):   12  */
 /* } t_choice;             //
-/*   12      |     6 */// ItemPointerData t_ctid;
+/*   12      |     6 */ // ItemPointerData t_ctid;
 /*   18      |     2 */ // uint16 t_infomask2;
 /*   20      |     2 */ // uint16 t_infomask;
 /*   22      |     1 */ // uint8 t_hoff;
@@ -160,9 +160,9 @@ type itemIdDataD struct {
 	/*    0: 0   |     4 */ // unsigned int lp_off: 15
 	/*    1: 7   |     4 */ // unsigned int lp_flags: 2
 	/*    2: 1   |     4 */ // unsigned int lp_len: 15
-	lpOff   uint32
-	lpFlags uint32
-	lpLen   uint32
+	lpOff                   uint32
+	lpFlags                 uint32
+	lpLen                   uint32
 }
 
 func GetHeapD(d *decode.D) *HeapD {
@@ -185,6 +185,10 @@ func decodeHeapPages(d *decode.D) {
 	heap := GetHeapD(d)
 
 	for {
+		if end, _ := d.TryEnd(); end {
+			return
+		}
+
 		page := &HeapPageD{}
 		heap.Page = page
 
@@ -212,7 +216,9 @@ func decodeHeapPage(d *decode.D) {
 	// free space
 	freeSpaceEnd := int64(pagePosBegin*8) + int64(page.PdUpper*8)
 	freeSpaceNBits := freeSpaceEnd - d.Pos()
-	d.FieldRawLen("FreeSpace", freeSpaceNBits, scalar.RawHex)
+	if freeSpaceNBits != 0 {
+		d.FieldRawLen("FreeSpace", freeSpaceNBits, scalar.RawHex)
+	}
 
 	if uint64(page.PdSpecial) != heap.PageSize && heap.DecodePageSpecialFn != nil {
 		heap.DecodePageSpecialFn(d)
@@ -274,7 +280,7 @@ func decodeTuples(d *decode.D) {
 		//						} t_choice;
 		/* total size (bytes):   12  */
 		/*
-			/*   12      |     6 */// ItemPointerData t_ctid;
+			/*   12      |     6 */ // ItemPointerData t_ctid;
 		/*   18      |     2 */ // uint16 t_infomask2;
 		/*   20      |     2 */ // uint16 t_infomask;
 		/*   22      |     1 */ // uint8 t_hoff;