Repository navigation
Commit 0a0ef51
committed
fix(cypher): parse and apply the full multi-key ORDER BY list, keeping LIMIT (DeusData#1334)
The Cypher request model stored a single order_by expression; on
ORDER BY key1 DESC, key2 ASC LIMIT n the parser consumed only key1,
left ', key2 ... LIMIT n' unparsed, and the query silently returned the
entire result set (6326 rows / 117 KB instead of 5 on the reporter's
graph - a token flood straight into agent context).
The return clause now models up to CBM_CYPHER_ORDER_KEYS_MAX (8) sort
keys with per-key direction (Cypher semantics). Both sort sites -
rb_apply_order_by for RETURN and sort_bindings for the WITH pipeline -
compare key-by-key with later keys breaking ties. More keys than the
modeled maximum is a loud parse error, never a silently dropped
remainder. The no-ORDER-BY projection fast path is preserved via
order_key_count == 0.
Tests: parse-level (2 keys, per-key direction, LIMIT consumed;
9-key over-cap rejected), exec-level RETURN (limit kept, tiebreak
ordering, per-key direction), and exec-level WITH pipeline (limit kept).
All RED before the fix (row_count 4 instead of 2), GREEN after.
Recorded, pre-existing and unchanged: an ORDER BY key that is not part
of the projection is silently skipped (single-key main behaves the
same); sorting by unprojected properties needs hidden-column projection
and is a separate issue.
Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>1 parent ae5e9e4 commit 0a0ef51
3 files changed
Lines changed: 204 additions & 52 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1655 | 1655 | | |
1656 | 1656 | | |
1657 | 1657 | | |
1658 | | - | |
1659 | 1658 | | |
1660 | 1659 | | |
1661 | 1660 | | |
| |||
1696 | 1695 | | |
1697 | 1696 | | |
1698 | 1697 | | |
1699 | | - | |
| 1698 | + | |
| 1699 | + | |
| 1700 | + | |
| 1701 | + | |
| 1702 | + | |
1700 | 1703 | | |
1701 | | - | |
1702 | | - | |
1703 | | - | |
1704 | | - | |
1705 | | - | |
1706 | | - | |
1707 | | - | |
1708 | | - | |
| 1704 | + | |
| 1705 | + | |
| 1706 | + | |
| 1707 | + | |
| 1708 | + | |
| 1709 | + | |
| 1710 | + | |
| 1711 | + | |
| 1712 | + | |
| 1713 | + | |
| 1714 | + | |
| 1715 | + | |
| 1716 | + | |
| 1717 | + | |
| 1718 | + | |
| 1719 | + | |
| 1720 | + | |
1709 | 1721 | | |
1710 | 1722 | | |
1711 | 1723 | | |
| |||
1767 | 1779 | | |
1768 | 1780 | | |
1769 | 1781 | | |
1770 | | - | |
| 1782 | + | |
| 1783 | + | |
| 1784 | + | |
| 1785 | + | |
| 1786 | + | |
| 1787 | + | |
| 1788 | + | |
| 1789 | + | |
1771 | 1790 | | |
1772 | 1791 | | |
1773 | 1792 | | |
| |||
2100 | 2119 | | |
2101 | 2120 | | |
2102 | 2121 | | |
2103 | | - | |
2104 | | - | |
| 2122 | + | |
| 2123 | + | |
| 2124 | + | |
2105 | 2125 | | |
2106 | 2126 | | |
2107 | 2127 | | |
| |||
3308 | 3328 | | |
3309 | 3329 | | |
3310 | 3330 | | |
3311 | | - | |
3312 | | - | |
3313 | | - | |
| 3331 | + | |
| 3332 | + | |
| 3333 | + | |
| 3334 | + | |
3314 | 3335 | | |
3315 | | - | |
| 3336 | + | |
3316 | 3337 | | |
3317 | 3338 | | |
3318 | 3339 | | |
3319 | 3340 | | |
3320 | | - | |
| 3341 | + | |
3321 | 3342 | | |
3322 | 3343 | | |
3323 | 3344 | | |
| |||
3345 | 3366 | | |
3346 | 3367 | | |
3347 | 3368 | | |
3348 | | - | |
| 3369 | + | |
3349 | 3370 | | |
3350 | 3371 | | |
3351 | | - | |
3352 | | - | |
| 3372 | + | |
| 3373 | + | |
| 3374 | + | |
| 3375 | + | |
| 3376 | + | |
| 3377 | + | |
| 3378 | + | |
| 3379 | + | |
| 3380 | + | |
| 3381 | + | |
| 3382 | + | |
| 3383 | + | |
| 3384 | + | |
| 3385 | + | |
| 3386 | + | |
| 3387 | + | |
| 3388 | + | |
| 3389 | + | |
3353 | 3390 | | |
3354 | 3391 | | |
3355 | | - | |
3356 | | - | |
3357 | | - | |
3358 | 3392 | | |
3359 | 3393 | | |
3360 | | - | |
3361 | | - | |
3362 | | - | |
3363 | | - | |
3364 | | - | |
3365 | | - | |
| 3394 | + | |
| 3395 | + | |
| 3396 | + | |
| 3397 | + | |
| 3398 | + | |
| 3399 | + | |
| 3400 | + | |
| 3401 | + | |
| 3402 | + | |
| 3403 | + | |
| 3404 | + | |
3366 | 3405 | | |
3367 | | - | |
| 3406 | + | |
3368 | 3407 | | |
3369 | 3408 | | |
3370 | 3409 | | |
| |||
3674 | 3713 | | |
3675 | 3714 | | |
3676 | 3715 | | |
3677 | | - | |
3678 | | - | |
| 3716 | + | |
| 3717 | + | |
| 3718 | + | |
3679 | 3719 | | |
3680 | 3720 | | |
3681 | | - | |
3682 | | - | |
3683 | | - | |
3684 | | - | |
3685 | | - | |
3686 | | - | |
3687 | | - | |
3688 | | - | |
| 3721 | + | |
| 3722 | + | |
| 3723 | + | |
| 3724 | + | |
| 3725 | + | |
| 3726 | + | |
| 3727 | + | |
| 3728 | + | |
| 3729 | + | |
| 3730 | + | |
| 3731 | + | |
| 3732 | + | |
| 3733 | + | |
| 3734 | + | |
| 3735 | + | |
3689 | 3736 | | |
3690 | 3737 | | |
3691 | 3738 | | |
| |||
3718 | 3765 | | |
3719 | 3766 | | |
3720 | 3767 | | |
3721 | | - | |
3722 | | - | |
3723 | | - | |
| 3768 | + | |
| 3769 | + | |
3724 | 3770 | | |
3725 | 3771 | | |
3726 | 3772 | | |
| |||
4390 | 4436 | | |
4391 | 4437 | | |
4392 | 4438 | | |
4393 | | - | |
| 4439 | + | |
4394 | 4440 | | |
4395 | 4441 | | |
4396 | 4442 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
262 | 262 | | |
263 | 263 | | |
264 | 264 | | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
265 | 270 | | |
266 | 271 | | |
267 | 272 | | |
268 | 273 | | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
273 | | - | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
274 | 282 | | |
275 | 283 | | |
276 | 284 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
378 | 378 | | |
379 | 379 | | |
380 | 380 | | |
381 | | - | |
382 | | - | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
383 | 384 | | |
384 | 385 | | |
385 | 386 | | |
386 | 387 | | |
387 | 388 | | |
388 | 389 | | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
389 | 423 | | |
390 | 424 | | |
391 | 425 | | |
| |||
2648 | 2682 | | |
2649 | 2683 | | |
2650 | 2684 | | |
| 2685 | + | |
| 2686 | + | |
| 2687 | + | |
| 2688 | + | |
| 2689 | + | |
| 2690 | + | |
| 2691 | + | |
| 2692 | + | |
| 2693 | + | |
| 2694 | + | |
| 2695 | + | |
| 2696 | + | |
| 2697 | + | |
| 2698 | + | |
| 2699 | + | |
| 2700 | + | |
| 2701 | + | |
| 2702 | + | |
| 2703 | + | |
| 2704 | + | |
| 2705 | + | |
| 2706 | + | |
| 2707 | + | |
| 2708 | + | |
| 2709 | + | |
| 2710 | + | |
| 2711 | + | |
| 2712 | + | |
| 2713 | + | |
| 2714 | + | |
| 2715 | + | |
| 2716 | + | |
| 2717 | + | |
| 2718 | + | |
| 2719 | + | |
| 2720 | + | |
| 2721 | + | |
| 2722 | + | |
| 2723 | + | |
| 2724 | + | |
| 2725 | + | |
| 2726 | + | |
| 2727 | + | |
| 2728 | + | |
| 2729 | + | |
| 2730 | + | |
| 2731 | + | |
| 2732 | + | |
| 2733 | + | |
| 2734 | + | |
| 2735 | + | |
| 2736 | + | |
| 2737 | + | |
| 2738 | + | |
| 2739 | + | |
| 2740 | + | |
| 2741 | + | |
| 2742 | + | |
| 2743 | + | |
2651 | 2744 | | |
2652 | 2745 | | |
2653 | 2746 | | |
| |||
3563 | 3656 | | |
3564 | 3657 | | |
3565 | 3658 | | |
| 3659 | + | |
| 3660 | + | |
3566 | 3661 | | |
3567 | 3662 | | |
3568 | 3663 | | |
| |||
3677 | 3772 | | |
3678 | 3773 | | |
3679 | 3774 | | |
| 3775 | + | |
| 3776 | + | |
| 3777 | + | |
3680 | 3778 | | |
3681 | 3779 | | |
3682 | 3780 | | |
| |||
0 commit comments