fix: match Spark's duplicate field and field id semantics in parquet field lookup - #5654
fix: match Spark's duplicate field and field id semantics in parquet field lookup#5654dwsmith1983 wants to merge 4 commits into
Conversation
sunchao
left a comment
There was a problem hiding this comment.
This fixes stray-name matching and placeholder collisions, and adds nested duplicate-ID rejection and last-wins exact-name lookup. One gap remains: metadata-only struct relabeling bypasses the duplicate-ID check, as detailed inline.
I compared the code with maintained Spark 3.5 and 4.0 sources. Eight component-check groups passed using extracted Comet helpers with Arrow/Parquet 58.4.0 and DataFusion 54.1.0. A separate probe reproduced the cast bypass and verified a renamed-child control. These probes use limited scaffolding and are not full Comet scan, JNI or Spark query tests. The reported 246 native and 58 Spark 3.5 tests are the author's results.
At 04:51 UTC, current-head CI had 29 successful, 32 running and 7 skipped checks. Full CI validation was still pending.
| // Mirror Spark's `foundDuplicateFieldInFieldIdLookupModeError` | ||
| // (`_LEGACY_ERROR_TEMP_2094`): a requested ID resolving to more | ||
| // than one file field is ambiguous. | ||
| Some(indices) => { |
There was a problem hiding this comment.
[P2] Run duplicate-ID validation before metadata-only struct relabeling
Could you route metadata-only struct adaptations through this validation too? For file struct s<x: int id=1, y: int id=1, z: int id=2> and requested s<x: int id=1, y: int id=3, z: int id=2>, Spark rejects requested ID 1 as ambiguous. DataFusion emits a struct cast, but CometCastColumnExpr::evaluate takes types_differ_only_in_field_names and calls relabel_array, because that predicate ignores field-ID metadata. The new lookup never runs and leaves all three physical values in place. A focused probe using the current cast expression and a real Arrow/Parquet round trip returned [42, 43, 44], while renaming requested x made the same input reach the duplicate-ID error. Could you guard the relabel shortcut for ID-based reads and add a cast-expression or scan regression with unchanged child names?
There was a problem hiding this comment.
Good catch, the shortcut sailed right past the new validation. Fixed in 3d68f22: the relabel arm is now guarded so that when use_field_id is set and the requested type carries field id metadata, evaluation falls through to the struct conversion where the duplicate id lookup runs. Chose the guard at the call site rather than inside types_differ_only_in_field_names since that predicate is a pure structural comparison with no access to the parquet options. Your exact probe is now a regression test (unchanged child names, duplicate id 1, asserts the 2094 error) plus a companion pinning that the fast path survives for name only differences without ids and for the flag alone.
3d68f22 to
e1d9eb3
Compare
e1d9eb3 to
58e67fe
Compare
|
Reviewed head
The strongest design improvement is to resolve and validate requested fields once per file schema, then reuse the mapping across batches. That addresses the validation bypasses and repeated lookup work together. Metadata-only relabeling remains safe when the resolved mapping is positional. A small mapping object is a useful abstraction here. Validation: 100 native Parquet tests passed, with default HDFS features disabled. Additional head/base probes confirmed both correctness cases. Performance evidence measures component allocations, not overall scan speed. CI snapshot: 57 passed, 7 running, 7 skipped. Nothing was posted to GitHub. |
|
Thanks, all three are addressed in a69b5f5, following the once-per-file design you suggested. The physical expression adapter factory already runs once per file schema, so it now resolves a small Your repros: the identical One residual worth naming: DataFusion's opener skips the adapter entirely when the logical and physical schemas compare equal and no predicate exists. Spark-written files always carry key-value metadata that arrow-rs folds into the physical schema, so they always go through the adapter, but a file with no metadata at all and duplicated ids inside a struct would still read positionally. Happy to cover that in a follow-up if you think it matters. |
When a logical field carries a Parquet field id, Spark's matchIdField resolves it strictly by id and never falls back to a name match. The remap previously only shielded id-bearing logical fields whose id was missing from the file, so a stray physical column sharing such a field's name could still name-match through the DefaultPhysicalExprAdapter fallback and hijack the read. Shield every id-bearing logical field name, run the shield after the name-match pass so a legitimate name match claims the field first, and pick fake names that skip real column names from either schema.
…lookup A requested field id resolving to more than one physical field now raises the same _LEGACY_ERROR_TEMP_2094 error as Spark's foundDuplicateFieldInFieldIdLookupModeError instead of silently reading the first match; unrequested duplicate ids stay harmless. The case-sensitive exact-name lookup now resolves duplicate names to the last field, matching Spark's caseSensitiveParquetFieldMap built with .toMap where later entries overwrite earlier ones.
CometCastColumnExpr relabeled structs whose types differ only in field metadata, skipping spark_parquet_convert and its duplicate field id check. Guard the shortcut so id-based reads with field id metadata in the target type always take the validating conversion path.
…here The schema adapter now resolves how every requested nested field reads from the file struct once per file, mirroring Spark's clipParquetSchema, and raises a duplicate field id or ambiguous name for any referenced column whether or not a cast is emitted. Identical file and requested schemas with a duplicated id are rejected as Spark rejects them. The resolved mapping is handed to CometCastColumnExpr and applied positionally per batch; the relabel shortcut runs only when the mapping is positional. Per id and per name lookups use a small Copy entry and gather matching names only when reporting an ambiguity, so a wide struct allocates nothing per field id. Placeholder names generated for shielded file columns are reserved against the folded logical and physical names that downstream lookups compare, so a requested column differing only by case keeps its default. The reservation set is built on the first placeholder only.
a69b5f5 to
56a5785
Compare
Which issue does this PR close?
Part of the restructuring of #5365 requested in review: this extracts the duplicate field and field id matching semantics that previously traveled with the Delta contrib work, re-derived on top of the folding that #5602 added.
Rationale for this change
Three places where the native parquet field lookup diverges from Spark:
remap_physical_schemaonly shields id-bearing logical fields whose id is missing from the file. When a logical field's id matches one physical field but a stray physical column carries that logical field's name, the stray column can still name-match through the expression adapter fallback and hijack the read.parquet_convert_struct_to_structsilently resolves a requested field id that matches more than one physical field to the first match. Spark raises the duplicate field error in field id lookup mode..toMap, where the last entry wins.What changes are included in this PR?
SparkError::DuplicateFieldByFieldId(_LEGACY_ERROR_TEMP_2094). Duplicate ids that no requested field references remain harmless.How are these changes tested?
Six tests written first; four failed on unmodified main (stray column hijacking the remap, case insensitive sibling null-filled, duplicate id silently reading the first match, first-wins name resolution), two pass on main and pin behavior that must not change. Full native suite 246 passed, clippy with
-D warningsand fmt clean, andCometNativeReaderSuiteon Spark 3.5 (58 succeeded) against the rebuilt native library.