Commit 7fa8c1e
committed
feat: skip per-dim discovery scans when query is an unfiltered scan
When a query is a pure unfiltered scan over a single registered
template (Projection / Sort / TableScan / SubqueryAlias only), the
result's coordinate extent is exactly the registered Dataset's.
Reuse its coord arrays directly instead of running one DISTINCT scan
per dim. Filtered, aggregated, joined, limited, multi-table queries
fall back to the existing per-dim discovery path unchanged.
The detector walks the logical plan and returns the scanned table
name; coord values are then sourced from that registered Dataset, not
from any user-supplied template= argument (which is only for metadata
recovery). That keeps the fast path correct when a user with multiple
registered Datasets passes a metadata template that differs from the
query's actual source.
Construction cost on NCEP air_temperature (chunks={'time':24}):
- before: peak 77 MB, wall 3.4 s (3x full-source scans for 3 dims)
- after : peak 0.1 MB, wall 7 ms
Also fixes xarray-sql#171 (stable dim order on the lazy round-trip):
the discovery path's .distinct().sort() forced ascending; the
template-coord fast path returns coords in source order, so a source
with descending lat (e.g. air_temperature: 75 -> 15) round-trips
descending instead of being flipped.1 parent c656dda commit 7fa8c1e
2 files changed
Lines changed: 206 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
202 | 202 | | |
203 | 203 | | |
204 | 204 | | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 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 | + | |
205 | 309 | | |
206 | 310 | | |
207 | 311 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
432 | 432 | | |
433 | 433 | | |
434 | 434 | | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
435 | 508 | | |
436 | 509 | | |
437 | 510 | | |
438 | 511 | | |
439 | 512 | | |
| 513 | + | |
440 | 514 | | |
441 | 515 | | |
442 | 516 | | |
443 | 517 | | |
444 | 518 | | |
445 | | - | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
446 | 522 | | |
447 | 523 | | |
448 | 524 | | |
449 | 525 | | |
450 | | - | |
451 | | - | |
452 | | - | |
453 | | - | |
454 | | - | |
455 | | - | |
456 | | - | |
457 | | - | |
458 | | - | |
459 | | - | |
460 | | - | |
461 | | - | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
462 | 544 | | |
463 | 545 | | |
464 | 546 | | |
| |||
550 | 632 | | |
551 | 633 | | |
552 | 634 | | |
| 635 | + | |
553 | 636 | | |
554 | 637 | | |
555 | 638 | | |
| |||
583 | 666 | | |
584 | 667 | | |
585 | 668 | | |
586 | | - | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
587 | 674 | | |
588 | 675 | | |
589 | 676 | | |
| |||
730 | 817 | | |
731 | 818 | | |
732 | 819 | | |
| 820 | + | |
733 | 821 | | |
734 | 822 | | |
735 | 823 | | |
| |||
0 commit comments