From f27178ba85dcb484d61189c2e0c8f5ce9c2ff097 Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Sat, 12 Mar 2022 08:35:31 -0600 Subject: [PATCH] Initial privatization of stmtcache ConnConfig.BuildStatementCache is pending removal once connections always have separate caches for prepared and described statements. --- batch_test.go | 2 +- bench_test.go | 2 +- conn.go | 5 +---- conn_test.go | 2 +- {pgconn => internal}/stmtcache/lru.go | 0 {pgconn => internal}/stmtcache/lru_test.go | 2 +- {pgconn => internal}/stmtcache/stmtcache.go | 0 pgbouncer_test.go | 2 +- query_test.go | 2 +- 9 files changed, 7 insertions(+), 10 deletions(-) rename {pgconn => internal}/stmtcache/lru.go (100%) rename {pgconn => internal}/stmtcache/lru_test.go (99%) rename {pgconn => internal}/stmtcache/stmtcache.go (100%) diff --git a/batch_test.go b/batch_test.go index c2e944a1..24a70e39 100644 --- a/batch_test.go +++ b/batch_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/internal/stmtcache" "github.com/jackc/pgx/v5/pgconn" - "github.com/jackc/pgx/v5/pgconn/stmtcache" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/bench_test.go b/bench_test.go index bd182ebd..dfb879e5 100644 --- a/bench_test.go +++ b/bench_test.go @@ -13,8 +13,8 @@ import ( "time" "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/internal/stmtcache" "github.com/jackc/pgx/v5/pgconn" - "github.com/jackc/pgx/v5/pgconn/stmtcache" "github.com/jackc/pgx/v5/pgtype" "github.com/stretchr/testify/require" ) diff --git a/conn.go b/conn.go index 34d23198..0085e454 100644 --- a/conn.go +++ b/conn.go @@ -10,8 +10,8 @@ import ( "github.com/jackc/pgx/v5/internal/anynil" "github.com/jackc/pgx/v5/internal/sanitize" + "github.com/jackc/pgx/v5/internal/stmtcache" "github.com/jackc/pgx/v5/pgconn" - "github.com/jackc/pgx/v5/pgconn/stmtcache" "github.com/jackc/pgx/v5/pgproto3" "github.com/jackc/pgx/v5/pgtype" ) @@ -381,9 +381,6 @@ func (c *Conn) Ping(ctx context.Context) error { // is used and the connection must be returned to the same state before any *pgx.Conn methods are again used. func (c *Conn) PgConn() *pgconn.PgConn { return c.pgConn } -// StatementCache returns the statement cache used for this connection. -func (c *Conn) StatementCache() stmtcache.Cache { return c.stmtcache } - // TypeMap returns the connection info used for this connection. func (c *Conn) TypeMap() *pgtype.Map { return c.typeMap } diff --git a/conn_test.go b/conn_test.go index f4b3dd78..3792ba45 100644 --- a/conn_test.go +++ b/conn_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/internal/stmtcache" "github.com/jackc/pgx/v5/pgconn" - "github.com/jackc/pgx/v5/pgconn/stmtcache" "github.com/jackc/pgx/v5/pgtype" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pgconn/stmtcache/lru.go b/internal/stmtcache/lru.go similarity index 100% rename from pgconn/stmtcache/lru.go rename to internal/stmtcache/lru.go diff --git a/pgconn/stmtcache/lru_test.go b/internal/stmtcache/lru_test.go similarity index 99% rename from pgconn/stmtcache/lru_test.go rename to internal/stmtcache/lru_test.go index 549e7670..7690a2b0 100644 --- a/pgconn/stmtcache/lru_test.go +++ b/internal/stmtcache/lru_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" + "github.com/jackc/pgx/v5/internal/stmtcache" "github.com/jackc/pgx/v5/pgconn" - "github.com/jackc/pgx/v5/pgconn/stmtcache" "github.com/stretchr/testify/require" ) diff --git a/pgconn/stmtcache/stmtcache.go b/internal/stmtcache/stmtcache.go similarity index 100% rename from pgconn/stmtcache/stmtcache.go rename to internal/stmtcache/stmtcache.go diff --git a/pgbouncer_test.go b/pgbouncer_test.go index e80861a0..c46f0622 100644 --- a/pgbouncer_test.go +++ b/pgbouncer_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/internal/stmtcache" "github.com/jackc/pgx/v5/pgconn" - "github.com/jackc/pgx/v5/pgconn/stmtcache" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/query_test.go b/query_test.go index 8ed89007..20cc49c0 100644 --- a/query_test.go +++ b/query_test.go @@ -13,8 +13,8 @@ import ( "time" "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/internal/stmtcache" "github.com/jackc/pgx/v5/pgconn" - "github.com/jackc/pgx/v5/pgconn/stmtcache" "github.com/jackc/pgx/v5/pgtype" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require"