Update rows of pgbouncer 1.23 (#32)

Add server_lifetime to the databases table, Add avg_server_assignment_count, total_server_assignment_count to the stats table. Signed-off-by: Serge Logvinov <[email protected]>
jbub · Oct 10, 2024 · 3b7ae2c · 3b7ae2c
1 parent a6c8cc2
commit 3b7ae2c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/internal/domain/domain.go b/internal/domain/domain.go
@@ -6,21 +6,23 @@ import (
 
 // Stat represents stat row.
 type Stat struct {
-	Database          string
-	TotalReceived     int64
-	TotalSent         int64
-	TotalQueryTime    int64
-	TotalXactCount    int64
-	TotalXactTime     int64
-	TotalQueryCount   int64
-	TotalWaitTime     int64
-	AverageReceived   int64
-	AverageSent       int64
-	AverageQueryCount int64
-	AverageQueryTime  int64
-	AverageXactTime   int64
-	AverageXactCount  int64
-	AverageWaitTime   int64
+	Database                     string
+	TotalReceived                int64
+	TotalSent                    int64
+	TotalQueryTime               int64
+	TotalXactCount               int64
+	TotalXactTime                int64
+	TotalQueryCount              int64
+	TotalWaitTime                int64
+	TotalServerAssignmentCount   int64
+	AverageReceived              int64
+	AverageSent                  int64
+	AverageQueryCount            int64
+	AverageQueryTime             int64
+	AverageXactTime              int64
+	AverageXactCount             int64
+	AverageWaitTime              int64
+	AverageServerAssignmentCount int64
 }
 
 // Pool represents pool row.

diff --git a/internal/sqlstore/sql.go b/internal/sqlstore/sql.go
@@ -37,6 +37,7 @@ type database struct {
 	PoolSize           int64
 	MinPoolSize        int64
 	ReservePool        int64
+	ServerLifetime     int64
 	PoolMode           sql.NullString
 	MaxConnections     int64
 	CurrentConnections int64
@@ -77,6 +78,8 @@ func (s *Store) GetStats(ctx context.Context) ([]domain.Stat, error) {
 			switch column {
 			case "database":
 				dest = append(dest, &row.Database)
+			case "total_server_assignment_count":
+				dest = append(dest, &row.TotalServerAssignmentCount)
 			case "total_xact_count":
 				dest = append(dest, &row.TotalXactCount)
 			case "total_query_count":
@@ -91,6 +94,8 @@ func (s *Store) GetStats(ctx context.Context) ([]domain.Stat, error) {
 				dest = append(dest, &row.TotalQueryTime)
 			case "total_wait_time":
 				dest = append(dest, &row.TotalWaitTime)
+			case "avg_server_assignment_count":
+				dest = append(dest, &row.AverageServerAssignmentCount)
 			case "avg_xact_count":
 				dest = append(dest, &row.AverageXactCount)
 			case "avg_query_count":
@@ -252,6 +257,8 @@ func (s *Store) GetDatabases(ctx context.Context) ([]domain.Database, error) {
 				dest = append(dest, &row.MinPoolSize)
 			case "reserve_pool":
 				dest = append(dest, &row.ReservePool)
+			case "server_lifetime":
+				dest = append(dest, &row.ServerLifetime)
 			case "pool_mode":
 				dest = append(dest, &row.PoolMode)
 			case "max_connections":