Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

16 changes: 10 additions & 6 deletions apps/fortuna/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,20 @@
flake-utils.lib.eachDefaultSystem
(
system: let
cli-overlay = nixpkgs.lib.composeExtensions mkCli.overlays.default (_: prev: {
cli-overlay = nixpkgs.lib.composeExtensions mkCli.overlays.default (_: prev: let
cargo = "cargo --color=always";
in {
cli = prev.lib.mkCli "cli" {
_noAll = true;
start = "cargo sqlx migrate run && cargo sqlx prepare && RUST_LOG=info cargo run run";
start = "${cargo} sqlx migrate run && ${cargo} sqlx prepare && RUST_LOG=info ${cargo} watch -x 'run -- run'";
test = {
format = "cargo fmt --check";
lint = "cargo clippy";
format = "${cargo} fmt --check";
lint = "${cargo} sqlx migrate run && ${cargo} sqlx prepare && ${cargo} clippy --color always";
unit = "${cargo} sqlx migrate run && ${cargo} sqlx prepare && ${cargo} test -- --color always";
};
fix = {
format = "cargo fmt";
lint = "cargo clippy --fix";
format = "${cargo} fmt";
lint = "${cargo} sqlx migrate run && ${cargo} sqlx prepare && ${cargo} clippy -- --error-format human --color always --fix";
};
};
});
Expand All @@ -51,6 +54,7 @@
pkgs.sqlx-cli
pkgs.foundry
pkgs.sqlite
pkgs.cargo-watch
];
};
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
-- Add down migration script here

DROP INDEX request__network_id__state__created_at;
DROP INDEX request__network_id__created_at;
DROP INDEX request__sender__network_id__state__created_at;
DROP INDEX request__sender__network_id__created_at;
DROP INDEX request__sender__state__created_at;
DROP INDEX request__sender__created_at;
DROP INDEX request__sequence__network_id__state__created_at;
DROP INDEX request__sequence__network_id__created_at;
DROP INDEX request__sequence__state__created_at;
DROP INDEX request__sequence__created_at;
DROP INDEX request__state__created_at;
DROP INDEX request__created_at;


CREATE INDEX idx_request_sequence ON request (sequence);
CREATE INDEX idx_request_network_id_created_at ON request (network_id, created_at);
CREATE INDEX idx_request_created_at ON request (created_at);
CREATE INDEX idx_request_request_tx_hash ON request (request_tx_hash) WHERE request_tx_hash IS NOT NULL;
CREATE INDEX idx_request_reveal_tx_hash ON request (reveal_tx_hash) WHERE reveal_tx_hash IS NOT NULL;
CREATE INDEX idx_request_sender ON request (sender) WHERE sender IS NOT NULL;
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
-- Add up migration script here

DROP INDEX idx_request_sequence;
DROP INDEX idx_request_network_id_created_at;
DROP INDEX idx_request_created_at;
DROP INDEX idx_request_request_tx_hash;
DROP INDEX idx_request_reveal_tx_hash;
DROP INDEX idx_request_sender;


CREATE INDEX request__network_id__state__created_at ON request(network_id, state, created_at);
CREATE INDEX request__network_id__created_at ON request(network_id, created_at);
CREATE INDEX request__sender__network_id__state__created_at ON request(sender, network_id, state, created_at);
CREATE INDEX request__sender__network_id__created_at ON request(sender, network_id, created_at);
CREATE INDEX request__sender__state__created_at ON request(sender, state, created_at);
CREATE INDEX request__sender__created_at ON request(sender, created_at);
CREATE INDEX request__sequence__network_id__state__created_at ON request(sequence, network_id, state, created_at);
CREATE INDEX request__sequence__network_id__created_at ON request(sequence, network_id, created_at);
CREATE INDEX request__sequence__state__created_at ON request(sequence, state, created_at);
CREATE INDEX request__sequence__created_at ON request(sequence, created_at);
CREATE INDEX request__state__created_at ON request(state, created_at);
CREATE INDEX request__created_at ON request(created_at);
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I got these indexes by using sqlite's cli expert. I did some testing to try to collapse the indices down to a smaller set, but it seems that reordering the columns does not result in indices that are properly reused where you might expect (i.e. I thought that if I swapped state and created_at in the index on line 11, that it would result in not needing the index on line 12, but testing this and checking query plan explain messages indicates that both are needed and reordering just fails to index properly the query that needs the first case).

4 changes: 3 additions & 1 deletion apps/fortuna/src/api/explorer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ pub async fn explorer(
}
let mut query = state.history.query();
if let Some(search) = query_params.query {
query = query.search(search);
query = query
.search(search)
.map_err(|_| RestError::InvalidQueryString)?;
}
if let Some(network_id) = query_params.network_id {
query = query.network_id(network_id);
Expand Down
Loading
Loading