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

remove ndc-citus #105

Merged
merged 7 commits into from
Oct 25, 2023
Merged

remove ndc-citus #105

merged 7 commits into from
Oct 25, 2023

Conversation

soupi
Copy link
Contributor

@soupi soupi commented Oct 24, 2023

What

Since ndc-citus is essentially exactly like ndc-postgres, and we don't see that changing in the near future, we'd like to remove the ndc-citus binary but keep testing against citus.

How

  • Copy yugabyte setup in other-db-tests for citus
  • import the other tests from ndc-citus
  • get rid of ndc-citus
  • fix references

//! If you have changed it intentionally, run `just generate-chinook-configuration`.

#[cfg(test)]
mod configuration_tests {
Copy link
Contributor

Choose a reason for hiding this comment

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

It would seem to me that there should only be a single (rust) version of this test, but we should be able to point it at different database instances and snapshots, since that's the only thing that differs, right?

(and the same reasoning goes for the other tests.)

Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed, but I think we can do this later, as part of a concerted effort to remove duplication in tests.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm fine with that as well. I just wanted to highlight it :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll do it now. It'll make it easier to copy for cockroach and postgres later. thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll unify just the common tests for now actually.

@@ -12,14 +12,24 @@ aurora = []
# We only run the Yugabyte tests if this feature is enabled.
# Note that the Yugabyte Docker image seems not to work on aarch64.
yugabyte = []
# We only run the Cockroach tests if this feature is enabled.
cockroach = []
# We only run the Citus tests if this feature is enabled.
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are we adding these as features? They only exist for yugabyte / aurora because those can't always run locally, whilst citus and cockroach can.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh I see what you're doing here. Seems fine.

@@ -190,3 +189,40 @@ jobs:
cargo nextest run --no-fail-fast --release -p other-db-tests --features yugabyte
env:
RUST_LOG: INFO

test-ndc-postgres-with-citus:
Copy link
Contributor

Choose a reason for hiding this comment

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

Consider matrix-ifying this please. Doesn't have to be now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry wdym?

Copy link
Contributor

Choose a reason for hiding this comment

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

Use a matrix strategy (just like the test-connector job above) instead of copying and pasting.

It's a fancy loop.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh I understand. Thanks.

crates/tests/other-db-tests/Cargo.toml Outdated Show resolved Hide resolved
@soupi soupi enabled auto-merge October 24, 2023 14:30
@soupi soupi disabled auto-merge October 25, 2023 07:25
@soupi soupi enabled auto-merge October 25, 2023 07:31
@soupi soupi added this pull request to the merge queue Oct 25, 2023
Merged via the queue into main with commit 5bb88ef Oct 25, 2023
24 checks passed
@soupi soupi deleted the gil/remove-ndc-citus branch October 25, 2023 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants