Repository navigation
Flink: Cherry-pick #17194 and its v1.20/v2.0 backport - Fix timestamp-micros conversion in AvroToRowDataConverters - #12
Merged
Conversation
nickwu241
force-pushed
the
nick/cherry-pick-17194-ts-micros
branch
from
September 24, 2026 19:33
533a359 to
72cd505
Compare
nickwu241
changed the title
dcagney
approved these changes
Sep 25, 2026
dcagney
left a comment
dcagney
left a comment
There was a problem hiding this comment.
Approving — verified against upstream apache#17194 (fix) + apache#17212 (backport). Diff is byte-for-byte identical across flink/v1.20, v2.0, v2.1.
Checked specifically for hidden dependency on unbackported upstream work: confirmed our fork's pre-patch state exactly matches upstream's pre-patch state at the parent commits of apache#17194/apache#17212 (zero drift in AvroToRowDataConverters.java / DataGenerators.java), so this cherry-pick applies cleanly with no missing prerequisite.
LGTM.
nickwu241
added a commit
that referenced
this pull request
Sep 25, 2026
Bumps version.txt and adds the AFFIRM_VERSIONS.md changelog entry for the next patch release, covering the 3 review-triggered fixes from all-the-things#222721 (#12/#13/#14). Those PRs are open, not yet merged — rebase this branch onto 1.11.0-affirm-patch once they land, then tag 1.11.0-affirm-patch.2 at the resulting commit and publish per RUNBOOK_ICEBERG_PATCH_PUBLISH.md.
nickwu241
added a commit
that referenced
this pull request
Sep 25, 2026
nickwu241
added a commit
that referenced
this pull request
Sep 25, 2026
* Document and stage 1.11.0-affirm-patch.2 Bumps version.txt and adds the AFFIRM_VERSIONS.md changelog entry for the next patch release, covering the 3 review-triggered fixes from all-the-things#222721 (#12/#13/#14). Those PRs are open, not yet merged — rebase this branch onto 1.11.0-affirm-patch once they land, then tag 1.11.0-affirm-patch.2 at the resulting commit and publish per RUNBOOK_ICEBERG_PATCH_PUBLISH.md. * Update AFFIRM_VERSIONS.md: base off 1.11.0-affirm-patch.1, drop reviewer names * Drop #10/#11 from .2 table (already covered by .1 base) * Note #12/#13/#14 merged and branch rebased; ready to tag * Drop 'not yet published' framing now that .2 contents are final * Drop trailing note from .2 section to match .1 format
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
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.
Cherry-picks apache#17194 onto
1.11.0-affirm-patch, coveringflink/v2.1,flink/v1.20, andflink/v2.0.AvroToRowDataConverters.convertToTimestamp'sprecision <= 6branch multiplied the sub-millisecond remainder by1_000_000instead of1000, producing an out-of-rangenanoOfMillisecondand throwingIllegalArgumentExceptionfor anyMicroTimestamp/ZonedTimestampvalue with a nonzero microsecond remainder. Existing tests never caught it because their fixtures used a zero remainder.Filed upstream as apache#17075 (closed), fixed by apache#17194, with a same-day backport apache#17212 to
flink/v1.20/flink/v2.0. Neither theapache-iceberg-1.11.0tag nor this fork had picked up either commit.Commits
Both cherry-picks applied cleanly, no conflicts.
Verification