-
Notifications
You must be signed in to change notification settings - Fork 838
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
When loading even a single type into pgx's type map, multiple SQL queries are performed in series. Over a slow link, this is not ideal. Worse, if multiple types are being registered, this is repeated multiple times. This commit add LoadTypes, which can retrieve type mapping information for multiple types in a single SQL call, including recursive fetching of dependent types. RegisterTypes performs the second stage of this operation.
- Loading branch information
Showing
7 changed files
with
386 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,197 @@ | ||
package pgx | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"regexp" | ||
"strconv" | ||
"strings" | ||
|
||
"github.com/jackc/pgx/v5/pgtype" | ||
) | ||
|
||
/* | ||
buildLoadDerivedTypesSQL generates the correct query for retrieving type information. | ||
pgVersion: the major version of the PostgreSQL server | ||
typeNames: the names of the types to load. If nil, load all types. | ||
*/ | ||
func buildLoadDerivedTypesSQL(pgVersion int64, typeNames []string) string { | ||
supportsMultirange := (pgVersion >= 14) | ||
var typeNamesClause string | ||
|
||
if typeNames == nil { | ||
// collect all types. Not currently recommended. | ||
typeNamesClause = "IS NOT NULL" | ||
} else { | ||
typeNamesClause = "= ANY($1)" | ||
} | ||
parts := make([]string, 0, 10) | ||
|
||
// Each of the type names provided might be found in pg_class or pg_type. | ||
// Additionally, it may or may not include a schema portion. | ||
parts = append(parts, ` | ||
WITH RECURSIVE | ||
-- find the OIDs in pg_class which match one of the provided type names | ||
selected_classes(oid,reltype) AS ( | ||
-- this query uses the namespace search path, so will match type names without a schema prefix | ||
SELECT pg_class.oid, pg_class.reltype | ||
FROM pg_catalog.pg_class | ||
LEFT JOIN pg_catalog.pg_namespace n ON n.oid = pg_class.relnamespace | ||
WHERE pg_catalog.pg_table_is_visible(pg_class.oid) | ||
AND relname `, typeNamesClause, ` | ||
UNION ALL | ||
-- this query will only match type names which include the schema prefix | ||
SELECT pg_class.oid, pg_class.reltype | ||
FROM pg_class | ||
INNER JOIN pg_namespace ON (pg_class.relnamespace = pg_namespace.oid) | ||
WHERE nspname || '.' || relname `, typeNamesClause, ` | ||
), | ||
selected_types(oid) AS ( | ||
-- collect the OIDs from pg_types which correspond to the selected classes | ||
SELECT reltype AS oid | ||
FROM selected_classes | ||
UNION ALL | ||
-- as well as any other type names which match our criteria | ||
SELECT oid | ||
FROM pg_type | ||
WHERE typname `, typeNamesClause, ` | ||
), | ||
-- this builds a parent/child mapping of objects, allowing us to know | ||
-- all the child (ie: dependent) types that a parent (type) requires | ||
-- As can be seen, there are 3 ways this can occur (the last of which | ||
-- is due to being a composite class, where the composite fields are children) | ||
pc(parent, child) AS ( | ||
SELECT parent.oid, parent.typelem | ||
FROM pg_type parent | ||
WHERE parent.typtype = 'b' AND parent.typelem != 0 | ||
UNION ALL | ||
SELECT parent.oid, parent.typbasetype | ||
FROM pg_type parent | ||
WHERE parent.typtypmod = -1 AND parent.typbasetype != 0 | ||
UNION ALL | ||
SELECT pg_type.oid, atttypid | ||
FROM pg_attribute | ||
INNER JOIN pg_class ON (pg_class.oid = pg_attribute.attrelid) | ||
INNER JOIN pg_type ON (pg_type.oid = pg_class.reltype) | ||
WHERE NOT attisdropped | ||
AND attnum > 0 | ||
), | ||
-- Now construct a recursive query which includes a 'depth' element. | ||
-- This is used to ensure that the "youngest" children are registered before | ||
-- their parents. | ||
relationships(parent, child, depth) AS ( | ||
SELECT DISTINCT 0::OID, selected_types.oid, 0 | ||
FROM selected_types | ||
UNION ALL | ||
SELECT pg_type.oid AS parent, pg_attribute.atttypid AS child, 1 | ||
FROM selected_classes c | ||
inner join pg_type ON (c.reltype = pg_type.oid) | ||
inner join pg_attribute on (c.oid = pg_attribute.attrelid) | ||
UNION ALL | ||
SELECT pc.parent, pc.child, relationships.depth + 1 | ||
FROM pc | ||
INNER JOIN relationships ON (pc.parent = relationships.child) | ||
), | ||
-- composite fields need to be encapsulated as a couple of arrays to provide the required information for registration | ||
composite AS ( | ||
SELECT pg_type.oid, ARRAY_AGG(attname ORDER BY attnum) AS attnames, ARRAY_AGG(atttypid ORDER BY ATTNUM) AS atttypids | ||
FROM pg_attribute | ||
INNER JOIN pg_class ON (pg_class.oid = pg_attribute.attrelid) | ||
INNER JOIN pg_type ON (pg_type.oid = pg_class.reltype) | ||
WHERE NOT attisdropped | ||
AND attnum > 0 | ||
GROUP BY pg_type.oid | ||
) | ||
-- Bring together this information, showing all the information which might possibly be required | ||
-- to complete the registration, applying filters to only show the items which relate to the selected | ||
-- types/classes. | ||
SELECT typname, | ||
typtype, | ||
typbasetype, | ||
typelem, | ||
pg_type.oid,`) | ||
if supportsMultirange { | ||
parts = append(parts, ` | ||
COALESCE(multirange.rngtypid, 0) AS rngtypid,`) | ||
} else { | ||
parts = append(parts, ` | ||
0 AS rngtypid,`) | ||
} | ||
parts = append(parts, ` | ||
COALESCE(pg_range.rngsubtype, 0) AS rngsubtype, | ||
attnames, atttypids | ||
FROM relationships | ||
INNER JOIN pg_type ON (pg_type.oid = relationships.child) | ||
LEFT OUTER JOIN pg_range ON (pg_type.oid = pg_range.rngtypid)`) | ||
if supportsMultirange { | ||
parts = append(parts, ` | ||
LEFT OUTER JOIN pg_range multirange ON (pg_type.oid = multirange.rngmultitypid)`) | ||
} | ||
|
||
parts = append(parts, ` | ||
LEFT OUTER JOIN composite USING (oid) | ||
WHERE NOT (typtype = 'b' AND typelem = 0)`) | ||
parts = append(parts, ` | ||
GROUP BY typname, typtype, typbasetype, typelem, pg_type.oid, pg_range.rngsubtype,`) | ||
if supportsMultirange { | ||
parts = append(parts, ` | ||
multirange.rngtypid,`) | ||
} | ||
parts = append(parts, ` | ||
attnames, atttypids | ||
ORDER BY MAX(depth) desc, typname;`) | ||
return strings.Join(parts, "") | ||
} | ||
|
||
// LoadDerivedTypes performs a single (complex) query, returning all the required | ||
// information to register the named types, as well as any other types directly | ||
// or indirectly required to complete the registration. | ||
// The result of this call can be passed into RegisterTypes to complete the process. | ||
func LoadDerivedTypes(ctx context.Context, c *Conn, typeNames []string) ([]*pgtype.DerivedTypeInfo, error) { | ||
if typeNames == nil || len(typeNames) == 0 { | ||
return nil, fmt.Errorf("No type names were supplied.") | ||
} | ||
|
||
serverVersion, err := serverVersion(c) | ||
if err != nil { | ||
return nil, fmt.Errorf("Unexpected server version error: %w", err) | ||
} | ||
sql := buildLoadDerivedTypesSQL(serverVersion, typeNames) | ||
var rows Rows | ||
if typeNames == nil { | ||
rows, err = c.Query(ctx, sql, QueryExecModeSimpleProtocol) | ||
} else { | ||
rows, err = c.Query(ctx, sql, QueryExecModeSimpleProtocol, typeNames) | ||
} | ||
if err != nil { | ||
return nil, fmt.Errorf("While generating load types query: %w", err) | ||
} | ||
defer rows.Close() | ||
result := make([]*pgtype.DerivedTypeInfo, 0, 100) | ||
for rows.Next() { | ||
ti := pgtype.DerivedTypeInfo{} | ||
err = rows.Scan(&ti.TypeName, &ti.Typtype, &ti.Typbasetype, &ti.Typelem, &ti.Oid, &ti.Rngtypid, &ti.Rngsubtype, &ti.Attnames, &ti.Atttypids) | ||
if err != nil { | ||
return nil, fmt.Errorf("While scanning type information: %w", err) | ||
} | ||
result = append(result, &ti) | ||
} | ||
return result, nil | ||
} | ||
|
||
// serverVersion returns the postgresql server version. | ||
func serverVersion(c *Conn) (int64, error) { | ||
serverVersionStr := c.PgConn().ParameterStatus("server_version") | ||
serverVersionStr = regexp.MustCompile(`^[0-9]+`).FindString(serverVersionStr) | ||
// if not PostgreSQL do nothing | ||
if serverVersionStr == "" { | ||
return 0, fmt.Errorf("Cannot identify server version in %q", serverVersionStr) | ||
} | ||
|
||
serverVersion, err := strconv.ParseInt(serverVersionStr, 10, 64) | ||
if err != nil { | ||
return 0, fmt.Errorf("postgres version parsing failed: %w", err) | ||
} | ||
return serverVersion, nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package pgx_test | ||
|
||
import ( | ||
"context" | ||
"testing" | ||
|
||
"github.com/jackc/pgx/v5" | ||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
func TestCompositeCodecTranscodeWithLoadTypes(t *testing.T) { | ||
skipCockroachDB(t, "Server does not support composite types (see https://github.com/cockroachdb/cockroach/issues/27792)") | ||
|
||
defaultConnTestRunner.RunTest(context.Background(), t, func(ctx context.Context, t testing.TB, conn *pgx.Conn) { | ||
_, err := conn.Exec(ctx, ` | ||
drop type if exists dtype_test; | ||
drop domain if exists anotheruint64; | ||
create domain anotheruint64 as numeric(20,0); | ||
create type dtype_test as ( | ||
a text, | ||
b int4, | ||
c anotheruint64, | ||
d anotheruint64[] | ||
);`) | ||
require.NoError(t, err) | ||
defer conn.Exec(ctx, "drop type dtype_test") | ||
defer conn.Exec(ctx, "drop domain anotheruint64") | ||
|
||
types, err := pgx.LoadDerivedTypes(ctx, conn, []string{"dtype_test"}) | ||
require.NoError(t, err) | ||
require.Equal(t, types[0].TypeName, "anotheruint64") | ||
require.Equal(t, types[1].TypeName, "_anotheruint64") | ||
require.Equal(t, types[2].TypeName, "dtype_test") | ||
require.Len(t, types, 3) | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
package pgtype | ||
|
||
import ( | ||
"fmt" | ||
) | ||
|
||
type DerivedTypeInfo struct { | ||
Oid, Typbasetype, Typelem, Rngsubtype, Rngtypid uint32 | ||
TypeName, Typtype string | ||
Attnames []string | ||
Atttypids []uint32 | ||
} | ||
|
||
// RegisterTypes complements LoadDerivedTypes, applying the type information collected by LoadDerivedTypes | ||
// to the connection's typemap. | ||
func (m *Map) RegisterDerivedTypes(typeInfo []*DerivedTypeInfo) error { | ||
for _, ti := range typeInfo { | ||
switch ti.Typtype { | ||
case "b": // array | ||
dt, ok := m.TypeForOID(ti.Typelem) | ||
if !ok { | ||
return fmt.Errorf("Array element OID %v not registered while loading pgtype %q", ti.Typelem, ti.TypeName) | ||
} | ||
m.RegisterType(&Type{Name: ti.TypeName, OID: ti.Oid, Codec: &ArrayCodec{ElementType: dt}}) | ||
case "c": // composite | ||
var fields []CompositeCodecField | ||
for i, fieldName := range ti.Attnames { | ||
//if fieldOID64, err = strconv.ParseUint(composite_fields[i+1], 10, 32); err != nil { | ||
// return nil, fmt.Errorf("While extracting OID used in composite field: %w", err) | ||
//} | ||
dt, ok := m.TypeForOID(ti.Atttypids[i]) | ||
if !ok { | ||
return fmt.Errorf("Unknown field for composite type %q: field %q (OID %v) is not already registered.", ti.TypeName, fieldName, ti.Atttypids[i]) | ||
} | ||
fields = append(fields, CompositeCodecField{Name: fieldName, Type: dt}) | ||
} | ||
|
||
m.RegisterType(&Type{Name: ti.TypeName, OID: ti.Oid, Codec: &CompositeCodec{Fields: fields}}) | ||
case "d": // domain | ||
dt, ok := m.TypeForOID(ti.Typbasetype) | ||
if !ok { | ||
return fmt.Errorf("Domain base type OID %v was not already registered, needed for %q", ti.Typbasetype, ti.TypeName) | ||
} | ||
|
||
m.RegisterType(&Type{Name: ti.TypeName, OID: ti.Oid, Codec: dt.Codec}) | ||
case "e": // enum | ||
m.RegisterType(&Type{Name: ti.TypeName, OID: ti.Oid, Codec: &EnumCodec{}}) | ||
case "r": // range | ||
dt, ok := m.TypeForOID(ti.Rngsubtype) | ||
if !ok { | ||
return fmt.Errorf("Range element OID %v was not already registered, needed for %q", ti.Rngsubtype, ti.TypeName) | ||
} | ||
|
||
m.RegisterType(&Type{Name: ti.TypeName, OID: ti.Oid, Codec: &RangeCodec{ElementType: dt}}) | ||
case "m": // multirange | ||
dt, ok := m.TypeForOID(ti.Rngtypid) | ||
if !ok { | ||
return fmt.Errorf("Multirange element OID %v was not already registered, needed for %q", ti.Rngtypid, ti.TypeName) | ||
} | ||
|
||
m.RegisterType(&Type{Name: ti.TypeName, OID: ti.Oid, Codec: &MultirangeCodec{ElementType: dt}}) | ||
default: | ||
return fmt.Errorf("Unknown typtype %q was found while registering %q", ti.Typtype, ti.TypeName) | ||
} | ||
} | ||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
package pgtype_test | ||
|
||
import ( | ||
"context" | ||
"testing" | ||
|
||
pgx "github.com/jackc/pgx/v5" | ||
"github.com/jackc/pgx/v5/pgtype" | ||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
func TestDerivedTypes(t *testing.T) { | ||
skipCockroachDB(t, "Server does not support composite types (see https://github.com/cockroachdb/cockroach/issues/27792)") | ||
|
||
defaultConnTestRunner.RunTest(context.Background(), t, func(ctx context.Context, t testing.TB, conn *pgx.Conn) { | ||
_, err := conn.Exec(ctx, ` | ||
drop type if exists dt_test; | ||
drop domain if exists dt_uint64; | ||
create domain dt_uint64 as numeric(20,0); | ||
create type dt_test as ( | ||
a text, | ||
b dt_uint64, | ||
c dt_uint64[] | ||
);`) | ||
require.NoError(t, err) | ||
defer conn.Exec(ctx, "drop domain dt_uint64") | ||
defer conn.Exec(ctx, "drop type dt_test") | ||
|
||
dtypes, err := pgx.LoadDerivedTypes(ctx, conn, []string{"dt_test"}) | ||
require.Len(t, dtypes, 3) | ||
require.Equal(t, dtypes[0].TypeName, "dt_uint64") | ||
require.Equal(t, dtypes[1].TypeName, "_dt_uint64") | ||
require.Equal(t, dtypes[2].TypeName, "dt_test") | ||
require.NoError(t, err) | ||
err = conn.TypeMap().RegisterDerivedTypes(dtypes) | ||
require.NoError(t, err) | ||
|
||
formats := []struct { | ||
name string | ||
code int16 | ||
}{ | ||
{name: "TextFormat", code: pgx.TextFormatCode}, | ||
{name: "BinaryFormat", code: pgx.BinaryFormatCode}, | ||
} | ||
|
||
for _, format := range formats { | ||
var a string | ||
var b uint64 | ||
var c *[]uint64 | ||
|
||
row := conn.QueryRow(ctx, "select $1::dt_test", pgx.QueryResultFormats{format.code}, pgtype.CompositeFields{"hi", uint64(42), []uint64{10, 20, 30}}) | ||
err := row.Scan(pgtype.CompositeFields{&a, &b, &c}) | ||
require.NoError(t, err) | ||
require.EqualValuesf(t, "hi", a, "%v", format.name) | ||
require.EqualValuesf(t, 42, b, "%v", format.name) | ||
} | ||
}) | ||
} |
Oops, something went wrong.