Repository navigation
Commit fe161ea
committed
Fix natural-month subtraction in date expressions
A date expression such as `2024-03-15 - 1mo` computed the length of the
month after the given time and subtracted it, giving 2024-02-13 instead
of 2024-02-15 (and `2024-03-31 - 1mo` gave 2024-03-01).
Apply the subtracted duration backwards from the original time, so that
`- Nmo` goes back N calendar months the same way `+ Nmo` goes forward.
This affects both the tree and table date-expression parsers. Addition,
other units, and the context-free duration path are unchanged.
Fixes #192101 parent a4568b6 commit fe161ea
4 files changed
Lines changed: 113 additions & 20 deletions
File tree
- iotdb-core/datanode/src
- main/java/org/apache/iotdb/db
- queryengine/plan
- parser
- relational/sql/parser
- utils
- test/java/org/apache/iotdb/db/utils
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3677 | 3677 | | |
3678 | 3678 | | |
3679 | 3679 | | |
3680 | | - | |
| 3680 | + | |
| 3681 | + | |
3681 | 3682 | | |
3682 | | - | |
3683 | | - | |
3684 | | - | |
3685 | | - | |
3686 | | - | |
| 3683 | + | |
| 3684 | + | |
| 3685 | + | |
| 3686 | + | |
| 3687 | + | |
| 3688 | + | |
3687 | 3689 | | |
3688 | 3690 | | |
3689 | 3691 | | |
| |||
3699 | 3701 | | |
3700 | 3702 | | |
3701 | 3703 | | |
3702 | | - | |
| 3704 | + | |
| 3705 | + | |
3703 | 3706 | | |
3704 | | - | |
3705 | | - | |
3706 | | - | |
3707 | | - | |
3708 | | - | |
| 3707 | + | |
| 3708 | + | |
3709 | 3709 | | |
3710 | 3710 | | |
3711 | 3711 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3566 | 3566 | | |
3567 | 3567 | | |
3568 | 3568 | | |
3569 | | - | |
| 3569 | + | |
| 3570 | + | |
3570 | 3571 | | |
3571 | | - | |
3572 | | - | |
3573 | | - | |
3574 | | - | |
3575 | | - | |
| 3572 | + | |
| 3573 | + | |
3576 | 3574 | | |
3577 | 3575 | | |
3578 | 3576 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
164 | 164 | | |
165 | 165 | | |
166 | 166 | | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
167 | 183 | | |
168 | 184 | | |
169 | 185 | | |
| |||
188 | 204 | | |
189 | 205 | | |
190 | 206 | | |
191 | | - | |
| 207 | + | |
192 | 208 | | |
193 | 209 | | |
194 | 210 | | |
| |||
203 | 219 | | |
204 | 220 | | |
205 | 221 | | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
206 | 227 | | |
207 | 228 | | |
208 | 229 | | |
209 | 230 | | |
210 | | - | |
| 231 | + | |
| 232 | + | |
211 | 233 | | |
212 | 234 | | |
213 | 235 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
| 27 | + | |
26 | 28 | | |
27 | 29 | | |
28 | 30 | | |
29 | 31 | | |
30 | 32 | | |
31 | 33 | | |
| 34 | + | |
32 | 35 | | |
33 | 36 | | |
34 | 37 | | |
| |||
260 | 263 | | |
261 | 264 | | |
262 | 265 | | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
263 | 336 | | |
264 | 337 | | |
265 | 338 | | |
| |||
0 commit comments