Skip to content

optbuilder: preserve ORDER BY in set-returning UDFs with OUT parameters #158162

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+62 −0
Open

optbuilder: preserve ORDER BY in set-returning UDFs with OUT parameters #158162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 60 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/udf_setof
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,3 +325,63 @@ statement ok
DROP FUNCTION f145414;

subtest end

# Test that ORDER BY is preserved in SQL UDFs with OUT parameters
subtest out_params_ordering

statement ok
CREATE TABLE test_ordering (x INT PRIMARY KEY, y INT);

statement ok
INSERT INTO test_ordering VALUES (1, 10), (2, 20), (3, 30), (4, 40);

statement ok
CREATE FUNCTION f_out_desc(OUT a INT, OUT b INT) RETURNS SETOF RECORD AS $$
SELECT x, y FROM test_ordering ORDER BY x DESC;
$$ LANGUAGE SQL;

query T nosort
SELECT f_out_desc();
----
(4,40)
(3,30)
(2,20)
(1,10)

query II nosort
SELECT * FROM f_out_desc();
----
4 40
3 30
2 20
1 10

statement ok
DROP FUNCTION f_out_desc;

statement ok
CREATE FUNCTION f_out_asc(OUT a INT, OUT b INT) RETURNS SETOF RECORD AS $$
SELECT x, y FROM test_ordering ORDER BY x ASC;
$$ LANGUAGE SQL;

query T nosort
SELECT f_out_asc();
----
(1,10)
(2,20)
(3,30)
(4,40)

query II nosort
SELECT * FROM f_out_asc();
----
1 10
2 20
3 30
4 40

statement ok
DROP FUNCTION f_out_asc;
DROP TABLE test_ordering;

subtest end
2 changes: 2 additions & 0 deletions pkg/sql/opt/optbuilder/routine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,7 @@ func (b *Builder) finalizeRoutineReturnType(
// into a single tuple column.
func (b *Builder) combineRoutineColsIntoTuple(stmtScope *scope) *scope {
outScope := stmtScope.push()
outScope.copyOrdering(stmtScope)
elems := make(memo.ScalarListExpr, len(stmtScope.cols))
typContents := make([]*types.T, len(stmtScope.cols))
for i := range stmtScope.cols {
Expand Down Expand Up @@ -721,6 +722,7 @@ func (b *Builder) maybeAddRoutineAssignmentCasts(
return stmtScope
}
outScope := stmtScope.push()
outScope.copyOrdering(stmtScope)
for i, col := range stmtScope.cols {
scalar := b.factory.ConstructVariable(col.id)
if !col.typ.Identical(desiredTypes[i]) {
Expand Down
Loading