Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

delegate: simplify / speed up SHOW FUNCTIONS; redefine several pg builtins as UDFs; fix pg_proc virtual index #94771

Merged
merged 3 commits into from
Jan 15, 2023
Merged

delegate: simplify / speed up SHOW FUNCTIONS; redefine several pg builtins as UDFs; fix pg_proc virtual index #94771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a03f609
sql: fix pg_proc virtual oid index
jordanlewis Jan 6, 2023
095fbdc
delegate: simplify / speed up SHOW FUNCTIONS
jordanlewis Jan 5, 2023
ebe2686
builtins: rewrite several builtins as UDFs
jordanlewis Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkg/sql/delegate/show_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ func (d *delegator) delegateShowFunctions(n *tree.ShowFunctions) (tree.Statement
const getFunctionsQuery = `
SELECT n.nspname as schema_name,
p.proname as function_name,
pg_catalog.pg_get_function_result(p.oid) as result_data_type,
pg_catalog.pg_get_function_identity_arguments(p.oid) as argument_data_types,
p.prorettype::REGTYPE::TEXT as result_data_type,
COALESCE((SELECT trim('{}' FROM replace(array_agg(unnest(proargtypes)::REGTYPE::TEXT)::TEXT, ',', ', '))), '') as argument_data_types,
CASE p.prokind
WHEN 'a' THEN 'agg'
WHEN 'w' THEN 'window'
Expand All @@ -72,6 +72,7 @@ FROM %[1]s.pg_catalog.pg_proc p
LEFT JOIN %[1]s.pg_catalog.pg_namespace n ON n.oid = p.pronamespace
WHERE true
%[2]s
GROUP BY 1, 2, 3, proargtypes, 5, 6
ORDER BY 1, 2, 4;
`
query := fmt.Sprintf(
Expand Down
41 changes: 36 additions & 5 deletions pkg/sql/logictest/testdata/logic_test/pg_builtins
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,26 @@ NULL
statement ok
CREATE TABLE is_visible(a int primary key);
CREATE TYPE visible_type AS ENUM('a');
CREATE FUNCTION visible_func() RETURNS INT LANGUAGE SQL AS $$ SELECT 1 $$;
CREATE SCHEMA other;
CREATE TABLE other.not_visible(a int primary key);
CREATE TYPE other.not_visible_type AS ENUM('b');
CREATE FUNCTION other.not_visible_func() RETURNS INT LANGUAGE SQL AS $$ SELECT 1 $$;
CREATE DATABASE db2;
SET DATABASE = db2;
CREATE TABLE table_in_db2(a int primary key);
CREATE TYPE type_in_db2 AS ENUM('c');
CREATE FUNCTION func_in_db2() RETURNS INT LANGUAGE SQL AS $$ SELECT 1 $$;

let $table_in_db2_id
SELECT c.oid FROM pg_class c WHERE c.relname = 'table_in_db2';

let $type_in_db2_id
SELECT t.oid FROM pg_type t WHERE t.typname = 'type_in_db2';

let $func_in_db2_id
SELECT p.oid FROM pg_proc p WHERE p.proname = 'func_in_db2';

statement ok
SET DATABASE = test;

Expand Down Expand Up @@ -150,6 +156,31 @@ SELECT pg_type_is_visible(NULL)
----
NULL

query TB rowsort
SELECT p.proname, pg_function_is_visible(p.oid)
FROM pg_proc p
WHERE p.proname IN ('array_length', 'visible_func', 'not_visible_func')
----
array_length true
visible_func true
not_visible_func false

# Looking up a function in a different database should return NULL.
query B
SELECT pg_function_is_visible($func_in_db2_id)
----
NULL

# Looking up a non-existent OID should return NULL.
query B
SELECT pg_function_is_visible(1010101010)
----
NULL

query B
SELECT pg_function_is_visible(NULL)
----
NULL

query TT
SELECT pg_get_partkeydef(1), pg_get_partkeydef(NULL)
Expand All @@ -174,11 +205,11 @@ WHERE c.relname IN ('is_updatable', 'is_updatable_view', 'pg_class')
ORDER BY c.oid, a.attnum
----
relname attname oid attnum pg_relation_is_updatable pg_column_is_updatable
is_updatable a 120 1 28 true
is_updatable b 120 2 28 true
is_updatable c 120 3 28 false
is_updatable_view a 121 1 0 false
is_updatable_view b 121 2 0 false
is_updatable a 123 1 28 true
is_updatable b 123 2 28 true
is_updatable c 123 3 28 false
is_updatable_view a 124 1 0 false
is_updatable_view b 124 2 0 false
pg_class oid 4294967117 1 0 false
pg_class relname 4294967117 2 0 false
pg_class relnamespace 4294967117 3 0 false
Expand Down
7 changes: 7 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/udf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,13 @@ FROM pg_catalog.pg_proc WHERE proname IN ('proc_f', 'proc_f_2');
100119 proc_f 105 1546506610 14 true true false i 2 25 25 20 {i,i} {"",b} SELECT 'hello';
100121 proc_f_2 120 1546506610 14 false false false v 1 25 25 {i} NULL SELECT 'hello';

# Ensure that the pg_proc virtual index works properly.

query TT
SELECT oid, proname FROM pg_proc WHERE oid = 'sc.proc_f_2'::regproc
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: force the index with pg_proc@pg_proc_oid_idx

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't force virtual indexes - the optimizer gives an error.

----
100121 proc_f_2

statement ok
USE defaultdb;

Expand Down
315 changes: 192 additions & 123 deletions pkg/sql/opt/xform/testdata/external/liquibase
View file
Open in desktop

Large diffs are not rendered by default.

321 changes: 195 additions & 126 deletions pkg/sql/opt/xform/testdata/external/navicat
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 14 additions & 11 deletions pkg/sql/pg_catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2575,21 +2575,16 @@ https://www.postgresql.org/docs/9.5/catalog-pg-proc.html`,
coid := tree.MustBeDOid(unwrappedConstraint)
ooid := coid.Oid

name, overload, err := p.ResolveFunctionByOID(ctx, ooid)
if err != nil {
if errors.Is(err, tree.ErrFunctionUndefined) {
return false, nil //nolint:returnerrcheck
}
return false, err
}

if funcdesc.IsOIDUserDefinedFunc(ooid) {
fnDesc, err := p.Descriptors().ByID(p.Txn()).WithoutNonPublic().Get().Function(ctx, descpb.ID(overload.Oid))
fnDesc, err := p.Descriptors().ByID(p.Txn()).WithoutNonPublic().Get().Function(ctx, funcdesc.UserDefinedFunctionOIDToID(ooid))
if err != nil {
if errors.Is(err, tree.ErrFunctionUndefined) {
return false, nil //nolint:returnerrcheck
}
return false, err
}

scDesc, err := p.Descriptors().ByIDWithLeased(p.Txn()).WithoutNonPublic().Get().Schema(ctx, descpb.ID(ooid))
scDesc, err := p.Descriptors().ByIDWithLeased(p.Txn()).WithoutNonPublic().Get().Schema(ctx, fnDesc.GetParentSchemaID())
if err != nil {
return false, err
}
Expand All @@ -2604,7 +2599,15 @@ https://www.postgresql.org/docs/9.5/catalog-pg-proc.html`,
return true, nil

} else {
err := addPgProcBuiltinRow(name, addRow)
name, _, err := p.ResolveFunctionByOID(ctx, ooid)
if err != nil {
if errors.Is(err, tree.ErrFunctionUndefined) {
return false, nil //nolint:returnerrcheck
}
return false, err
}

err = addPgProcBuiltinRow(name, addRow)
if err != nil {
return false, err
}
Expand Down
1 change: 1 addition & 0 deletions pkg/sql/sem/builtins/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ go_library(
"//pkg/sql/lex",
"//pkg/sql/lexbase",
"//pkg/sql/memsize",
"//pkg/sql/oidext",
"//pkg/sql/parser",
"//pkg/sql/pgwire/pgcode",
"//pkg/sql/pgwire/pgerror",
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/sem/builtins/fixed_oids.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1397,7 +1397,7 @@ var builtinOidsArray = []string{
1417: `pg_typeof(val: anyelement) -> string`,
1418: `pg_collation_for(str: anyelement) -> string`,
1419: `pg_get_userbyid(role_oid: oid) -> string`,
1420: `pg_sequence_parameters(sequence_oid: oid) -> string`,
1420: `pg_sequence_parameters(sequence_oid: oid) -> tuple{int AS start_value, int AS minimum_value, int AS maxmimum_value, int AS increment, bool AS cycle_option, int AS cache_size, oid AS data_type}`,
1421: `format_type(type_oid: oid, typemod: int) -> string`,
1422: `col_description(table_oid: oid, column_number: int) -> string`,
1423: `obj_description(object_oid: oid) -> string`,
Expand Down
Loading