Skip to content

[58_maintenance] Fix CI: check in Cargo.lock for MSRV, backport rustdoc, MIRI and integration test fixes - #11727

Merged
Jefffrey merged 4 commits into
apache:58_maintenancefrom
alamb:fix_58_ci
Oct 21, 2026
Merged

Jefffrey merged 4 commits into
apache:58_maintenancefrom
alamb:fix_58_ci

Conversation

@alamb

@alamb alamb commented Oct 19, 2026 •

Copy link
Copy Markdown
Contributor

Which issue does this PR close?

Rationale for this change

CI on the 58_maintenance branch is red on every PR (e.g. #11365, #11703, #11704, #11705, #11707) for reasons unrelated to those PRs.

What changes are included in this PR?

Are these changes tested?

Yes by CI

Are there any user-facing changes?

No.

bit2swaz and others added 4 commits October 19, 2026 15:21
… in tests (apache#10433)

# Which issue does this PR close?

No separate issue. The fix is one line per test case and the failing CI
runs are evidence enough.

# Rationale for this change

MIRI CI uses nightly Rust. A recent nightly changed the `Display` output
of `TryFromIntError` from `"out of range integral type conversion
attempted"` to `"number too large to fit in target type"` (and similar
variants). Tests in `datatype_parse.rs` were asserting on that
stdlib-owned suffix, so they broke on MIRI without any change to our
code.

# What changes are included in this PR?

Trimmed 9 expected substrings in `parse_data_type_errors` to stop at the
`:` that separates our message from the stdlib one. The tests now only
assert on the part of the error string we control.

# Are these changes tested?

`parse_data_type_errors` passes on stable. MIRI CI should go green once
this merges.

# Are there any user-facing changes?

No. Test-only change, no behavior or API impact.

(cherry picked from commit b278c54)
…SON parser (apache#9888)

# Which issue does this PR close?

Supporting unskipping more types in the Rust IPC/C Data tests for
apache/arrow#49910 /
apache/arrow#49744 .

# Rationale for this change

View types and decimal 32/64 are supported in Rust but aren't supported
in the integration test JSON implementation (so they fail when the
integration test tries to check them).

# What changes are included in this PR?

Integration test JSON now supports how these values are represented.

# Are these changes tested?

Yes. I've added to the embedded integration.json for the new types and
I've run the apache/arrow PR against this branch with these types no
longer being skipped.

# Are there any user-facing changes?

No

---------

Co-authored-by: Copilot <copilot@github.com>
(cherry picked from commit 2e8e0c7)
…he#11305) (apache#11354)

- Backport apache#11305
- For inclusion in apache#11352

Cherry-pick of
apache@79ffb47
with minor conflict fixes

So we can get green CI on 59_maintenance branch

Signed-off-by: Jiawei Zhao <Phoenix500526@163.com>
Co-authored-by: Phoenix <Phoenix500526@163.com>
(cherry picked from commit 0336b2b)
Like apache#9941 on main, commit the root Cargo.lock so the MSRV job verifies
against a dependency set compatible with Rust 1.85 (tonic 0.14.5, uuid
1.26.1) instead of the newest published versions. Remove the manual
dependency downgrade step from the MSRV workflow since the lockfile now
covers it.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
@github-actions github-actions Bot added parquet Changes to the parquet crate arrow-flight Changes to the arrow-flight crate development-process Internal changes; PRs with this label are excluded from changelog parquet-variant parquet-variant* crates arrow-avro arrow-avro crate arrow-row arrow-row crate arrow-pyarrow arrow-pyarrow crate arrow-json arrow-json crate arrow-ipc arrow-ipc crate arrow-csv arrow-csv crate arrow-core Core crates related to representing arrow data arrow-kernels Crates that transform arrow data (e.g. compute, cast) labels Oct 19, 2026
- name: Install cargo-msrv (if needed)
# cargo-msrv binary may be cached by the cargo cache step in setup-builder, and cargo install will error if it is already installed
run: if which cargo-msrv ; then echo "using existing cargo-msrv binary" ; else cargo install cargo-msrv --locked ; fi
- name: Downgrade workspace dependencies

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR checks in Cargo.lock instead

Comment thread arrow-arith/Cargo.toml
version = { workspace = true }
description = "Arrow arithmetic kernels"
homepage = { workspace = true }
repository = { workspace = true }

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed to fix errors like https://github.com/apache/arrow-rs/actions/runs/39238804526/job/118014357492?pr=11365

Run cargo +nightly doc --document-private-items --no-deps --workspace --all-features
warning: `package.homepage` is redundant with `package.repository`
  --> parquet-variant/Cargo.toml:23:12
   |
23 | homepage = { workspace = true }
   |            ^^^^^^^^^^^^^^^^^^^^
24 | repository = { workspace = true }
   |              --------------------
   |

//! This module exposes three layers of the API surface, from highest to lowest-level:
//!
//! * [`ReaderBuilder`](crate::reader::ReaderBuilder): configures how Avro is read (batch size, strict union handling,
//! * [`ReaderBuilder`]: configures how Avro is read (batch size, strict union handling,

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes https://github.com/apache/arrow-rs/actions/runs/39238804526/job/118014357492?pr=11365

error: redundant explicit link target
  |
  = note: when a link's destination is not specified,
          the label is used to resolve intra-doc links
  = note: `-D rustdoc::redundant-explicit-links` implied by `-D warnings`
  = help: to override `-D warnings` add `#[allow(rustdoc::redundant_explicit_links)]`

error: redundant explicit link target
  |
  = note: when a link's destination is not specified,
          the label is used to resolve intra-doc links

"children": []
}
]
},

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(
"FixedSizeBinary(4000000000), ",
"Error converting 4000000000 into i32 for FixedSizeBinary: out of range integral type conversion attempted",
"Error converting 4000000000 into i32 for FixedSizeBinary:",

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alamb

alamb commented Oct 19, 2026

Copy link
Copy Markdown
Contributor Author

This PR looks massive but I think it is pretty straightforward

@alamb
alamb marked this pull request as ready for review October 19, 2026 19:33

@Jefffrey Jefffrey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @alamb

@Jefffrey
Jefffrey merged commit 74e5f82 into apache:58_maintenance Oct 21, 2026
41 of 42 checks passed
@alamb

alamb commented Oct 21, 2026

Copy link
Copy Markdown
Contributor Author

Thanks @Jefffrey -- I am sorry I didn't get more backports done (I was fighting CI failures, and the fact that worker queues limited turnaround to many hours)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

arrow-avro arrow-avro crate arrow-core Core crates related to representing arrow data arrow-csv arrow-csv crate arrow-flight Changes to the arrow-flight crate arrow-ipc arrow-ipc crate arrow-json arrow-json crate arrow-kernels Crates that transform arrow data (e.g. compute, cast) arrow-pyarrow arrow-pyarrow crate arrow-row arrow-row crate development-process Internal changes; PRs with this label are excluded from changelog parquet Changes to the parquet crate parquet-variant parquet-variant* crates

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants