Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update sqlx to 0.8.2, sea-orm to 1.1, sea-orm-migration to 1.1 #19145

Merged
merged 2 commits into from
Nov 4, 2024

Conversation

kwannoel
Copy link
Contributor

@kwannoel kwannoel commented Oct 28, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

  • Use madsim org's sqlx instead.

Closes #18853.

This PR updates sqlx to v0.8.2 (risingwavelabs/sqlx#2). We have to update it sooner or later, since other projects e.g. iceberg-rs depend on it.

We also have to bump sea-orm, because it depends on sqlx. Otherwise the sqlx version it uses will have conflicts.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@kwannoel kwannoel force-pushed the kwannoel/sqlx-v0.8.2 branch 2 times, most recently from fa44597 to 1edc542 Compare November 1, 2024 03:18
@kwannoel kwannoel force-pushed the kwannoel/sqlx-v0.8.2 branch from 1edc542 to 6671d71 Compare November 1, 2024 03:25
@kwannoel kwannoel changed the title chore(deps): update sqlx from v0.7.4 to v0.8.2 chore(deps): update sqlx 0.7.4 to 0.8.2, sea-orm 0.12.15 to 1.1, sea-orm-migration 0.12.14 to 1.1 Nov 1, 2024
@kwannoel kwannoel force-pushed the kwannoel/sqlx-v0.8.2 branch from 501af7f to 77707e1 Compare November 1, 2024 04:58
@kwannoel kwannoel marked this pull request as ready for review November 1, 2024 06:36
@kwannoel kwannoel requested a review from a team as a code owner November 1, 2024 06:36
@kwannoel kwannoel requested a review from cyliu0 November 1, 2024 06:36
Cargo.lock Outdated
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
version = 4
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure if this is safe to update? This was update automatically.

Copy link
Member

Choose a reason for hiding this comment

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

Cargo.toml Show resolved Hide resolved
@kwannoel kwannoel changed the title chore(deps): update sqlx 0.7.4 to 0.8.2, sea-orm 0.12.15 to 1.1, sea-orm-migration 0.12.14 to 1.1 chore(deps): update sqlx to 0.8.2, sea-orm to 1.1, sea-orm-migration to 1.1 Nov 1, 2024
@xxchan xxchan mentioned this pull request Nov 1, 2024
4 tasks
@xxchan xxchan requested a review from BugenZhao November 1, 2024 11:01
@kwannoel kwannoel force-pushed the kwannoel/sqlx-v0.8.2 branch from b1921da to 4308eb2 Compare November 4, 2024 05:53
@kwannoel kwannoel force-pushed the kwannoel/sqlx-v0.8.2 branch from 4308eb2 to 4672534 Compare November 4, 2024 07:54
@kwannoel kwannoel added this pull request to the merge queue Nov 4, 2024
@kwannoel
Copy link
Contributor Author

kwannoel commented Nov 4, 2024

Skipped deterministic fuzz tests.
These test failure are due to the sqrt negative number failure (can be ignored), and a separate bug:

thread '<unnamed>' panicked at src/common/src/util/sort_util.rs:303:74:
called `Option::unwrap()` on a `None` value
stack backtrace:
   0: rust_begin_unwind
             at /rustc/52fd9983996d9fcfb719749838336be66dee68f9/library/std/src/panicking.rs:665:5
   1: core::panicking::panic_fmt
             at /rustc/52fd9983996d9fcfb719749838336be66dee68f9/library/core/src/panicking.rs:74:14
   2: core::panicking::panic
             at /rustc/52fd9983996d9fcfb719749838336be66dee68f9/library/core/src/panicking.rs:148:5
   3: core::option::unwrap_failed
             at /rustc/52fd9983996d9fcfb719749838336be66dee68f9/library/core/src/option.rs:2004:5
   4: unwrap<&risingwave_common::catalog::schema::Field>
             at /rustc/52fd9983996d9fcfb719749838336be66dee68f9/library/core/src/option.rs:969:21
   5: fmt
             at ./src/common/src/util/sort_util.rs:303:74
   6: to_string<risingwave_common::util::sort_util::ColumnOrderDisplay>
             at /rustc/52fd9983996d9fcfb719749838336be66dee68f9/library/alloc/src/string.rs:2682:9
   7: display<risingwave_common::util::sort_util::ColumnOrderDisplay>
             at ./.cargo/registry/src/index.crates.io-6f17d22bba15001f/pretty-xmlish-0.1.13/src/lib.rs:136:9
   8: {closure#0}
             at ./src/frontend/src/optimizer/property/order.rs:72:13

Which is independent of this PR. We can investigate separately.

Merged via the queue into main with commit 7690f67 Nov 4, 2024
31 of 32 checks passed
@kwannoel kwannoel deleted the kwannoel/sqlx-v0.8.2 branch November 4, 2024 10:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bump sqlx to v0.8.1
5 participants