Skip to content

Commit

Permalink
opt: returning clause of UPDATE ... FROM can reference hidden cols
Browse files Browse the repository at this point in the history 
This change adds the hidden columns to the outscope of a distinct
on and allows UPDATE ... FROM queries to reference hidden columns
in the RETURNING clause.

Release note: None
  • Loading branch information
Ridwan Sharif committed Aug 5, 2019
1 parent 4c6d1f5 commit 21085d2
Show file tree
Hide file tree
Showing 4 changed files with 135 additions and 60 deletions.
49 changes: 25 additions & 24 deletions pkg/sql/opt/exec/execbuilder/testdata/update_from
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,27 +184,28 @@ WHERE
RETURNING
*
----
run · ·
└── update · ·
│ table abc
│ set b, c
│ strategy updater
└── render · ·
└── distinct · ·
│ distinct on a
└── hash-join · ·
│ type inner
│ equality (a) = (a)
├── scan · ·
│ table ac@primary
│ spans ALL
└── hash-join · ·
│ type inner
│ equality (a) = (a)
│ right cols are key ·
├── scan · ·
│ table ab@primary
│ spans ALL
└── scan · ·
· table abc@primary
· spans ALL
render · ·
└── run · ·
└── update · ·
│ table abc
│ set b, c
│ strategy updater
└── render · ·
└── distinct · ·
│ distinct on a
└── hash-join · ·
│ type inner
│ equality (a) = (a)
├── scan · ·
│ table ac@primary
│ spans ALL
└── hash-join · ·
│ type inner
│ equality (a) = (a)
│ right cols are key ·
├── scan · ·
│ table ab@primary
│ spans ALL
└── scan · ·
· table abc@primary
· spans ALL
5 changes: 2 additions & 3 deletions pkg/sql/opt/optbuilder/distinct.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,9 @@ func (b *Builder) buildDistinctOn(distinctOnCols opt.ColSet, inScope *scope) (ou
outScope.cols = make([]scopeColumn, 0, len(inScope.cols))
// Add the output columns.
for i := range inScope.cols {
if !inScope.cols[i].hidden {
outScope.cols = append(outScope.cols, inScope.cols[i])
}
outScope.cols = append(outScope.cols, inScope.cols[i])
}

// Add any extra ON columns.
outScope.extraCols = make([]scopeColumn, 0, len(inScope.extraCols))
for i := range inScope.extraCols {
Expand Down
139 changes: 107 additions & 32 deletions pkg/sql/opt/optbuilder/testdata/update_from
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ update abc
│ ├── other.b:8 => abc.b:2
│ └── other.c:9 => abc.c:3
└── distinct-on
├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) other.a:7(int) other.b:8(int) other.c:9(int)
├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) other.a:7(int) other.b:8(int) other.c:9(int) rowid:10(int)
├── grouping columns: abc.a:4(int!null)
├── inner-join (hash)
│ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) other.a:7(int!null) other.b:8(int) other.c:9(int)
│ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) other.a:7(int!null) other.b:8(int) other.c:9(int) rowid:10(int!null)
│ ├── scan abc
│ │ └── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int)
│ ├── scan other
│ │ └── columns: other.a:7(int) other.b:8(int) other.c:9(int)
│ │ └── columns: other.a:7(int) other.b:8(int) other.c:9(int) rowid:10(int!null)
│ └── filters
│ └── eq [type=bool]
│ ├── variable: abc.a [type=int]
Expand All @@ -69,8 +69,10 @@ update abc
│ └── variable: other.a [type=int]
├── first-agg [type=int]
│ └── variable: other.b [type=int]
├── first-agg [type=int]
│ └── variable: other.c [type=int]
└── first-agg [type=int]
└── variable: other.c [type=int]
└── variable: rowid [type=int]

# Check if UPDATE FROM works well with RETURNING expressions that reference the FROM tables.
opt
Expand Down Expand Up @@ -233,33 +235,33 @@ update abc
│ ├── ab.b:8 => abc.b:2
│ └── ac.c:11 => abc.c:3
└── distinct-on
├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int) ab.b:8(int) ac.a:10(int) ac.c:11(int)
├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int) ab.b:8(int) ab.rowid:9(int) ac.a:10(int) ac.c:11(int) ac.rowid:12(int)
├── grouping columns: abc.a:4(int!null)
├── internal-ordering: +(4|7|10)
├── inner-join (merge)
│ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int!null) ab.b:8(int) ac.a:10(int!null) ac.c:11(int)
│ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int!null) ab.b:8(int) ab.rowid:9(int!null) ac.a:10(int!null) ac.c:11(int) ac.rowid:12(int!null)
│ ├── left ordering: +4
│ ├── right ordering: +7
│ ├── ordering: +(4|7|10)
│ ├── inner-join (merge)
│ │ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ac.a:10(int!null) ac.c:11(int)
│ │ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ac.a:10(int!null) ac.c:11(int) ac.rowid:12(int!null)
│ │ ├── left ordering: +4
│ │ ├── right ordering: +10
│ │ ├── ordering: +(4|10)
│ │ ├── scan abc
│ │ │ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int)
│ │ │ └── ordering: +4
│ │ ├── sort
│ │ │ ├── columns: ac.a:10(int) ac.c:11(int)
│ │ │ ├── columns: ac.a:10(int) ac.c:11(int) ac.rowid:12(int!null)
│ │ │ ├── ordering: +10
│ │ │ └── scan ac
│ │ │ └── columns: ac.a:10(int) ac.c:11(int)
│ │ │ └── columns: ac.a:10(int) ac.c:11(int) ac.rowid:12(int!null)
│ │ └── filters (true)
│ ├── sort
│ │ ├── columns: ab.a:7(int) ab.b:8(int)
│ │ ├── columns: ab.a:7(int) ab.b:8(int) ab.rowid:9(int!null)
│ │ ├── ordering: +7
│ │ └── scan ab
│ │ └── columns: ab.a:7(int) ab.b:8(int)
│ │ └── columns: ab.a:7(int) ab.b:8(int) ab.rowid:9(int!null)
│ └── filters (true)
└── aggregations
├── first-agg [type=int]
Expand All @@ -271,9 +273,13 @@ update abc
├── first-agg [type=int]
│ └── variable: ab.b [type=int]
├── first-agg [type=int]
│ └── variable: ab.rowid [type=int]
├── first-agg [type=int]
│ └── variable: ac.a [type=int]
├── first-agg [type=int]
│ └── variable: ac.c [type=int]
└── first-agg [type=int]
└── variable: ac.c [type=int]
└── variable: ac.rowid [type=int]

# Make sure UPDATE ... FROM works with LATERAL.
opt
Expand All @@ -288,33 +294,98 @@ WHERE
RETURNING
*
----
update abc
project
├── columns: a:1(int!null) b:2(int) c:3(int) a:7(int) b:8(int) a:10(int) c:11(int)
└── update abc
├── columns: abc.a:1(int!null) abc.b:2(int) abc.c:3(int) ab.a:7(int) ab.b:8(int) ab.rowid:9(int) ac.a:10(int) ac.c:11(int)
├── fetch columns: abc.a:4(int) abc.b:5(int) abc.c:6(int)
├── update-mapping:
│ ├── ab.b:8 => abc.b:2
│ └── ac.c:11 => abc.c:3
└── distinct-on
├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int) ab.b:8(int) ab.rowid:9(int) ac.a:10(int) ac.c:11(int)
├── grouping columns: abc.a:4(int!null)
├── inner-join (hash)
│ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int!null) ab.b:8(int) ab.rowid:9(int!null) ac.a:10(int!null) ac.c:11(int)
│ ├── scan ac
│ │ └── columns: ac.a:10(int) ac.c:11(int)
│ ├── inner-join (hash)
│ │ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int!null) ab.b:8(int) ab.rowid:9(int!null)
│ │ ├── scan ab
│ │ │ └── columns: ab.a:7(int) ab.b:8(int) ab.rowid:9(int!null)
│ │ ├── scan abc
│ │ │ └── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int)
│ │ └── filters
│ │ └── eq [type=bool]
│ │ ├── variable: abc.a [type=int]
│ │ └── variable: ab.a [type=int]
│ └── filters
│ └── eq [type=bool]
│ ├── variable: ab.a [type=int]
│ └── variable: ac.a [type=int]
└── aggregations
├── first-agg [type=int]
│ └── variable: abc.b [type=int]
├── first-agg [type=int]
│ └── variable: abc.c [type=int]
├── first-agg [type=int]
│ └── variable: ab.a [type=int]
├── first-agg [type=int]
│ └── variable: ab.b [type=int]
├── first-agg [type=int]
│ └── variable: ab.rowid [type=int]
├── first-agg [type=int]
│ └── variable: ac.a [type=int]
└── first-agg [type=int]
└── variable: ac.c [type=int]

# Make sure UPDATE ... FROM can return hidden columns.
opt
UPDATE abc
SET
b=ab.b, c = ac.c
FROM
ab, ac
WHERE
abc.a=ab.a AND abc.a = ac.a
RETURNING
*, ab.rowid, ac.rowid
----
update abc
├── columns: a:1(int!null) b:2(int) c:3(int) a:7(int) b:8(int) a:10(int) c:11(int) rowid:9(int) rowid:12(int)
├── fetch columns: abc.a:4(int) abc.b:5(int) abc.c:6(int)
├── update-mapping:
│ ├── ab.b:8 => abc.b:2
│ └── ac.c:11 => abc.c:3
└── distinct-on
├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int) ab.b:8(int) ac.a:10(int) ac.c:11(int)
├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int) ab.b:8(int) ab.rowid:9(int) ac.a:10(int) ac.c:11(int) ac.rowid:12(int)
├── grouping columns: abc.a:4(int!null)
├── inner-join (hash)
│ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int!null) ab.b:8(int) ac.a:10(int!null) ac.c:11(int)
│ ├── scan ac
│ │ └── columns: ac.a:10(int) ac.c:11(int)
│ ├── inner-join (hash)
│ │ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int!null) ab.b:8(int)
│ │ ├── scan ab
│ │ │ └── columns: ab.a:7(int) ab.b:8(int)
├── internal-ordering: +(4|7|10)
├── inner-join (merge)
│ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ab.a:7(int!null) ab.b:8(int) ab.rowid:9(int!null) ac.a:10(int!null) ac.c:11(int) ac.rowid:12(int!null)
│ ├── left ordering: +4
│ ├── right ordering: +7
│ ├── ordering: +(4|7|10)
│ ├── inner-join (merge)
│ │ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int) ac.a:10(int!null) ac.c:11(int) ac.rowid:12(int!null)
│ │ ├── left ordering: +4
│ │ ├── right ordering: +10
│ │ ├── ordering: +(4|10)
│ │ ├── scan abc
│ │ │ └── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int)
│ │ └── filters
│ │ └── eq [type=bool]
│ │ ├── variable: abc.a [type=int]
│ │ └── variable: ab.a [type=int]
│ └── filters
│ └── eq [type=bool]
│ ├── variable: ab.a [type=int]
│ └── variable: ac.a [type=int]
│ │ │ ├── columns: abc.a:4(int!null) abc.b:5(int) abc.c:6(int)
│ │ │ └── ordering: +4
│ │ ├── sort
│ │ │ ├── columns: ac.a:10(int) ac.c:11(int) ac.rowid:12(int!null)
│ │ │ ├── ordering: +10
│ │ │ └── scan ac
│ │ │ └── columns: ac.a:10(int) ac.c:11(int) ac.rowid:12(int!null)
│ │ └── filters (true)
│ ├── sort
│ │ ├── columns: ab.a:7(int) ab.b:8(int) ab.rowid:9(int!null)
│ │ ├── ordering: +7
│ │ └── scan ab
│ │ └── columns: ab.a:7(int) ab.b:8(int) ab.rowid:9(int!null)
│ └── filters (true)
└── aggregations
├── first-agg [type=int]
│ └── variable: abc.b [type=int]
Expand All @@ -325,6 +396,10 @@ update abc
├── first-agg [type=int]
│ └── variable: ab.b [type=int]
├── first-agg [type=int]
│ └── variable: ab.rowid [type=int]
├── first-agg [type=int]
│ └── variable: ac.a [type=int]
├── first-agg [type=int]
│ └── variable: ac.c [type=int]
└── first-agg [type=int]
└── variable: ac.c [type=int]
└── variable: ac.rowid [type=int]
2 changes: 1 addition & 1 deletion pkg/sql/opt/optbuilder/update.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ func (mb *mutationBuilder) buildUpdate(returning tree.ReturningExprs) {

private := mb.makeMutationPrivate(returning != nil)
for _, col := range mb.extraAccessibleCols {
if col.id != 0 && !col.hidden {
if col.id != 0 {
private.PassthroughCols = append(private.PassthroughCols, col.id)
}
}
Expand Down

0 comments on commit 21085d2

Please sign in to comment.