Skip to content

Commit

Permalink
Fix queries
Browse files Browse the repository at this point in the history 
Signed-off-by: Danil <[email protected]>
  • Loading branch information
@Deniallugo
Deniallugo committed Sep 23, 2024
1 parent bea060b commit 7711d6a
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 53 deletions.
99 changes: 51 additions & 48 deletions prover/crates/lib/prover_dal/src/cli_test_dal.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,16 @@ impl CliTestDal<'_, '_> {
sequence_number: usize,
) {
sqlx::query!(
"UPDATE prover_jobs_fri SET status = $1
WHERE l1_batch_number = $2
r#"
UPDATE prover_jobs_fri
SET
status = $1
WHERE
l1_batch_number = $2
AND sequence_number = $3
AND aggregation_round = $4
AND circuit_id = $5",
AND circuit_id = $5
"#,
status.to_string(),
batch_number.0 as i64,
sequence_number as i64,
Expand All @@ -44,7 +49,7 @@ impl CliTestDal<'_, '_> {
circuit_id: u8,
) {
sqlx::query!(
"
r#"
INSERT INTO
leaf_aggregation_witness_jobs_fri (
l1_batch_number,
Expand All @@ -58,8 +63,9 @@ impl CliTestDal<'_, '_> {
($1, $2, 'waiting_for_proofs', 2, NOW(), NOW())
ON CONFLICT (l1_batch_number, circuit_id) DO
UPDATE
SET status = $3
",
SET
status = $3
"#,
batch_number.0 as i64,
circuit_id as i16,
status.to_string()
Expand All @@ -76,21 +82,16 @@ impl CliTestDal<'_, '_> {
circuit_id: u8,
) {
sqlx::query!(
"
r#"
INSERT INTO
node_aggregation_witness_jobs_fri (
l1_batch_number,
circuit_id,
status,
created_at,
updated_at
)
node_aggregation_witness_jobs_fri (l1_batch_number, circuit_id, status, created_at, updated_at)
VALUES
($1, $2, 'waiting_for_proofs', NOW(), NOW())
ON CONFLICT (l1_batch_number, circuit_id, depth) DO
UPDATE
SET status = $3
",
SET
status = $3
"#,
batch_number.0 as i64,
circuit_id as i16,
status.to_string(),
Expand All @@ -102,21 +103,16 @@ impl CliTestDal<'_, '_> {

pub async fn insert_rt_job(&mut self, status: WitnessJobStatus, batch_number: L1BatchNumber) {
sqlx::query!(
"
r#"
INSERT INTO
recursion_tip_witness_jobs_fri (
l1_batch_number,
status,
number_of_final_node_jobs,
created_at,
updated_at
)
recursion_tip_witness_jobs_fri (l1_batch_number, status, number_of_final_node_jobs, created_at, updated_at)
VALUES
($1, 'waiting_for_proofs',1, NOW(), NOW())
($1, 'waiting_for_proofs', 1, NOW(), NOW())
ON CONFLICT (l1_batch_number) DO
UPDATE
SET status = $2
",
SET
status = $2
"#,
batch_number.0 as i64,
status.to_string(),
)
Expand All @@ -131,7 +127,7 @@ impl CliTestDal<'_, '_> {
batch_number: L1BatchNumber,
) {
sqlx::query!(
"
r#"
INSERT INTO
scheduler_witness_jobs_fri (
l1_batch_number,
Expand All @@ -144,8 +140,9 @@ impl CliTestDal<'_, '_> {
($1, '', 'waiting_for_proofs', NOW(), NOW())
ON CONFLICT (l1_batch_number) DO
UPDATE
SET status = $2
",
SET
status = $2
"#,
batch_number.0 as i64,
status.to_string(),
)
Expand All @@ -160,20 +157,16 @@ impl CliTestDal<'_, '_> {
batch_number: L1BatchNumber,
) {
sqlx::query!(
"
r#"
INSERT INTO
proof_compression_jobs_fri (
l1_batch_number,
status,
created_at,
updated_at
)
proof_compression_jobs_fri (l1_batch_number, status, created_at, updated_at)
VALUES
($1, $2, NOW(), NOW())
ON CONFLICT (l1_batch_number) DO
UPDATE
SET status = $2
",
SET
status = $2
"#,
batch_number.0 as i64,
status.to_string(),
)
Expand All @@ -192,12 +185,17 @@ impl CliTestDal<'_, '_> {
sequence_number: usize,
) {
sqlx::query!(
"UPDATE prover_jobs_fri
SET status = $1, attempts = $2
WHERE l1_batch_number = $3
AND sequence_number =$4
r#"
UPDATE prover_jobs_fri
SET
status = $1,
attempts = $2
WHERE
l1_batch_number = $3
AND sequence_number = $4
AND aggregation_round = $5
AND circuit_id = $6",
AND circuit_id = $6
"#,
status.to_string(),
attempts as i64,
batch_number.0 as i64,
Expand All @@ -218,10 +216,15 @@ impl CliTestDal<'_, '_> {
batch_number: L1BatchNumber,
) {
sqlx::query!(
"UPDATE leaf_aggregation_witness_jobs_fri
SET status = $1, attempts = $2
WHERE l1_batch_number = $3
AND circuit_id = $4",
r#"
UPDATE leaf_aggregation_witness_jobs_fri
SET
status = $1,
attempts = $2
WHERE
l1_batch_number = $3
AND circuit_id = $4
"#,
status.to_string(),
attempts as i64,
batch_number.0 as i64,
Expand Down
10 changes: 8 additions & 2 deletions prover/crates/lib/prover_dal/src/fri_prover_dal.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,14 @@ impl FriProverDal<'_, '_> {
SELECT
protocol_version AS "protocol_version!",
protocol_version_patch AS "protocol_version_patch!",
COUNT(*) FILTER (WHERE status = 'queued') as queued,
COUNT(*) FILTER (WHERE status = 'in_progress') as in_progress
COUNT(*) FILTER (
WHERE
status = 'queued'
) AS queued,
COUNT(*) FILTER (
WHERE
status = 'in_progress'
) AS in_progress
FROM
prover_jobs_fri
WHERE
Expand Down
15 changes: 12 additions & 3 deletions prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,10 @@ impl FriWitnessGeneratorDal<'_, '_> {
WHERE
l1_batch_number = $1
AND attempts >= $2
AND (status = 'in_progress' OR status = 'failed')
AND (
status = 'in_progress'
OR status = 'failed'
)
RETURNING
l1_batch_number,
status,
Expand Down Expand Up @@ -1786,7 +1789,10 @@ impl FriWitnessGeneratorDal<'_, '_> {
WHERE
l1_batch_number = $1
AND attempts >= $2
AND (status = 'in_progress' OR status = 'failed')
AND (
status = 'in_progress'
OR status = 'failed'
)
RETURNING
l1_batch_number,
status,
Expand Down Expand Up @@ -1827,7 +1833,10 @@ impl FriWitnessGeneratorDal<'_, '_> {
WHERE
l1_batch_number = $1
AND attempts >= $2
AND (status = 'in_progress' OR status = 'failed')
AND (
status = 'in_progress'
OR status = 'failed'
)
RETURNING
l1_batch_number,
status,
Expand Down

0 comments on commit 7711d6a

Please sign in to comment.