Antalya 26.6: Support Nullable(Tuple) for Arrow, ArrowStream, ORC, legacy Parquet formats - #2176
Open
zvonand wants to merge 4 commits into
Open
Antalya 26.6: Support Nullable(Tuple) for Arrow, ArrowStream, ORC, legacy Parquet formats#2176zvonand wants to merge 4 commits into
zvonand wants to merge 4 commits into
Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #1802 from Altinity/feature/antalya-26.3/ClickHouse-ClickHouse-pr-101272 Antalya 26.3: Support Nullable(Tuple) for Arrow, ArrowStream, ORC, legacy Parquet formats # Conflicts: # src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp # src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp # src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp # tests/queries/0_stateless/04064_tuple_inside_nullable_arrow_orc_roundtrip.reference # tests/queries/0_stateless/04064_tuple_inside_nullable_arrow_orc_roundtrip.sql # tests/queries/0_stateless/04065_tuple_inside_nullable_parquet_roundtrip.reference # tests/queries/0_stateless/04065_tuple_inside_nullable_parquet_roundtrip.sql
All conflicted hunks resolved in favour of antalya-26.6 ("ours"): the
source PR's changes are already present on the base branch in an evolved
form (upstream ClickHouse#101272 plus its 26.6 follow-ups), so no source-PR line is
lost:
* ArrowColumnToCHColumn.cpp: `unwrapNullableTuple` list/Nested handling and
the null-value zeroing in `readColumnWithNumericData` are already on
antalya-26.6; kept the base branch's extra last-offset validation and the
`schema_inference_allow_nullable_tuple_type`-gated STRUCT condition
(backport of ClickHouse#109185), which supersedes the PR's unconditional removal of
the STRUCT check.
* CHColumnToArrowColumn.cpp: struct-level null handling already exists on
antalya-26.6 via `nullBytemapToArrowBitmap` + `arrow::StructArray::Make`
(the builder-based Append/AppendNull shape from the PR no longer applies).
* MsgPackRowInputFormat.cpp: identical Nullable(Tuple) unwrapping already on
antalya-26.6, only placed after the tuple size check.
* 04064/04065 tests: base-branch versions already cover the PR's cases;
04065 was adapted on antalya-26.6 to the V3-reader-only world where
`input_format_parquet_use_native_reader_v3` no longer exists.
Also dropped the cherry-pick's misplaced copy of the "zero out values at
null positions" block: git applied it to `readColumnWithDurationData`,
a function the source PR does not touch, while the PR's actual target
(`readColumnWithNumericData`) already carries it on antalya-26.6.
zvonand
added
releasy
Collaborator
|
I'm not sure what happened here. Either the script bugged or everything is just plain here. For a second I thought my github webui got broken, but the cli also shows this PR to be completely empty: ❯ git diff origin/feature/antalya-26.6/pr-1802-1
❯ |
Collaborator
|
ClickHouse#101272 is understandable to be noop, it's been merged in 26.4.1. #1802 is also just a backport of the first one. So I think this PR is useless and can be dropped. IIUC the script picked this one up because it contained |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Support Nullable(Tuple) for Arrow, ArrowStream, ORC, legacy Parquet formats (ClickHouse#101272 by @nihalzp) (#1802 by @zvonand).
CI/CD Options
Exclude tests:
Regression jobs to run:
Cherry-picked from #1802.