Skip to content

release-25.2: plpgsql: move barrier after outer-join for SQL stmt with INTO clause #158344

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: release-25.2
Choose a base branch
from
Open

release-25.2: plpgsql: move barrier after outer-join for SQL stmt with INTO clause #158344

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
32 changes: 16 additions & 16 deletions pkg/sql/opt/memo/testdata/logprops/tail-calls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,22 +959,22 @@ values
├── params: x
└── body
└── project
├── left-join (cross)
│ ├── values
│ │ └── tuple
│ ├── barrier
│ │ └── limit
│ │ ├── project-set
│ │ │ ├── values
│ │ │ │ └── tuple
│ │ │ └── zip
│ │ │ └── udf: nested
│ │ │ └── body
│ │ │ └── values
│ │ │ └── tuple
│ │ │ └── const: 1
│ │ └── const: 1
│ └── filters (true)
├── barrier
│ └── left-join (cross)
│ ├── values
│ │ └── tuple
│ ├── limit
│ │ ├── project-set
│ │ │ ├── values
│ │ │ │ └── tuple
│ │ │ └── zip
│ │ │ └── udf: nested
│ │ │ └── body
│ │ │ └── values
│ │ │ └── tuple
│ │ │ └── const: 1
│ │ └── const: 1
│ └── filters (true)
└── projections
└── variable: nested

Expand Down
15 changes: 8 additions & 7 deletions pkg/sql/opt/optbuilder/plpgsql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,13 +997,6 @@ func (b *plpgsqlBuilder) buildPLpgSQLStatements(stmts []ast.Statement, s *scope)
stmtScope.makeOrderingChoice(),
)

// Add an optimization barrier in case the projected variables are never
// referenced again, to prevent column-pruning rules from dropping the
// side effects of executing the SELECT ... INTO statement.
if stmtScope.expr.Relational().VolatilitySet.HasVolatile() {
b.ob.addBarrier(stmtScope)
}

if strict {
// Check that the expression produces exactly one row.
b.addOneRowCheck(stmtScope)
Expand All @@ -1019,6 +1012,14 @@ func (b *plpgsqlBuilder) buildPLpgSQLStatements(stmts []ast.Statement, s *scope)
)
}

// Add an optimization barrier in case the projected variables are never
// referenced again, to prevent column-pruning and join-elimination rules
// from dropping the side effects of executing the SELECT ... INTO
// statement.
if stmtScope.expr.Relational().VolatilitySet.HasVolatile() {
b.ob.addBarrier(stmtScope)
}

// Step 2: build the INTO statement into a continuation routine that calls
// the previously built continuation.
intoScope := b.buildInto(stmtScope, t.Target)
Expand Down
54 changes: 27 additions & 27 deletions pkg/sql/opt/optbuilder/testdata/procedure_plpgsql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,34 +813,34 @@ call
│ │ │ │ ├── columns: "_stmt_exec_ret_2":17
│ │ │ │ ├── project
│ │ │ │ │ ├── columns: foo:16
│ │ │ │ │ ├── right-join (cross)
│ │ │ │ │ ├── barrier
│ │ │ │ │ │ ├── columns: i:7
│ │ │ │ │ │ ├── barrier
│ │ │ │ │ │ │ ├── columns: i:7!null
│ │ │ │ │ │ │ └── limit
│ │ │ │ │ │ │ ├── columns: i:7!null
│ │ │ │ │ │ │ ├── project
│ │ │ │ │ │ │ │ ├── columns: i:7!null
│ │ │ │ │ │ │ │ └── insert t
│ │ │ │ │ │ │ │ ├── columns: k:6!null i:7!null s:8!null
│ │ │ │ │ │ │ │ ├── insert-mapping:
│ │ │ │ │ │ │ │ │ ├── column1:11 => k:6
│ │ │ │ │ │ │ │ │ ├── column2:12 => i:7
│ │ │ │ │ │ │ │ │ └── column3:13 => s:8
│ │ │ │ │ │ │ │ ├── return-mapping:
│ │ │ │ │ │ │ │ │ ├── column1:11 => k:6
│ │ │ │ │ │ │ │ │ ├── column2:12 => i:7
│ │ │ │ │ │ │ │ │ └── column3:13 => s:8
│ │ │ │ │ │ │ │ └── values
│ │ │ │ │ │ │ │ ├── columns: column1:11!null column2:12!null column3:13!null
│ │ │ │ │ │ │ │ └── tuple
│ │ │ │ │ │ │ │ ├── const: 1
│ │ │ │ │ │ │ │ ├── const: 2
│ │ │ │ │ │ │ │ └── const: 'foo'
│ │ │ │ │ │ │ └── const: 1
│ │ │ │ │ │ ├── values
│ │ │ │ │ │ │ └── tuple
│ │ │ │ │ │ └── filters (true)
│ │ │ │ │ │ └── right-join (cross)
│ │ │ │ │ │ ├── columns: i:7
│ │ │ │ │ │ ├── limit
│ │ │ │ │ │ │ ├── columns: i:7!null
│ │ │ │ │ │ │ ├── project
│ │ │ │ │ │ │ │ ├── columns: i:7!null
│ │ │ │ │ │ │ │ └── insert t
│ │ │ │ │ │ │ │ ├── columns: k:6!null i:7!null s:8!null
│ │ │ │ │ │ │ │ ├── insert-mapping:
│ │ │ │ │ │ │ │ │ ├── column1:11 => k:6
│ │ │ │ │ │ │ │ │ ├── column2:12 => i:7
│ │ │ │ │ │ │ │ │ └── column3:13 => s:8
│ │ │ │ │ │ │ │ ├── return-mapping:
│ │ │ │ │ │ │ │ │ ├── column1:11 => k:6
│ │ │ │ │ │ │ │ │ ├── column2:12 => i:7
│ │ │ │ │ │ │ │ │ └── column3:13 => s:8
│ │ │ │ │ │ │ │ └── values
│ │ │ │ │ │ │ │ ├── columns: column1:11!null column2:12!null column3:13!null
│ │ │ │ │ │ │ │ └── tuple
│ │ │ │ │ │ │ │ ├── const: 1
│ │ │ │ │ │ │ │ ├── const: 2
│ │ │ │ │ │ │ │ └── const: 'foo'
│ │ │ │ │ │ │ └── const: 1
│ │ │ │ │ │ ├── values
│ │ │ │ │ │ │ └── tuple
│ │ │ │ │ │ └── filters (true)
│ │ │ │ │ └── projections
│ │ │ │ │ └── variable: i:7 [as=foo:16]
│ │ │ │ └── projections
Expand Down
Loading