Postgres 17 support 3/n

mdevan · mdevan · commit 7637732aa5b0 · 2024-06-25T19:36:07.000+05:30
diff --git a/collector/collect.go b/collector/collect.go
@@ -511,6 +511,10 @@ func (c *collector) collectCluster(o CollectConfig) {
 		c.getProgressCopy()
 	}
 
+	if c.version >= pgv17 {
+		c.getCheckpointer()
+	}
+
 	if !arrayHas(o.Omit, "log") && c.local {
 		c.getLogInfo()
 	}
@@ -2930,6 +2934,26 @@ func (c *collector) getProgressCreateIndex() {
 	c.result.CreateIndexProgress = out
 }
 
+func (c *collector) getCheckpointer() {
+	ctx, cancel := context.WithTimeout(context.Background(), c.timeout)
+	defer cancel()
+
+	q := `SELECT num_timed, num_requested, restartpoints_timed,
+				restartpoints_req, restartpoints_done, write_time, sync_time,
+				buffers_written, COALESCE(EXTRACT(EPOCH FROM stats_reset)::bigint, 0)
+		    FROM pg_stat_checkpointer`
+
+	var ckp pgmetrics.Checkpointer
+	err := c.db.QueryRowContext(ctx, q).Scan(&ckp.NumTimed, &ckp.NumRequested,
+		&ckp.RestartpointsTimed, &ckp.RestartpointsRequested, &ckp.RestartpointsDone,
+		&ckp.WriteTime, &ckp.SyncTime, &ckp.BuffersWritten, &ckp.StatsReset)
+	if err != nil {
+		log.Fatalf("pg_stat_checkpointer query failed: %v", err)
+	}
+
+	c.result.Checkpointer = &ckp
+}
+
 //------------------------------------------------------------------------------
 // PgBouncer
 
diff --git a/model.go b/model.go
@@ -186,6 +186,9 @@ type Model struct {
 
 	// raw log entries during specified time span
 	LogEntries []LogEntry `json:"log_entries,omitempty"`
+
+	// contents of pg_stat_checkpointer, pg >= v17
+	Checkpointer *Checkpointer `json:"checkpointer,omitempty"`
 }
 
 // DatabaseByOID iterates over the databases in the model and returns the reference
@@ -1104,3 +1107,17 @@ type LogEntryExtra struct {
 	Level string `json:"level,omitempty"`
 	Line  string `json:"line,omitempty"`
 }
+
+// Checkpointer contains the data from the only row of pg_stat_checkpointer.
+// Present only in pg >= v17. Added in schema 1.17.
+type Checkpointer struct {
+	NumTimed               int64   `json:"num_timed"`
+	NumRequested           int64   `json:"num_requested"`
+	RestartpointsTimed     int64   `json:"restartpoints_timed"`
+	RestartpointsRequested int64   `json:"restartpoints_req"`
+	RestartpointsDone      int64   `json:"restartpoints_done"`
+	WriteTime              float64 `json:"write_time"`
+	SyncTime               float64 `json:"sync_time"`
+	BuffersWritten         int64   `json:"buffers_written"`
+	StatsReset             int64   `json:"stats_reset"`
+}
