Repository navigation
Commit fea0264
committed
Address Copilot review: deduplicate read-plan machinery, restore input_file_name handling lost in rebase
Three fixes on top of the rebase onto latest main:
1. row_filter.rs carried a stale pre-#23638 copy of the column-resolution
machinery (ParquetReadPlan, PushdownChecker, StructFieldAccess,
build_filter_schema, etc.) that main has since moved into
projection_read_plan.rs. Rebuilt the file on main's shared-module
version, keeping only this PR's real additions
(PrebuiltRowFilterCandidate, prebuild_row_filter_candidates,
row_filter_from_prebuilt, and the RowFilterGenerator removal):
2194 → 1483 lines, -798 net. The stray "strinrg" typo lived in the
deleted copy.
2. The rebase silently dropped main's input_file_name() handling in
ParquetMorselizer (import, the per-file literal rewrite in open(),
and the test_input_file_name_projection test) because this PR's
restructure of open() overlapped the region #23638 later touched.
Restored all three; the test passes again.
3. metrics: the row_filter_skipped_fully_matched doc claimed to count
row groups, but the counter increments once per suppression event
(a run of consecutive fully-matched RGs shares a single toggle).
Doc now states the actual semantics.
Verified: 158 datasource-parquet tests pass (with PARQUET_TEST_DATA),
cargo doc clean, clippy clean on touched files.1 parent 04d04a5 commit fea0264
3 files changed
Lines changed: 148 additions & 798 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
69 | 74 | | |
70 | 75 | | |
71 | 76 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
43 | 44 | | |
44 | 45 | | |
45 | 46 | | |
| |||
795 | 796 | | |
796 | 797 | | |
797 | 798 | | |
| 799 | + | |
| 800 | + | |
| 801 | + | |
798 | 802 | | |
799 | 803 | | |
800 | 804 | | |
| |||
3336 | 3340 | | |
3337 | 3341 | | |
3338 | 3342 | | |
3339 | | - | |
| 3343 | + | |
3340 | 3344 | | |
| 3345 | + | |
| 3346 | + | |
| 3347 | + | |
| 3348 | + | |
3341 | 3349 | | |
3342 | 3350 | | |
3343 | 3351 | | |
| |||
3351 | 3359 | | |
3352 | 3360 | | |
3353 | 3361 | | |
| 3362 | + | |
| 3363 | + | |
| 3364 | + | |
| 3365 | + | |
| 3366 | + | |
| 3367 | + | |
| 3368 | + | |
| 3369 | + | |
| 3370 | + | |
| 3371 | + | |
| 3372 | + | |
| 3373 | + | |
| 3374 | + | |
| 3375 | + | |
| 3376 | + | |
| 3377 | + | |
| 3378 | + | |
| 3379 | + | |
| 3380 | + | |
| 3381 | + | |
| 3382 | + | |
| 3383 | + | |
| 3384 | + | |
| 3385 | + | |
| 3386 | + | |
| 3387 | + | |
| 3388 | + | |
| 3389 | + | |
| 3390 | + | |
| 3391 | + | |
| 3392 | + | |
| 3393 | + | |
| 3394 | + | |
| 3395 | + | |
| 3396 | + | |
| 3397 | + | |
| 3398 | + | |
| 3399 | + | |
| 3400 | + | |
| 3401 | + | |
| 3402 | + | |
| 3403 | + | |
| 3404 | + | |
| 3405 | + | |
| 3406 | + | |
| 3407 | + | |
| 3408 | + | |
| 3409 | + | |
3354 | 3410 | | |
3355 | 3411 | | |
3356 | 3412 | | |
| |||
0 commit comments