feat: add postgres support in addition to sqlite for recon #302
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dav1do
force-pushed
the
feat/ws1-1544-postgres
branch
2 times, most recently
from
6c5c588
to
60edf7e
Compare
- a bunch of sql modules now... - stopped using query! macros as they don't work for 2 backends. - refactored things try to share queries but still a lot of pg/sqlite specific stuff. tried to keep it in one place so it was easier to reason about. - pushed some store checks up to the callers (e.g. is left > right fencepost)
Some ugly macro use (hack-ro?) to run a test for all databases. The postgres tests only run if `PG_TESTS=1`. The intention being that we don't want `cargo test` to fail generally, but in CI we want to start a db and make sure things pass I also updated the bitswap Store trait to include put, as we were going to the blockstore directly before
Still need to sort out the concrete types bound to daemon in c1. Should be able to get a database trait to work, but the many bounds on sqlx has made it super tedious.. If I really can't get it right, we could move some setup to run() and branch building concrete pg/sql store instances so the types can be inferred rather than declared. Or we could use Box<dyn Store> etc and use dynamic lookup
dav1do
force-pushed
the
feat/ws1-1544-postgres
branch
from
60edf7e
to
fc028b5
Compare
dav1do
temporarily deployed
to
github-tests-2024
GitHub Actions
Inactive
dav1do
temporarily deployed
to
github-tests-2024
GitHub Actions
Inactive
dav1do
temporarily deployed
to
github-tests-2024
GitHub Actions
Inactive
dav1do
temporarily deployed
to
github-tests-2024
GitHub Actions
Inactive
dav1do
temporarily deployed
to
github-tests-2024
GitHub Actions
Inactive
dav1do
force-pushed
the
feat/ws1-1544-postgres
branch
from
8608ac6
to
91bab16
Compare
dav1do
temporarily deployed
to
github-tests-2024
GitHub Actions
Inactive
dav1do
force-pushed
the
feat/ws1-1544-postgres
branch
from
70f5137
to
a2a7aaf
Compare
|
I attempted to get the postgres tests/docker running in CI and didn't get the networking right, so I reverted this branch back to where it was and I'm going to make a new branch to follow up with that. |
dav1do
temporarily deployed
to
github-tests-2024
GitHub Actions
Inactive
#308 handles this. |
also increased sql connection timeout
also fix cwd bug for script
The services section will start the database and migrations will be applied when connecting. We could use the script someday if we use query! macros but we likely never will given we have multiple backends.
dav1do
temporarily deployed
to
github-tests-2024
GitHub Actions
Inactive
Which has now been incorporated into this branch... along with one more change to capture store related metrics on the API side. |
dav1do
removed request for
dbcfd,
smrz2001,
AaronGoldman,
nathanielc and
3benbox
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
All
Storetests run with postgres and sqlite. Postgres tests no-op unlessPG_TESTS=1, so thatcargo teststill passes even if you haven't set up a docker postgres image. In CI we can run them all in order to make sure the postgres type/query handling is valid. Themake check-migrations-cicommand handles setting up the dbs, applying migrations, running tests (will duplicate some tests with the current make tests command but tries to use the same parameters to avoid rebuildling things), and then cleaning up.The database can be specified with
ceramic-one daemon --database-url $DB_URLorCERAMIC_ONE_DATABASE_URL="..." ceramic-one daemon. Postgres or sqlite will be chosen based on the URL prefix, and defaults to putting a sqlite file in the "default directory" (seeDaemonOpts::default_directory).I also added
put()to theiron_bitswap::Storetrait as we were going through the concrete struct before. I couldn't get away from using concrete types, so I select the database and then use generics to bind them to the flavors of trait we need. We should be able to simplify/consolidate some of these traits now that we rely on&selfrather than&mut selfin recon::Store, but this PR is already big.