From aab3a7ff97870aea155fbc542c4c0f55ee816341 Mon Sep 17 00:00:00 2001 From: Artem Fomiuk <88630083+Artemka374@users.noreply.github.com> Date: Thu, 30 May 2024 13:20:07 +0300 Subject: [PATCH] fix: fix null protocol version error (#2094) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What ❔ Don't return results with NULL protocol version from DB. ## Why ❔ It's incorrect ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`. --- ...69caa33dfeb1713f9a125f4fdc7e678e191be140bb3177b5a65f.json} | 4 ++-- prover/prover_dal/src/fri_proof_compressor_dal.rs | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) rename prover/prover_dal/.sqlx/{query-9cc6cb602bb0752b51238cfbd568355ae88264eacd2a0c09b116159e76823401.json => query-001cff1d4caf69caa33dfeb1713f9a125f4fdc7e678e191be140bb3177b5a65f.json} (76%) diff --git a/prover/prover_dal/.sqlx/query-9cc6cb602bb0752b51238cfbd568355ae88264eacd2a0c09b116159e76823401.json b/prover/prover_dal/.sqlx/query-001cff1d4caf69caa33dfeb1713f9a125f4fdc7e678e191be140bb3177b5a65f.json similarity index 76% rename from prover/prover_dal/.sqlx/query-9cc6cb602bb0752b51238cfbd568355ae88264eacd2a0c09b116159e76823401.json rename to prover/prover_dal/.sqlx/query-001cff1d4caf69caa33dfeb1713f9a125f4fdc7e678e191be140bb3177b5a65f.json index 229d79f74c17..fd2b8872cf1a 100644 --- a/prover/prover_dal/.sqlx/query-9cc6cb602bb0752b51238cfbd568355ae88264eacd2a0c09b116159e76823401.json +++ b/prover/prover_dal/.sqlx/query-001cff1d4caf69caa33dfeb1713f9a125f4fdc7e678e191be140bb3177b5a65f.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT\n protocol_version,\n COUNT(*) FILTER (\n WHERE\n status = 'queued'\n ) AS queued,\n COUNT(*) FILTER (\n WHERE\n status = 'in_progress'\n ) AS in_progress\n FROM\n proof_compression_jobs_fri\n GROUP BY\n status,\n protocol_version\n ", + "query": "\n SELECT\n protocol_version,\n COUNT(*) FILTER (\n WHERE\n status = 'queued'\n ) AS queued,\n COUNT(*) FILTER (\n WHERE\n status = 'in_progress'\n ) AS in_progress\n FROM\n proof_compression_jobs_fri\n WHERE\n protocol_version IS NOT NULL\n GROUP BY\n status,\n protocol_version\n ", "describe": { "columns": [ { @@ -28,5 +28,5 @@ null ] }, - "hash": "9cc6cb602bb0752b51238cfbd568355ae88264eacd2a0c09b116159e76823401" + "hash": "001cff1d4caf69caa33dfeb1713f9a125f4fdc7e678e191be140bb3177b5a65f" } diff --git a/prover/prover_dal/src/fri_proof_compressor_dal.rs b/prover/prover_dal/src/fri_proof_compressor_dal.rs index 793a15a19dc9..138a6b59b266 100644 --- a/prover/prover_dal/src/fri_proof_compressor_dal.rs +++ b/prover/prover_dal/src/fri_proof_compressor_dal.rs @@ -266,6 +266,8 @@ impl FriProofCompressorDal<'_, '_> { ) AS in_progress FROM proof_compression_jobs_fri + WHERE + protocol_version IS NOT NULL GROUP BY status, protocol_version