postgres: add page arg in pg_btree, change args names in pg_heap

wader · Dec 22, 2022 · 97bbc22 · 97bbc22
1 parent 0ea20e6
commit 97bbc22
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/format/format.go b/format/format.go
@@ -332,7 +332,11 @@ type PostgresIn struct {
 }
 
 type PostgresHeapIn struct {
-	Flavour       string `doc:"PostgreSQL flavour: postgres14, pgproee14.., postgres10"`
-	PageNumber    int    `doc:"First page number in file, default is 0"`
-	SegmentNumber int    `doc:"Segment file number (16790.1 is 1), default is 0"`
+	Flavour string `doc:"PostgreSQL flavour: postgres14, pgproee14.., postgres10"`
+	Page    int    `doc:"First page number in file, default is 0"`
+	Segment int    `doc:"Segment file number (16790.1 is 1), default is 0"`
+}
+
+type PostgresBTreeIn struct {
+	Page int `doc:"First page number in file, default is 0"`
 }
diff --git a/format/postgres/common/pg_btree/postgres/pg_btree.go b/format/postgres/common/pg_btree/postgres/pg_btree.go
@@ -1,6 +1,7 @@
 package postgres
 
 import (
+	"github.com/wader/fq/format"
 	"github.com/wader/fq/format/postgres/common"
 	"github.com/wader/fq/format/postgres/common/pg_heap/postgres"
 	"github.com/wader/fq/pkg/decode"
@@ -66,22 +67,23 @@ const (
 // IndexTupleData *IndexTuple;
 /* total size (bytes):    8 */
 
-func DecodePgBTree(d *decode.D) any {
+func DecodePgBTree(d *decode.D, args format.PostgresBTreeIn) any {
 	btree := &BTree{
+		Args:     args,
 		PageSize: common.PageSize,
 	}
 	decodeBTreePages(btree, d)
 	return nil
 }
 
 type BTree struct {
+	Args     format.PostgresBTreeIn
 	PageSize uint64
 	page     *postgres.HeapPage
 }
 
 func decodeBTreePages(btree *BTree, d *decode.D) {
-	for i := 0; ; i++ {
-
+	for i := btree.Args.Page; ; i++ {
 		page := &postgres.HeapPage{}
 		if btree.page != nil {
 			// use prev page

diff --git a/format/postgres/common/pg_heap/postgres/pg_heap.go b/format/postgres/common/pg_heap/postgres/pg_heap.go
@@ -144,7 +144,7 @@ func Decode(heap *Heap, d *decode.D) any {
 }
 
 func decodeHeapPages(heap *Heap, d *decode.D) {
-	blockNumber := uint32(heap.Args.PageNumber + heap.Args.SegmentNumber*common.RelSegSize)
+	blockNumber := uint32(heap.Args.Page + heap.Args.Segment*common.RelSegSize)
 	count := int64(0)
 	for {
 		if end, _ := d.TryEnd(); end {

diff --git a/format/postgres/pg_btree.go b/format/postgres/pg_btree.go
@@ -18,13 +18,19 @@ func init() {
 		Name:        format.PG_BTREE,
 		Description: "PostgreSQL btree index file",
 		DecodeFn:    decodePgBTree,
-		RootArray:   true,
-		RootName:    "pages",
+		DecodeInArg: format.PostgresBTreeIn{
+			Page: 0,
+		},
+		RootArray: true,
+		RootName:  "pages",
 	})
 	interp.RegisterFS(pgBTreeFS)
 }
 
 func decodePgBTree(d *decode.D, in any) any {
-	d.Endian = decode.LittleEndian
-	return postgres.DecodePgBTree(d)
+	pgIn, ok := in.(format.PostgresBTreeIn)
+	if !ok {
+		d.Fatalf("DecodeInArg must be PostgresBTreeIn!\n")
+	}
+	return postgres.DecodePgBTree(d, pgIn)
 }
diff --git a/format/postgres/pg_heap.go b/format/postgres/pg_heap.go
@@ -23,9 +23,9 @@ func init() {
 		Description: "PostgreSQL heap file",
 		DecodeFn:    decodePgheap,
 		DecodeInArg: format.PostgresHeapIn{
-			Flavour:       PG_FLAVOUR_POSTGRES14,
-			PageNumber:    0,
-			SegmentNumber: 0,
+			Flavour: PG_FLAVOUR_POSTGRES14,
+			Page:    0,
+			Segment: 0,
 		},
 		RootArray: true,
 		RootName:  "pages",