From aaacdbf3ea42e3f977f4134ce13fa15a9a1e6c54 Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Mon, 11 Jul 2022 21:09:03 -0500 Subject: [PATCH] Use string internally for CommandTag --- pgconn/benchmark_private_test.go | 6 ++--- pgconn/pgconn.go | 46 +++++++------------------------- pgconn/pgconn_private_test.go | 22 +++++++-------- 3 files changed, 24 insertions(+), 50 deletions(-) diff --git a/pgconn/benchmark_private_test.go b/pgconn/benchmark_private_test.go index e074c75c..9ea036ec 100644 --- a/pgconn/benchmark_private_test.go +++ b/pgconn/benchmark_private_test.go @@ -17,7 +17,7 @@ func BenchmarkCommandTagRowsAffected(b *testing.B) { } for _, bm := range benchmarks { - ct := CommandTag{buf: []byte(bm.commandTag)} + ct := CommandTag{s: bm.commandTag} b.Run(bm.commandTag, func(b *testing.B) { var n int64 for i := 0; i < b.N; i++ { @@ -31,7 +31,7 @@ func BenchmarkCommandTagRowsAffected(b *testing.B) { } func BenchmarkCommandTagTypeFromString(b *testing.B) { - ct := CommandTag{buf: []byte("UPDATE 1")} + ct := CommandTag{s: "UPDATE 1"} var update bool for i := 0; i < b.N; i++ { @@ -59,7 +59,7 @@ func BenchmarkCommandTagInsert(b *testing.B) { } for _, bm := range benchmarks { - ct := CommandTag{buf: []byte(bm.commandTag)} + ct := CommandTag{s: bm.commandTag} b.Run(bm.commandTag, func(b *testing.B) { var is bool for i := 0; i < b.N; i++ { diff --git a/pgconn/pgconn.go b/pgconn/pgconn.go index 65fb015a..37928ed7 100644 --- a/pgconn/pgconn.go +++ b/pgconn/pgconn.go @@ -630,7 +630,7 @@ func (pgConn *PgConn) ParameterStatus(key string) string { // CommandTag is the result of an Exec function type CommandTag struct { - buf []byte + s string } // RowsAffected returns the number of rows affected. If the CommandTag was not @@ -638,8 +638,8 @@ type CommandTag struct { func (ct CommandTag) RowsAffected() int64 { // Find last non-digit idx := -1 - for i := len(ct.buf) - 1; i >= 0; i-- { - if ct.buf[i] >= '0' && ct.buf[i] <= '9' { + for i := len(ct.s) - 1; i >= 0; i-- { + if ct.s[i] >= '0' && ct.s[i] <= '9' { idx = i } else { break @@ -651,7 +651,7 @@ func (ct CommandTag) RowsAffected() int64 { } var n int64 - for _, b := range ct.buf[idx:] { + for _, b := range ct.s[idx:] { n = n*10 + int64(b-'0') } @@ -659,51 +659,27 @@ func (ct CommandTag) RowsAffected() int64 { } func (ct CommandTag) String() string { - return string(ct.buf) + return ct.s } // Insert is true if the command tag starts with "INSERT". func (ct CommandTag) Insert() bool { - return len(ct.buf) >= 6 && - ct.buf[0] == 'I' && - ct.buf[1] == 'N' && - ct.buf[2] == 'S' && - ct.buf[3] == 'E' && - ct.buf[4] == 'R' && - ct.buf[5] == 'T' + return strings.HasPrefix(ct.s, "INSERT") } // Update is true if the command tag starts with "UPDATE". func (ct CommandTag) Update() bool { - return len(ct.buf) >= 6 && - ct.buf[0] == 'U' && - ct.buf[1] == 'P' && - ct.buf[2] == 'D' && - ct.buf[3] == 'A' && - ct.buf[4] == 'T' && - ct.buf[5] == 'E' + return strings.HasPrefix(ct.s, "UPDATE") } // Delete is true if the command tag starts with "DELETE". func (ct CommandTag) Delete() bool { - return len(ct.buf) >= 6 && - ct.buf[0] == 'D' && - ct.buf[1] == 'E' && - ct.buf[2] == 'L' && - ct.buf[3] == 'E' && - ct.buf[4] == 'T' && - ct.buf[5] == 'E' + return strings.HasPrefix(ct.s, "DELETE") } // Select is true if the command tag starts with "SELECT". func (ct CommandTag) Select() bool { - return len(ct.buf) >= 6 && - ct.buf[0] == 'S' && - ct.buf[1] == 'E' && - ct.buf[2] == 'L' && - ct.buf[3] == 'E' && - ct.buf[4] == 'C' && - ct.buf[5] == 'T' + return strings.HasPrefix(ct.s, "SELECT") } type StatementDescription struct { @@ -1585,9 +1561,7 @@ func (pgConn *PgConn) CheckConn() error { // makeCommandTag makes a CommandTag. It does not retain a reference to buf or buf's underlying memory. func (pgConn *PgConn) makeCommandTag(buf []byte) CommandTag { - ct := make([]byte, len(buf)) - copy(ct, buf) - return CommandTag{buf: ct} + return CommandTag{s: string(buf)} } // HijackedConn is the result of hijacking a connection. diff --git a/pgconn/pgconn_private_test.go b/pgconn/pgconn_private_test.go index 4368f717..5659bc9e 100644 --- a/pgconn/pgconn_private_test.go +++ b/pgconn/pgconn_private_test.go @@ -17,17 +17,17 @@ func TestCommandTag(t *testing.T) { isDelete bool isSelect bool }{ - {commandTag: CommandTag{buf: []byte("INSERT 0 5")}, rowsAffected: 5, isInsert: true}, - {commandTag: CommandTag{buf: []byte("UPDATE 0")}, rowsAffected: 0, isUpdate: true}, - {commandTag: CommandTag{buf: []byte("UPDATE 1")}, rowsAffected: 1, isUpdate: true}, - {commandTag: CommandTag{buf: []byte("DELETE 0")}, rowsAffected: 0, isDelete: true}, - {commandTag: CommandTag{buf: []byte("DELETE 1")}, rowsAffected: 1, isDelete: true}, - {commandTag: CommandTag{buf: []byte("DELETE 1234567890")}, rowsAffected: 1234567890, isDelete: true}, - {commandTag: CommandTag{buf: []byte("SELECT 1")}, rowsAffected: 1, isSelect: true}, - {commandTag: CommandTag{buf: []byte("SELECT 99999999999")}, rowsAffected: 99999999999, isSelect: true}, - {commandTag: CommandTag{buf: []byte("CREATE TABLE")}, rowsAffected: 0}, - {commandTag: CommandTag{buf: []byte("ALTER TABLE")}, rowsAffected: 0}, - {commandTag: CommandTag{buf: []byte("DROP TABLE")}, rowsAffected: 0}, + {commandTag: CommandTag{s: "INSERT 0 5"}, rowsAffected: 5, isInsert: true}, + {commandTag: CommandTag{s: "UPDATE 0"}, rowsAffected: 0, isUpdate: true}, + {commandTag: CommandTag{s: "UPDATE 1"}, rowsAffected: 1, isUpdate: true}, + {commandTag: CommandTag{s: "DELETE 0"}, rowsAffected: 0, isDelete: true}, + {commandTag: CommandTag{s: "DELETE 1"}, rowsAffected: 1, isDelete: true}, + {commandTag: CommandTag{s: "DELETE 1234567890"}, rowsAffected: 1234567890, isDelete: true}, + {commandTag: CommandTag{s: "SELECT 1"}, rowsAffected: 1, isSelect: true}, + {commandTag: CommandTag{s: "SELECT 99999999999"}, rowsAffected: 99999999999, isSelect: true}, + {commandTag: CommandTag{s: "CREATE TABLE"}, rowsAffected: 0}, + {commandTag: CommandTag{s: "ALTER TABLE"}, rowsAffected: 0}, + {commandTag: CommandTag{s: "DROP TABLE"}, rowsAffected: 0}, } for i, tt := range tests {