Recurse into MAP and LIST with the remap_struct and the MFR ColumnMapper
#17448
+813
−111
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Follow up adding support for altering structs inside lists/maps is here: https://github.com/Tishj/duckdb/tree/list_alter_type |
Tishj
commented
May 12, 2025
| @@ -301,12 +452,16 @@ ColumnMapResult MapColumn(ClientContext &context, const MultiFileColumnDefinitio | |||
| // found a column mapping for this child - emplace it | |||
| column_mapping.emplace_back(global_child.name, std::move(child_map.column_map)); | |||
| } | |||
| //! FIXME: the 'default_value' should only be used if the STRUCT's default value is not NULL | |||
There was a problem hiding this comment.
After this merges I'll work on adding support for the initial-default to iceberg and build a test for the table of point point.x and point.y from here: https://iceberg.apache.org/spec/#default-values while likely making changes to core here to support these scenarios.
|
Thanks! |
krlmlr
added a commit
to duckdb/duckdb-r
that referenced
this pull request
May 18, 2025
Recurse into `MAP` and `LIST` with the `remap_struct` and the MFR ColumnMapper (duckdb/duckdb#17448)
krlmlr
added a commit
to duckdb/duckdb-r
that referenced
this pull request
May 19, 2025
Recurse into `MAP` and `LIST` with the `remap_struct` and the MFR ColumnMapper (duckdb/duckdb#17448)
krlmlr
added a commit
to duckdb/duckdb-r
that referenced
this pull request
May 19, 2025
Recurse into `MAP` and `LIST` with the `remap_struct` and the MFR ColumnMapper (duckdb/duckdb#17448)
Mytherin
added a commit
that referenced
this pull request
May 22, 2025
) Follow-up fixes from #17448 Nested default values were ignored, which caused this code not to correctly handle missing fields. In addition, we can no longer directly emit the default value as the result since the default value is no longer equivalent to the actual value (e.g. the default value might be `{'list': {'k': NULL}}` when the actual value should be `[{'k': NULL}]`.) We fix this by allowing `remap_struct` to take `NULL` as remap target, in case there are zero columns used from the source struct.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR solves the issue that we don't traverse into LIST and MAP in the MultiFileReader, so schema evolutions to a STRUCT inside a LIST/MAP currently don't get applied properly.
Fixes https://github.com/duckdblabs/duckdb-internal/issues/4846
Now we properly traverse these types just like we already do for STRUCT.