Skip to content

Commit

Permalink
remove ndc-citus (#105)
Browse files Browse the repository at this point in the history
### 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
  • Loading branch information
Gil Mizrahi authored Oct 25, 2023
1 parent 79d5b88 commit 5bb88ef
Show file tree
Hide file tree
Showing 88 changed files with 325 additions and 420 deletions.
8 changes: 0 additions & 8 deletions .github/test-configuration.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
"ndc-citus": {
"package": "ndc-citus",
"flags": "",
"services": "citus",
"env": {
"POSTGRESQL_CONNECTION_STRING": "postgresql://postgres:password@localhost:64004"
}
},
"ndc-cockroach": {
"package": "ndc-cockroach",
"flags": "",
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-images-and-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
strategy:
matrix:
connector:
- ndc-citus
- ndc-cockroach
- ndc-postgres
fail-fast: false
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/cargo-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ jobs:
strategy:
matrix:
package:
- ndc-citus
- ndc-cockroach
- ndc-postgres-12
- ndc-postgres-13
Expand Down Expand Up @@ -155,7 +154,12 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.BROKEN_BUILD_SLACK_WEBHOOK_URL }}

test-ndc-postgres-with-yugabyte:
name: test connector (ndc-postgres on Yugabyte)
strategy:
matrix:
database:
- yugabyte
- citus
name: "test connector (ndc-postgres on ${{ matrix.database }})"
runs-on: ubuntu-latest
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
Expand Down Expand Up @@ -183,10 +187,10 @@ jobs:
compose-file: "./docker-compose.yaml"
down-flags: "--volumes"
services: |
yugabyte
${{ matrix.database }}
- name: run tests
run: |
cargo nextest run --no-fail-fast --release -p other-db-tests --features yugabyte
cargo nextest run --no-fail-fast --release -p other-db-tests --features ${{ matrix.database }}
env:
RUST_LOG: INFO
31 changes: 8 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package.edition = "2021"
package.license = "Apache-2.0"

members = [
"crates/connectors/ndc-citus",
"crates/connectors/ndc-cockroach",
"crates/connectors/ndc-postgres",
"crates/query-engine/execution",
Expand Down
38 changes: 0 additions & 38 deletions crates/connectors/ndc-citus/Cargo.toml

This file was deleted.

7 changes: 0 additions & 7 deletions crates/connectors/ndc-citus/bin/main.rs

This file was deleted.

167 changes: 0 additions & 167 deletions crates/connectors/ndc-citus/src/connector.rs

This file was deleted.

3 changes: 0 additions & 3 deletions crates/connectors/ndc-citus/src/lib.rs

This file was deleted.

33 changes: 0 additions & 33 deletions crates/connectors/ndc-citus/tests/explain_tests.rs

This file was deleted.

7 changes: 0 additions & 7 deletions crates/connectors/ndc-citus/tests/schema_tests.rs

This file was deleted.

This file was deleted.

Loading

0 comments on commit 5bb88ef

Please sign in to comment.