Repository navigation
Commit 6ac1f1a
committed
[fix](function) Bind enclosing lambda arguments in array_sorted_merge
The merge lambda may reference an argument of an enclosing lambda, for example
array_map(x -> array_sorted_merge((a, b) -> IF(a = b AND a < x, a, NULL), l, r, true), xs).
The function executes its lambda against a block of its own, and that block's frame hides
the parent bindings, so the reference could not be resolved and the query failed with a
missing column.
Key changes:
- Collect the named lambda bindings visible at the current execution point and publish them
under their names in the one-row merge block, before the two merge arguments so that a
merge argument with the same name shadows the outer one
- Read the enclosing values at the same row as the arrays, so short-circuit evaluation and
batched lambda execution keep working
- Cover an enclosing array_map argument in test_array_sorted_merge
Unit Test:
- regression-test/suites/query_p0/sql_functions/array_functions/test_array_sorted_merge.groovy1 parent 48370fe commit 6ac1f1a
4 files changed
Lines changed: 64 additions & 3 deletions
File tree
- be/src/exprs/lambda_function
- regression-test
- data/query_p0/sql_functions/array_functions
- suites/query_p0/sql_functions/array_functions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
113 | 132 | | |
114 | 133 | | |
115 | 134 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
169 | 169 | | |
170 | 170 | | |
171 | 171 | | |
172 | | - | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
173 | 179 | | |
174 | 180 | | |
175 | 181 | | |
| |||
198 | 204 | | |
199 | 205 | | |
200 | 206 | | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
201 | 226 | | |
202 | 227 | | |
203 | 228 | | |
| |||
209 | 234 | | |
210 | 235 | | |
211 | 236 | | |
212 | | - | |
213 | | - | |
| 237 | + | |
| 238 | + | |
214 | 239 | | |
215 | 240 | | |
216 | 241 | | |
| |||
258 | 283 | | |
259 | 284 | | |
260 | 285 | | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
261 | 290 | | |
262 | 291 | | |
263 | 292 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
30 | 33 | | |
31 | 34 | | |
32 | 35 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
143 | 143 | | |
144 | 144 | | |
145 | 145 | | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
146 | 156 | | |
147 | 157 | | |
148 | 158 | | |
| |||
0 commit comments