Skip to content

Commit c1514b5

Browse files
adriangbclaude
andauthored
[branch-55] fix: Remove serde_json/preserve_order feature from library crates (backport #25884) (#25915)
## Which issue does this PR close? - Part of #25758 (requested in #25758 (comment)) ## Rationale for this change Backport of #25884 to `branch-55` for the next patch release. ## What changes are included in this PR? Cherry-pick of 80b9648. Conflict resolution: - Kept `branch-55` versions of unrelated lines (`rstest`, `tokio` features). - Dropped the `AsOfJoin` display arm, because `AsOfJoin` does not exist on `branch-55`. Note: #25884 is not merged on `main` yet. This PR must be updated if #25884 changes before merge. ## Are these changes tested? Yes. The display tests in `datafusion-expr` and `datafusion-physical-plan` pass. Clippy is clean. ## Are there any user-facing changes? Downstream crates no longer get `serde_json/preserve_order` enabled by DataFusion library crates. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 5e62bc3 commit c1514b5

6 files changed

Lines changed: 239 additions & 145 deletions

File tree

‎Cargo.lock‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ rand = "0.9"
194194
recursive = "0.1.1"
195195
regex = "1.12"
196196
rstest = "0.26.1"
197+
serde = { version = "1", features = ["derive"] }
197198
serde_json = "1"
198199
sha2 = "^0.11.0"
199200
sqlparser = { version = "0.62.0", default-features = false, features = ["std", "visitor"] }

‎datafusion/expr/Cargo.toml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,11 @@ datafusion-proto-models = { workspace = true, optional = true }
6565
indexmap = { workspace = true }
6666
itertools = { workspace = true }
6767
recursive = { workspace = true, optional = true }
68+
serde = { workspace = true }
6869
serde_json = { workspace = true }
6970
sqlparser = { workspace = true, optional = true }
7071

7172
[dev-dependencies]
7273
ctor = { workspace = true }
7374
env_logger = { workspace = true }
7475
insta = { workspace = true }
75-
# Makes sure `test_display_pg_json` behaves in a consistent way regardless of
76-
# feature unification with dependencies
77-
serde_json = { workspace = true, features = ["preserve_order"] }

0 commit comments

Comments
 (0)