Commit 9f6be88
[SPARK-43199][SQL] Make InlineCTE idempotent
### What changes were proposed in this pull request?
This PR fixes `InlineCTE`'s idempotence. E.g. the following query:
```
WITH
x(r) AS (SELECT random()),
y(r) AS (SELECT * FROM x),
z(r) AS (SELECT * FROM x)
SELECT * FROM z
```
currently breaks it because we take into account the reference to `x` from `y` when deciding about not inlining `x` in the first round:
```
=== Applying Rule org.apache.spark.sql.catalyst.optimizer.InlineCTE ===
WithCTE WithCTE
:- CTERelationDef 0, false :- CTERelationDef 0, false
: +- Project [rand()apache#218 AS r#219] : +- Project [rand()apache#218 AS r#219]
: +- Project [random(2957388522017368375) AS rand()apache#218] : +- Project [random(2957388522017368375) AS rand()apache#218]
: +- OneRowRelation : +- OneRowRelation
!:- CTERelationDef 1, false +- Project [r#222]
!: +- Project [r#219 AS r#221] +- Project [r#220 AS r#222]
!: +- Project [r#219] +- Project [r#220]
!: +- CTERelationRef 0, true, [r#219] +- CTERelationRef 0, true, [r#220]
!:- CTERelationDef 2, false
!: +- Project [r#220 AS r#222]
!: +- Project [r#220]
!: +- CTERelationRef 0, true, [r#220]
!+- Project [r#222]
! +- CTERelationRef 2, true, [r#222]
```
But in the next round we inline `x` because `y` was removed due to lack of references:
```
Once strategy's idempotence is broken for batch Inline CTE
!WithCTE Project [r#222]
!:- CTERelationDef 0, false +- Project [r#220 AS r#222]
!: +- Project [rand()apache#218 AS r#219] +- Project [r#220]
!: +- Project [random(2957388522017368375) AS rand()apache#218] +- Project [r#225 AS r#220]
!: +- OneRowRelation +- Project [rand()apache#218 AS r#225]
!+- Project [r#222] +- Project [random(2957388522017368375) AS rand()apache#218]
! +- Project [r#220 AS r#222] +- OneRowRelation
! +- Project [r#220]
! +- CTERelationRef 0, true, [r#220]
```
### Why are the changes needed?
We use `InlineCTE` as an idempotent rule in the `Optimizer`, `CheckAnalysis` and `ProgressReporter`.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Added new UT.
Closes apache#40856 from peter-toth/SPARK-43199-make-inlinecte-idempotent.
Authored-by: Peter Toth <peter.toth@gmail.com>
Signed-off-by: Wenchen Fan <wenchen@databricks.com>1 parent 9489513 commit 9f6be88
File tree
3 files changed
+77
-24
lines changed- sql
- catalyst/src/main/scala/org/apache/spark/sql/catalyst
- analysis
- optimizer
- core/src/test/scala/org/apache/spark/sql
3 files changed
+77
-24
lines changedLines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
148 | | - | |
| 148 | + | |
149 | 149 | | |
150 | | - | |
| 150 | + | |
151 | 151 | | |
152 | 152 | | |
153 | 153 | | |
| |||
Lines changed: 64 additions & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| |||
68 | 69 | | |
69 | 70 | | |
70 | 71 | | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
71 | 85 | | |
72 | 86 | | |
73 | | - | |
| 87 | + | |
| 88 | + | |
74 | 89 | | |
75 | | - | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
76 | 94 | | |
77 | | - | |
| 95 | + | |
78 | 96 | | |
| 97 | + | |
79 | 98 | | |
80 | 99 | | |
81 | | - | |
82 | | - | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
83 | 106 | | |
84 | 107 | | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
91 | 112 | | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
98 | 120 | | |
99 | 121 | | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
100 | 142 | | |
101 | 143 | | |
102 | 144 | | |
103 | 145 | | |
104 | 146 | | |
105 | 147 | | |
106 | | - | |
| 148 | + | |
107 | 149 | | |
108 | 150 | | |
109 | 151 | | |
110 | 152 | | |
111 | | - | |
| 153 | + | |
112 | 154 | | |
113 | 155 | | |
114 | | - | |
| 156 | + | |
115 | 157 | | |
116 | 158 | | |
117 | 159 | | |
| |||
120 | 162 | | |
121 | 163 | | |
122 | 164 | | |
123 | | - | |
| 165 | + | |
124 | 166 | | |
125 | 167 | | |
126 | 168 | | |
| |||
Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4648 | 4648 | | |
4649 | 4649 | | |
4650 | 4650 | | |
| 4651 | + | |
| 4652 | + | |
| 4653 | + | |
| 4654 | + | |
| 4655 | + | |
| 4656 | + | |
| 4657 | + | |
| 4658 | + | |
| 4659 | + | |
| 4660 | + | |
| 4661 | + | |
4651 | 4662 | | |
4652 | 4663 | | |
4653 | 4664 | | |
0 commit comments