Skip to content

Commit d0818e1

Browse files
krisdianojackc
authored andcommitted
fix get server major version
1 parent 163df88 commit d0818e1

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

pglogrepl.go

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ func FinishBaseBackup(ctx context.Context, conn *pgconn.PgConn) (result BaseBack
571571
}
572572

573573
// Base_Backup done, server send a command complete response from pg13
574-
vmaj, err := getMajorVersion(conn)
574+
vmaj, err := serverMajorVersion(conn)
575575
if err != nil {
576576
return
577577
}
@@ -604,24 +604,6 @@ func FinishBaseBackup(ctx context.Context, conn *pgconn.PgConn) (result BaseBack
604604
return
605605
}
606606

607-
func getMajorVersion(conn *pgconn.PgConn) (int, error) {
608-
sversion := conn.ParameterStatus("server_version")
609-
if len(sversion) == 0 {
610-
return 0, fmt.Errorf("no server_version")
611-
}
612-
var vmaj, vmin, vrev int
613-
cnt, err := fmt.Sscanf(sversion, "%d.%d.%d", &vmaj, &vmin, &vrev)
614-
if err != nil {
615-
return 0, err
616-
}
617-
switch cnt {
618-
case 1, 2, 3:
619-
return vmaj, nil
620-
default:
621-
}
622-
return 0, fmt.Errorf("unknown server version")
623-
}
624-
625607
type PrimaryKeepaliveMessage struct {
626608
ServerWALEnd LSN
627609
ServerTime time.Time

0 commit comments

Comments
 (0)