diff --git a/crates/bin/docs_rs_admin/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json b/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json similarity index 62% rename from crates/bin/docs_rs_admin/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json rename to .sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json index 403de85f9..e1d0c0a19 100644 --- a/crates/bin/docs_rs_admin/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json +++ b/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT id\n FROM queue\n WHERE\n attempt < $1 AND\n name = $2 AND\n version = $3\n ", + "query": "SELECT id\n FROM queue\n WHERE\n name = $1 AND\n version = $2\n ", "describe": { "columns": [ { @@ -11,7 +11,6 @@ ], "parameters": { "Left": [ - "Int4", "Text", "Text" ] @@ -20,5 +19,5 @@ false ] }, - "hash": "f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c" + "hash": "412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb" } diff --git a/crates/bin/cratesfyi/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json b/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json similarity index 79% rename from crates/bin/cratesfyi/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json rename to .sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json index 59d4a4eaf..f25ade8d2 100644 --- a/crates/bin/cratesfyi/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json +++ b/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE attempt < $1\n ORDER BY priority ASC, attempt ASC, id ASC", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", "describe": { "columns": [ { @@ -35,9 +35,7 @@ } ], "parameters": { - "Left": [ - "Int4" - ] + "Left": [] }, "nullable": [ false, @@ -48,5 +46,5 @@ false ] }, - "hash": "7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168" + "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" } diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-bcb6953f312804ebdad0370c2eaf2c816378c236c5d2028c3882a1b12c6362a1.json b/.sqlx/query-946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31.json similarity index 52% rename from crates/lib/docs_rs_build_queue/.sqlx/query-bcb6953f312804ebdad0370c2eaf2c816378c236c5d2028c3882a1b12c6362a1.json rename to .sqlx/query-946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31.json index 4315981d1..bb7672ba2 100644 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-bcb6953f312804ebdad0370c2eaf2c816378c236c5d2028c3882a1b12c6362a1.json +++ b/.sqlx/query-946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "UPDATE queue SET attempt = 6", + "query": "DELETE FROM queue", "describe": { "columns": [], "parameters": { @@ -8,5 +8,5 @@ }, "nullable": [] }, - "hash": "bcb6953f312804ebdad0370c2eaf2c816378c236c5d2028c3882a1b12c6362a1" + "hash": "946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31" } diff --git a/crates/bin/cratesfyi/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json b/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json similarity index 50% rename from crates/bin/cratesfyi/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json rename to .sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json index 4f561d6a6..0ebe18d32 100644 --- a/crates/bin/cratesfyi/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json +++ b/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n WHERE attempt < $1\n GROUP BY priority", + "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n GROUP BY priority", "describe": { "columns": [ { @@ -15,14 +15,12 @@ } ], "parameters": { - "Left": [ - "Int4" - ] + "Left": [] }, "nullable": [ false, null ] }, - "hash": "a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3" + "hash": "ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064" } diff --git a/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json b/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json deleted file mode 100644 index ba6be127c..000000000 --- a/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT COUNT(*) as \"count!\" FROM queue WHERE attempt >= $1;", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - null - ] - }, - "hash": "d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570" -} diff --git a/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json b/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json similarity index 61% rename from .sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json rename to .sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json index 14efdbfd4..530ae1ffe 100644 --- a/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json +++ b/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json @@ -1,17 +1,16 @@ { "db_name": "PostgreSQL", - "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n AND attempt < $4\n ", + "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n ", "describe": { "columns": [], "parameters": { "Left": [ "Int4", "Text", - "Text", - "Int4" + "Text" ] }, "nullable": [] }, - "hash": "130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c" + "hash": "e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671" } diff --git a/crates/bin/cratesfyi/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json b/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json similarity index 73% rename from crates/bin/cratesfyi/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json rename to .sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json index ae5a0b475..57870465c 100644 --- a/crates/bin/cratesfyi/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json +++ b/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n attempt < $1 AND\n (last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $2))\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $1)\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", "describe": { "columns": [ { @@ -36,7 +36,6 @@ ], "parameters": { "Left": [ - "Int4", "Float8" ] }, @@ -49,5 +48,5 @@ false ] }, - "hash": "48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349" + "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" } diff --git a/crates/bin/cratesfyi/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json b/crates/bin/cratesfyi/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json similarity index 62% rename from crates/bin/cratesfyi/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json rename to crates/bin/cratesfyi/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json index 403de85f9..e1d0c0a19 100644 --- a/crates/bin/cratesfyi/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json +++ b/crates/bin/cratesfyi/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT id\n FROM queue\n WHERE\n attempt < $1 AND\n name = $2 AND\n version = $3\n ", + "query": "SELECT id\n FROM queue\n WHERE\n name = $1 AND\n version = $2\n ", "describe": { "columns": [ { @@ -11,7 +11,6 @@ ], "parameters": { "Left": [ - "Int4", "Text", "Text" ] @@ -20,5 +19,5 @@ false ] }, - "hash": "f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c" + "hash": "412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb" } diff --git a/crates/bin/docs_rs_admin/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json b/crates/bin/cratesfyi/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json similarity index 79% rename from crates/bin/docs_rs_admin/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json rename to crates/bin/cratesfyi/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json index 59d4a4eaf..f25ade8d2 100644 --- a/crates/bin/docs_rs_admin/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json +++ b/crates/bin/cratesfyi/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE attempt < $1\n ORDER BY priority ASC, attempt ASC, id ASC", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", "describe": { "columns": [ { @@ -35,9 +35,7 @@ } ], "parameters": { - "Left": [ - "Int4" - ] + "Left": [] }, "nullable": [ false, @@ -48,5 +46,5 @@ false ] }, - "hash": "7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168" + "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" } diff --git a/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json b/crates/bin/cratesfyi/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json similarity index 50% rename from .sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json rename to crates/bin/cratesfyi/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json index 4f561d6a6..0ebe18d32 100644 --- a/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json +++ b/crates/bin/cratesfyi/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n WHERE attempt < $1\n GROUP BY priority", + "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n GROUP BY priority", "describe": { "columns": [ { @@ -15,14 +15,12 @@ } ], "parameters": { - "Left": [ - "Int4" - ] + "Left": [] }, "nullable": [ false, null ] }, - "hash": "a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3" + "hash": "ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064" } diff --git a/crates/bin/cratesfyi/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json b/crates/bin/cratesfyi/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json deleted file mode 100644 index ba6be127c..000000000 --- a/crates/bin/cratesfyi/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT COUNT(*) as \"count!\" FROM queue WHERE attempt >= $1;", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - null - ] - }, - "hash": "d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570" -} diff --git a/crates/bin/docs_rs_admin/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json b/crates/bin/cratesfyi/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json similarity index 61% rename from crates/bin/docs_rs_admin/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json rename to crates/bin/cratesfyi/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json index 14efdbfd4..530ae1ffe 100644 --- a/crates/bin/docs_rs_admin/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json +++ b/crates/bin/cratesfyi/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json @@ -1,17 +1,16 @@ { "db_name": "PostgreSQL", - "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n AND attempt < $4\n ", + "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n ", "describe": { "columns": [], "parameters": { "Left": [ "Int4", "Text", - "Text", - "Int4" + "Text" ] }, "nullable": [] }, - "hash": "130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c" + "hash": "e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671" } diff --git a/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json b/crates/bin/cratesfyi/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json similarity index 73% rename from .sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json rename to crates/bin/cratesfyi/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json index ae5a0b475..57870465c 100644 --- a/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json +++ b/crates/bin/cratesfyi/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n attempt < $1 AND\n (last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $2))\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $1)\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", "describe": { "columns": [ { @@ -36,7 +36,6 @@ ], "parameters": { "Left": [ - "Int4", "Float8" ] }, @@ -49,5 +48,5 @@ false ] }, - "hash": "48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349" + "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" } diff --git a/crates/bin/docs_rs_builder/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json b/crates/bin/docs_rs_admin/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json similarity index 62% rename from crates/bin/docs_rs_builder/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json rename to crates/bin/docs_rs_admin/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json index 403de85f9..e1d0c0a19 100644 --- a/crates/bin/docs_rs_builder/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json +++ b/crates/bin/docs_rs_admin/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT id\n FROM queue\n WHERE\n attempt < $1 AND\n name = $2 AND\n version = $3\n ", + "query": "SELECT id\n FROM queue\n WHERE\n name = $1 AND\n version = $2\n ", "describe": { "columns": [ { @@ -11,7 +11,6 @@ ], "parameters": { "Left": [ - "Int4", "Text", "Text" ] @@ -20,5 +19,5 @@ false ] }, - "hash": "f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c" + "hash": "412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb" } diff --git a/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json b/crates/bin/docs_rs_admin/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json similarity index 79% rename from .sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json rename to crates/bin/docs_rs_admin/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json index 59d4a4eaf..f25ade8d2 100644 --- a/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json +++ b/crates/bin/docs_rs_admin/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE attempt < $1\n ORDER BY priority ASC, attempt ASC, id ASC", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", "describe": { "columns": [ { @@ -35,9 +35,7 @@ } ], "parameters": { - "Left": [ - "Int4" - ] + "Left": [] }, "nullable": [ false, @@ -48,5 +46,5 @@ false ] }, - "hash": "7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168" + "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" } diff --git a/crates/bin/docs_rs_admin/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json b/crates/bin/docs_rs_admin/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json similarity index 50% rename from crates/bin/docs_rs_admin/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json rename to crates/bin/docs_rs_admin/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json index 4f561d6a6..0ebe18d32 100644 --- a/crates/bin/docs_rs_admin/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json +++ b/crates/bin/docs_rs_admin/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n WHERE attempt < $1\n GROUP BY priority", + "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n GROUP BY priority", "describe": { "columns": [ { @@ -15,14 +15,12 @@ } ], "parameters": { - "Left": [ - "Int4" - ] + "Left": [] }, "nullable": [ false, null ] }, - "hash": "a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3" + "hash": "ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064" } diff --git a/crates/bin/docs_rs_admin/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json b/crates/bin/docs_rs_admin/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json deleted file mode 100644 index ba6be127c..000000000 --- a/crates/bin/docs_rs_admin/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT COUNT(*) as \"count!\" FROM queue WHERE attempt >= $1;", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - null - ] - }, - "hash": "d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570" -} diff --git a/crates/bin/cratesfyi/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json b/crates/bin/docs_rs_admin/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json similarity index 61% rename from crates/bin/cratesfyi/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json rename to crates/bin/docs_rs_admin/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json index 14efdbfd4..530ae1ffe 100644 --- a/crates/bin/cratesfyi/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json +++ b/crates/bin/docs_rs_admin/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json @@ -1,17 +1,16 @@ { "db_name": "PostgreSQL", - "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n AND attempt < $4\n ", + "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n ", "describe": { "columns": [], "parameters": { "Left": [ "Int4", "Text", - "Text", - "Int4" + "Text" ] }, "nullable": [] }, - "hash": "130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c" + "hash": "e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671" } diff --git a/crates/bin/docs_rs_admin/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json b/crates/bin/docs_rs_admin/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json similarity index 73% rename from crates/bin/docs_rs_admin/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json rename to crates/bin/docs_rs_admin/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json index ae5a0b475..57870465c 100644 --- a/crates/bin/docs_rs_admin/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json +++ b/crates/bin/docs_rs_admin/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n attempt < $1 AND\n (last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $2))\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $1)\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", "describe": { "columns": [ { @@ -36,7 +36,6 @@ ], "parameters": { "Left": [ - "Int4", "Float8" ] }, @@ -49,5 +48,5 @@ false ] }, - "hash": "48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349" + "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" } diff --git a/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json b/crates/bin/docs_rs_builder/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json similarity index 62% rename from .sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json rename to crates/bin/docs_rs_builder/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json index 403de85f9..e1d0c0a19 100644 --- a/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json +++ b/crates/bin/docs_rs_builder/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT id\n FROM queue\n WHERE\n attempt < $1 AND\n name = $2 AND\n version = $3\n ", + "query": "SELECT id\n FROM queue\n WHERE\n name = $1 AND\n version = $2\n ", "describe": { "columns": [ { @@ -11,7 +11,6 @@ ], "parameters": { "Left": [ - "Int4", "Text", "Text" ] @@ -20,5 +19,5 @@ false ] }, - "hash": "f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c" + "hash": "412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb" } diff --git a/crates/bin/docs_rs_builder/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json b/crates/bin/docs_rs_builder/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json similarity index 79% rename from crates/bin/docs_rs_builder/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json rename to crates/bin/docs_rs_builder/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json index 59d4a4eaf..f25ade8d2 100644 --- a/crates/bin/docs_rs_builder/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json +++ b/crates/bin/docs_rs_builder/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE attempt < $1\n ORDER BY priority ASC, attempt ASC, id ASC", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", "describe": { "columns": [ { @@ -35,9 +35,7 @@ } ], "parameters": { - "Left": [ - "Int4" - ] + "Left": [] }, "nullable": [ false, @@ -48,5 +46,5 @@ false ] }, - "hash": "7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168" + "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" } diff --git a/crates/bin/docs_rs_builder/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json b/crates/bin/docs_rs_builder/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json similarity index 50% rename from crates/bin/docs_rs_builder/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json rename to crates/bin/docs_rs_builder/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json index 4f561d6a6..0ebe18d32 100644 --- a/crates/bin/docs_rs_builder/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json +++ b/crates/bin/docs_rs_builder/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n WHERE attempt < $1\n GROUP BY priority", + "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n GROUP BY priority", "describe": { "columns": [ { @@ -15,14 +15,12 @@ } ], "parameters": { - "Left": [ - "Int4" - ] + "Left": [] }, "nullable": [ false, null ] }, - "hash": "a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3" + "hash": "ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064" } diff --git a/crates/bin/docs_rs_builder/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json b/crates/bin/docs_rs_builder/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json deleted file mode 100644 index ba6be127c..000000000 --- a/crates/bin/docs_rs_builder/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT COUNT(*) as \"count!\" FROM queue WHERE attempt >= $1;", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - null - ] - }, - "hash": "d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570" -} diff --git a/crates/bin/docs_rs_builder/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json b/crates/bin/docs_rs_builder/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json similarity index 61% rename from crates/bin/docs_rs_builder/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json rename to crates/bin/docs_rs_builder/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json index 14efdbfd4..530ae1ffe 100644 --- a/crates/bin/docs_rs_builder/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json +++ b/crates/bin/docs_rs_builder/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json @@ -1,17 +1,16 @@ { "db_name": "PostgreSQL", - "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n AND attempt < $4\n ", + "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n ", "describe": { "columns": [], "parameters": { "Left": [ "Int4", "Text", - "Text", - "Int4" + "Text" ] }, "nullable": [] }, - "hash": "130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c" + "hash": "e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671" } diff --git a/crates/bin/docs_rs_builder/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json b/crates/bin/docs_rs_builder/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json similarity index 73% rename from crates/bin/docs_rs_builder/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json rename to crates/bin/docs_rs_builder/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json index ae5a0b475..57870465c 100644 --- a/crates/bin/docs_rs_builder/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json +++ b/crates/bin/docs_rs_builder/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n attempt < $1 AND\n (last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $2))\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $1)\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", "describe": { "columns": [ { @@ -36,7 +36,6 @@ ], "parameters": { "Left": [ - "Int4", "Float8" ] }, @@ -49,5 +48,5 @@ false ] }, - "hash": "48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349" + "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" } diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json b/crates/bin/docs_rs_watcher/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json deleted file mode 100644 index 14efdbfd4..000000000 --- a/crates/bin/docs_rs_watcher/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n AND attempt < $4\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int4", - "Text", - "Text", - "Int4" - ] - }, - "nullable": [] - }, - "hash": "130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c" -} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json b/crates/bin/docs_rs_watcher/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json new file mode 100644 index 000000000..e1d0c0a19 --- /dev/null +++ b/crates/bin/docs_rs_watcher/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT id\n FROM queue\n WHERE\n name = $1 AND\n version = $2\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Text", + "Text" + ] + }, + "nullable": [ + false + ] + }, + "hash": "412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb" +} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json b/crates/bin/docs_rs_watcher/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json deleted file mode 100644 index ae5a0b475..000000000 --- a/crates/bin/docs_rs_watcher/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n attempt < $1 AND\n (last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $2))\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "name: KrateName", - "type_info": "Text" - }, - { - "ordinal": 2, - "name": "version: Version", - "type_info": "Text" - }, - { - "ordinal": 3, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, - "name": "attempt", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4", - "Float8" - ] - }, - "nullable": [ - false, - false, - false, - false, - true, - false - ] - }, - "hash": "48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349" -} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json b/crates/bin/docs_rs_watcher/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json deleted file mode 100644 index 59d4a4eaf..000000000 --- a/crates/bin/docs_rs_watcher/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE attempt < $1\n ORDER BY priority ASC, attempt ASC, id ASC", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "name: KrateName", - "type_info": "Text" - }, - { - "ordinal": 2, - "name": "version: Version", - "type_info": "Text" - }, - { - "ordinal": 3, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, - "name": "attempt", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - false, - false, - false, - false, - true, - false - ] - }, - "hash": "7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168" -} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/bin/docs_rs_watcher/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json new file mode 100644 index 000000000..f25ade8d2 --- /dev/null +++ b/crates/bin/docs_rs_watcher/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json @@ -0,0 +1,50 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "name: KrateName", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "version: Version", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 4, + "name": "registry", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + false, + false, + false, + true, + false + ] + }, + "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" +} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-7fad5d5fdee0a32f79f34f22bee0e8cfc48521abe29f2570be40e76d9b5bab16.json b/crates/bin/docs_rs_watcher/.sqlx/query-946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31.json similarity index 52% rename from crates/bin/docs_rs_watcher/.sqlx/query-7fad5d5fdee0a32f79f34f22bee0e8cfc48521abe29f2570be40e76d9b5bab16.json rename to crates/bin/docs_rs_watcher/.sqlx/query-946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31.json index 2855df519..bb7672ba2 100644 --- a/crates/bin/docs_rs_watcher/.sqlx/query-7fad5d5fdee0a32f79f34f22bee0e8cfc48521abe29f2570be40e76d9b5bab16.json +++ b/crates/bin/docs_rs_watcher/.sqlx/query-946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "UPDATE queue SET attempt = 99", + "query": "DELETE FROM queue", "describe": { "columns": [], "parameters": { @@ -8,5 +8,5 @@ }, "nullable": [] }, - "hash": "7fad5d5fdee0a32f79f34f22bee0e8cfc48521abe29f2570be40e76d9b5bab16" + "hash": "946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31" } diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json b/crates/bin/docs_rs_watcher/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json deleted file mode 100644 index 4f561d6a6..000000000 --- a/crates/bin/docs_rs_watcher/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n WHERE attempt < $1\n GROUP BY priority", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - false, - null - ] - }, - "hash": "a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3" -} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json b/crates/bin/docs_rs_watcher/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json new file mode 100644 index 000000000..0ebe18d32 --- /dev/null +++ b/crates/bin/docs_rs_watcher/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json @@ -0,0 +1,26 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n GROUP BY priority", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "count!", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + null + ] + }, + "hash": "ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064" +} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json b/crates/bin/docs_rs_watcher/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json deleted file mode 100644 index ba6be127c..000000000 --- a/crates/bin/docs_rs_watcher/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT COUNT(*) as \"count!\" FROM queue WHERE attempt >= $1;", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - null - ] - }, - "hash": "d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570" -} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json b/crates/bin/docs_rs_watcher/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json new file mode 100644 index 000000000..530ae1ffe --- /dev/null +++ b/crates/bin/docs_rs_watcher/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int4", + "Text", + "Text" + ] + }, + "nullable": [] + }, + "hash": "e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671" +} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/bin/docs_rs_watcher/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json new file mode 100644 index 000000000..57870465c --- /dev/null +++ b/crates/bin/docs_rs_watcher/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json @@ -0,0 +1,52 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $1)\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "name: KrateName", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "version: Version", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 4, + "name": "registry", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Float8" + ] + }, + "nullable": [ + false, + false, + false, + false, + true, + false + ] + }, + "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" +} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json b/crates/bin/docs_rs_watcher/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json deleted file mode 100644 index 403de85f9..000000000 --- a/crates/bin/docs_rs_watcher/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT id\n FROM queue\n WHERE\n attempt < $1 AND\n name = $2 AND\n version = $3\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4", - "Text", - "Text" - ] - }, - "nullable": [ - false - ] - }, - "hash": "f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c" -} diff --git a/crates/bin/docs_rs_watcher/src/rebuilds.rs b/crates/bin/docs_rs_watcher/src/rebuilds.rs index 8c52d43a1..0ca5ff6a2 100644 --- a/crates/bin/docs_rs_watcher/src/rebuilds.rs +++ b/crates/bin/docs_rs_watcher/src/rebuilds.rs @@ -131,7 +131,7 @@ mod tests { .await?; let mut conn = env.async_conn().await?; - sqlx::query!("UPDATE queue SET attempt = 99") + sqlx::query!("DELETE FROM queue") .execute(&mut *conn) .await?; diff --git a/crates/bin/docs_rs_watcher/src/service_metrics.rs b/crates/bin/docs_rs_watcher/src/service_metrics.rs index 218ef78d9..53a3b3bb7 100644 --- a/crates/bin/docs_rs_watcher/src/service_metrics.rs +++ b/crates/bin/docs_rs_watcher/src/service_metrics.rs @@ -8,7 +8,6 @@ use std::collections::HashSet; pub struct OtelServiceMetrics { pub queued_crates_count: Gauge, pub prioritized_crates_count: Gauge, - pub failed_crates_count: Gauge, pub queue_is_locked: Gauge, pub queued_crates_count_by_priority: Gauge, } @@ -26,10 +25,6 @@ impl OtelServiceMetrics { .u64_gauge(format!("{PREFIX}.prioritized_crates_count")) .with_unit("1") .build(), - failed_crates_count: meter - .u64_gauge(format!("{PREFIX}.failed_crates_count")) - .with_unit("1") - .build(), queue_is_locked: meter .u64_gauge(format!("{PREFIX}.queue_is_locked")) .with_unit("1") @@ -74,9 +69,6 @@ impl OtelServiceMetrics { ); } - self.failed_crates_count - .record(queue.failed_count().await? as u64, &[]); - Ok(()) } } diff --git a/crates/bin/docs_rs_web/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json b/crates/bin/docs_rs_web/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json deleted file mode 100644 index 14efdbfd4..000000000 --- a/crates/bin/docs_rs_web/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n AND attempt < $4\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int4", - "Text", - "Text", - "Int4" - ] - }, - "nullable": [] - }, - "hash": "130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c" -} diff --git a/crates/bin/docs_rs_web/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json b/crates/bin/docs_rs_web/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json new file mode 100644 index 000000000..e1d0c0a19 --- /dev/null +++ b/crates/bin/docs_rs_web/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT id\n FROM queue\n WHERE\n name = $1 AND\n version = $2\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Text", + "Text" + ] + }, + "nullable": [ + false + ] + }, + "hash": "412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb" +} diff --git a/crates/bin/docs_rs_web/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json b/crates/bin/docs_rs_web/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json deleted file mode 100644 index ae5a0b475..000000000 --- a/crates/bin/docs_rs_web/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n attempt < $1 AND\n (last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $2))\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "name: KrateName", - "type_info": "Text" - }, - { - "ordinal": 2, - "name": "version: Version", - "type_info": "Text" - }, - { - "ordinal": 3, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, - "name": "attempt", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4", - "Float8" - ] - }, - "nullable": [ - false, - false, - false, - false, - true, - false - ] - }, - "hash": "48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349" -} diff --git a/crates/bin/docs_rs_web/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json b/crates/bin/docs_rs_web/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json deleted file mode 100644 index 59d4a4eaf..000000000 --- a/crates/bin/docs_rs_web/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE attempt < $1\n ORDER BY priority ASC, attempt ASC, id ASC", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "name: KrateName", - "type_info": "Text" - }, - { - "ordinal": 2, - "name": "version: Version", - "type_info": "Text" - }, - { - "ordinal": 3, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, - "name": "attempt", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - false, - false, - false, - false, - true, - false - ] - }, - "hash": "7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168" -} diff --git a/crates/bin/docs_rs_web/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/bin/docs_rs_web/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json new file mode 100644 index 000000000..f25ade8d2 --- /dev/null +++ b/crates/bin/docs_rs_web/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json @@ -0,0 +1,50 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "name: KrateName", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "version: Version", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 4, + "name": "registry", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + false, + false, + false, + true, + false + ] + }, + "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" +} diff --git a/crates/bin/docs_rs_web/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json b/crates/bin/docs_rs_web/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json deleted file mode 100644 index 4f561d6a6..000000000 --- a/crates/bin/docs_rs_web/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n WHERE attempt < $1\n GROUP BY priority", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - false, - null - ] - }, - "hash": "a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3" -} diff --git a/crates/bin/docs_rs_web/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json b/crates/bin/docs_rs_web/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json new file mode 100644 index 000000000..0ebe18d32 --- /dev/null +++ b/crates/bin/docs_rs_web/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json @@ -0,0 +1,26 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n GROUP BY priority", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "count!", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + null + ] + }, + "hash": "ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064" +} diff --git a/crates/bin/docs_rs_web/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json b/crates/bin/docs_rs_web/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json deleted file mode 100644 index ba6be127c..000000000 --- a/crates/bin/docs_rs_web/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT COUNT(*) as \"count!\" FROM queue WHERE attempt >= $1;", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - null - ] - }, - "hash": "d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570" -} diff --git a/crates/bin/docs_rs_web/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json b/crates/bin/docs_rs_web/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json new file mode 100644 index 000000000..530ae1ffe --- /dev/null +++ b/crates/bin/docs_rs_web/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int4", + "Text", + "Text" + ] + }, + "nullable": [] + }, + "hash": "e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671" +} diff --git a/crates/bin/docs_rs_web/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/bin/docs_rs_web/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json new file mode 100644 index 000000000..57870465c --- /dev/null +++ b/crates/bin/docs_rs_web/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json @@ -0,0 +1,52 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $1)\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "name: KrateName", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "version: Version", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 4, + "name": "registry", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Float8" + ] + }, + "nullable": [ + false, + false, + false, + false, + true, + false + ] + }, + "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" +} diff --git a/crates/bin/docs_rs_web/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json b/crates/bin/docs_rs_web/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json deleted file mode 100644 index 403de85f9..000000000 --- a/crates/bin/docs_rs_web/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT id\n FROM queue\n WHERE\n attempt < $1 AND\n name = $2 AND\n version = $3\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4", - "Text", - "Text" - ] - }, - "nullable": [ - false - ] - }, - "hash": "f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c" -} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json b/crates/lib/docs_rs_build_queue/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json deleted file mode 100644 index 14efdbfd4..000000000 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n AND attempt < $4\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int4", - "Text", - "Text", - "Int4" - ] - }, - "nullable": [] - }, - "hash": "130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c" -} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-276400867113567750e95f66264185a6347ca3ae4b703914c08c57d5ac5580af.json b/crates/lib/docs_rs_build_queue/.sqlx/query-276400867113567750e95f66264185a6347ca3ae4b703914c08c57d5ac5580af.json new file mode 100644 index 000000000..f5bff3a36 --- /dev/null +++ b/crates/lib/docs_rs_build_queue/.sqlx/query-276400867113567750e95f66264185a6347ca3ae4b703914c08c57d5ac5580af.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO queue (name, version, priority, attempt, last_attempt )\n VALUES ($1, $2, 0, 5, NOW())", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text" + ] + }, + "nullable": [] + }, + "hash": "276400867113567750e95f66264185a6347ca3ae4b703914c08c57d5ac5580af" +} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json b/crates/lib/docs_rs_build_queue/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json new file mode 100644 index 000000000..e1d0c0a19 --- /dev/null +++ b/crates/lib/docs_rs_build_queue/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT id\n FROM queue\n WHERE\n name = $1 AND\n version = $2\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Text", + "Text" + ] + }, + "nullable": [ + false + ] + }, + "hash": "412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb" +} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json b/crates/lib/docs_rs_build_queue/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json deleted file mode 100644 index ae5a0b475..000000000 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n attempt < $1 AND\n (last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $2))\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "name: KrateName", - "type_info": "Text" - }, - { - "ordinal": 2, - "name": "version: Version", - "type_info": "Text" - }, - { - "ordinal": 3, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, - "name": "attempt", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4", - "Float8" - ] - }, - "nullable": [ - false, - false, - false, - false, - true, - false - ] - }, - "hash": "48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349" -} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json b/crates/lib/docs_rs_build_queue/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json deleted file mode 100644 index 59d4a4eaf..000000000 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE attempt < $1\n ORDER BY priority ASC, attempt ASC, id ASC", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "name: KrateName", - "type_info": "Text" - }, - { - "ordinal": 2, - "name": "version: Version", - "type_info": "Text" - }, - { - "ordinal": 3, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, - "name": "attempt", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - false, - false, - false, - false, - true, - false - ] - }, - "hash": "7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168" -} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/lib/docs_rs_build_queue/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json new file mode 100644 index 000000000..f25ade8d2 --- /dev/null +++ b/crates/lib/docs_rs_build_queue/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json @@ -0,0 +1,50 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "name: KrateName", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "version: Version", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 4, + "name": "registry", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + false, + false, + false, + true, + false + ] + }, + "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" +} diff --git a/.sqlx/query-7fad5d5fdee0a32f79f34f22bee0e8cfc48521abe29f2570be40e76d9b5bab16.json b/crates/lib/docs_rs_build_queue/.sqlx/query-946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31.json similarity index 52% rename from .sqlx/query-7fad5d5fdee0a32f79f34f22bee0e8cfc48521abe29f2570be40e76d9b5bab16.json rename to crates/lib/docs_rs_build_queue/.sqlx/query-946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31.json index 2855df519..bb7672ba2 100644 --- a/.sqlx/query-7fad5d5fdee0a32f79f34f22bee0e8cfc48521abe29f2570be40e76d9b5bab16.json +++ b/crates/lib/docs_rs_build_queue/.sqlx/query-946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "UPDATE queue SET attempt = 99", + "query": "DELETE FROM queue", "describe": { "columns": [], "parameters": { @@ -8,5 +8,5 @@ }, "nullable": [] }, - "hash": "7fad5d5fdee0a32f79f34f22bee0e8cfc48521abe29f2570be40e76d9b5bab16" + "hash": "946de01935ee281874744ced08e7af117701e86fd1119c77da01271940a0ea31" } diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-a23b671c7833d7c58238dbc7e8e9f46cae9db2b0c273e3245d9458614bf1243d.json b/crates/lib/docs_rs_build_queue/.sqlx/query-a23b671c7833d7c58238dbc7e8e9f46cae9db2b0c273e3245d9458614bf1243d.json deleted file mode 100644 index f001ab425..000000000 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-a23b671c7833d7c58238dbc7e8e9f46cae9db2b0c273e3245d9458614bf1243d.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n INSERT INTO queue (name, version, priority, attempt, last_attempt )\n VALUES ($1, $2, 0, 99, NOW())", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Text", - "Text" - ] - }, - "nullable": [] - }, - "hash": "a23b671c7833d7c58238dbc7e8e9f46cae9db2b0c273e3245d9458614bf1243d" -} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json b/crates/lib/docs_rs_build_queue/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json deleted file mode 100644 index 4f561d6a6..000000000 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n WHERE attempt < $1\n GROUP BY priority", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - false, - null - ] - }, - "hash": "a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3" -} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json b/crates/lib/docs_rs_build_queue/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json new file mode 100644 index 000000000..0ebe18d32 --- /dev/null +++ b/crates/lib/docs_rs_build_queue/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json @@ -0,0 +1,26 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n GROUP BY priority", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "count!", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + null + ] + }, + "hash": "ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064" +} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json b/crates/lib/docs_rs_build_queue/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json deleted file mode 100644 index ba6be127c..000000000 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT COUNT(*) as \"count!\" FROM queue WHERE attempt >= $1;", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - null - ] - }, - "hash": "d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570" -} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json b/crates/lib/docs_rs_build_queue/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json new file mode 100644 index 000000000..530ae1ffe --- /dev/null +++ b/crates/lib/docs_rs_build_queue/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int4", + "Text", + "Text" + ] + }, + "nullable": [] + }, + "hash": "e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671" +} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/lib/docs_rs_build_queue/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json new file mode 100644 index 000000000..57870465c --- /dev/null +++ b/crates/lib/docs_rs_build_queue/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json @@ -0,0 +1,52 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $1)\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "name: KrateName", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "version: Version", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 4, + "name": "registry", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Float8" + ] + }, + "nullable": [ + false, + false, + false, + false, + true, + false + ] + }, + "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" +} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json b/crates/lib/docs_rs_build_queue/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json deleted file mode 100644 index 403de85f9..000000000 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT id\n FROM queue\n WHERE\n attempt < $1 AND\n name = $2 AND\n version = $3\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4", - "Text", - "Text" - ] - }, - "nullable": [ - false - ] - }, - "hash": "f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c" -} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-e323820d9273ae10886a7a5db1864e11f94477ddef83a14b16f420c2f7b02bd0.json b/crates/lib/docs_rs_build_queue/.sqlx/query-fc654c9fccbceba15f4aceea9fe0b637290907671172571ed76fad04622d027f.json similarity index 78% rename from crates/lib/docs_rs_build_queue/.sqlx/query-e323820d9273ae10886a7a5db1864e11f94477ddef83a14b16f420c2f7b02bd0.json rename to crates/lib/docs_rs_build_queue/.sqlx/query-fc654c9fccbceba15f4aceea9fe0b637290907671172571ed76fad04622d027f.json index 0caa0c20e..fb0fe19ce 100644 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-e323820d9273ae10886a7a5db1864e11f94477ddef83a14b16f420c2f7b02bd0.json +++ b/crates/lib/docs_rs_build_queue/.sqlx/query-fc654c9fccbceba15f4aceea9fe0b637290907671172571ed76fad04622d027f.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT priority, attempt, last_attempt\n FROM queue\n WHERE name = $1 AND version = $2", + "query": "SELECT priority, attempt, last_attempt\n FROM queue\n WHERE name = $1 AND version = $2", "describe": { "columns": [ { @@ -31,5 +31,5 @@ true ] }, - "hash": "e323820d9273ae10886a7a5db1864e11f94477ddef83a14b16f420c2f7b02bd0" + "hash": "fc654c9fccbceba15f4aceea9fe0b637290907671172571ed76fad04622d027f" } diff --git a/crates/lib/docs_rs_build_queue/src/metrics.rs b/crates/lib/docs_rs_build_queue/src/metrics.rs index edd87a148..4ec6086ef 100644 --- a/crates/lib/docs_rs_build_queue/src/metrics.rs +++ b/crates/lib/docs_rs_build_queue/src/metrics.rs @@ -4,6 +4,9 @@ use opentelemetry::metrics::Counter; #[derive(Debug)] pub struct BuildQueueMetrics { pub(crate) queued_builds: Counter, + /// hard errors (= Result::Err from the builder). + /// Not the same as "normal" build failures = rustc failed compiling. + pub(crate) failed_crates_count: Counter, } impl BuildQueueMetrics { @@ -15,6 +18,10 @@ impl BuildQueueMetrics { .u64_counter(format!("{PREFIX}.queued_builds")) .with_unit("1") .build(), + failed_crates_count: meter + .u64_counter(format!("{PREFIX}.failed_crates_count")) + .with_unit("1") + .build(), } } } diff --git a/crates/lib/docs_rs_build_queue/src/queue/blocking.rs b/crates/lib/docs_rs_build_queue/src/queue/blocking.rs index d45af57dc..4346502dc 100644 --- a/crates/lib/docs_rs_build_queue/src/queue/blocking.rs +++ b/crates/lib/docs_rs_build_queue/src/queue/blocking.rs @@ -52,10 +52,6 @@ impl BuildQueue { .block_on(self.inner.pending_count_by_priority()) } #[cfg(test)] - pub(crate) fn failed_count(&self) -> Result { - self.runtime.block_on(self.inner.failed_count()) - } - #[cfg(test)] pub(crate) fn queued_crates(&self) -> Result> { self.runtime.block_on(self.inner.queued_crates()) } @@ -94,12 +90,10 @@ impl BuildQueue { attempt FROM queue WHERE - attempt < $1 AND - (last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $2)) + last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $1) ORDER BY priority ASC, attempt ASC, id ASC LIMIT 1 FOR UPDATE SKIP LOCKED"#, - self.inner.config.build_attempts as i32, self.inner.config.delay_between_build_attempts.as_secs_f64(), ) .fetch_optional(&mut *transaction), @@ -110,22 +104,38 @@ impl BuildQueue { let res = f(&to_process); - let mut increase_attempt_count = || -> Result { - let next_attempt: i32 = self.runtime.block_on( - sqlx::query_scalar!( - "UPDATE queue + let delete_from_queue = |conn: &mut sqlx::PgConnection| -> Result<()> { + self.runtime.block_on( + sqlx::query!("DELETE FROM queue WHERE id = $1;", to_process.id).execute(conn), + )?; + Ok(()) + }; + + let increase_attempt_or_delete_from_queue = + |conn: &mut sqlx::PgConnection| -> Result> { + let potential_next_attempt = self.runtime.block_on( + sqlx::query_scalar!( + "UPDATE queue SET attempt = attempt + 1, last_attempt = NOW() WHERE id = $1 RETURNING attempt;", - to_process.id, - ) - .fetch_one(&mut *transaction), - )?; + to_process.id, + ) + .fetch_one(&mut *conn), + )?; - Ok(next_attempt) - }; + if potential_next_attempt >= self.inner.config.build_attempts.into() { + self.inner.queue_metrics.failed_crates_count.add(1, &[]); + // exceeded max attempts, remove from queue + delete_from_queue(&mut *conn)?; + Ok(None) + } else { + // keep in queue for re-attempt + Ok(Some(potential_next_attempt)) + } + }; let next_attempt: Option; @@ -134,20 +144,18 @@ impl BuildQueue { should_reattempt: false, successful: _, }) => { - self.runtime.block_on( - sqlx::query!("DELETE FROM queue WHERE id = $1;", to_process.id) - .execute(&mut *transaction), - )?; + delete_from_queue(&mut transaction)?; next_attempt = None; } Ok(BuildPackageSummary { should_reattempt: true, successful: _, }) => { - next_attempt = Some(increase_attempt_count()?); + next_attempt = increase_attempt_or_delete_from_queue(&mut transaction)?; } Err(e) => { - next_attempt = Some(increase_attempt_count()?); + next_attempt = increase_attempt_or_delete_from_queue(&mut transaction)?; + error!( ?e, name = %to_process.name, @@ -198,6 +206,27 @@ mod tests { pub async fn async_conn(&self) -> Result { self.db.async_conn().await } + + fn queued_builds(&self) -> Result { + let collected_metrics = self.metrics.collected_metrics(); + + Ok(collected_metrics + .get_metric("build_queue", "docsrs.build_queue.queued_builds")? + .get_u64_counter() + .value()) + } + + fn failed_count(&self) -> u64 { + let collected_metrics = self.metrics.collected_metrics(); + + if let Ok(metric) = collected_metrics + .get_metric("build_queue", "docsrs.build_queue.failed_crates_count") + { + metric.get_u64_counter().value() + } else { + 0 + } + } } fn test_queue(config: Config) -> Result { @@ -280,7 +309,7 @@ mod tests { build_attempts: MAX_ATTEMPTS, delay_between_build_attempts: Duration::ZERO, })?; - let queue = env.queue; + let queue = &env.queue; const LOW_PRIORITY: KrateName = KrateName::from_static("low-priority"); const HIGH_PRIORITY_FOO: KrateName = KrateName::from_static("high-priority-foo"); @@ -348,15 +377,7 @@ mod tests { })?; assert!(!called, "there were still items in the queue"); - let collected_metrics = env.metrics.collected_metrics(); - - assert_eq!( - collected_metrics - .get_metric("build_queue", "docsrs.build_queue.queued_builds")? - .get_u64_counter() - .value(), - test_crates.len() as u64 - ); + assert_eq!(env.queued_builds()?, test_crates.len() as u64); Ok(()) } @@ -434,15 +455,15 @@ mod tests { build_attempts: MAX_ATTEMPTS, delay_between_build_attempts: Duration::ZERO, })?; - let queue = env.queue; + let queue = &env.queue; - assert_eq!(queue.failed_count()?, 0); + assert_eq!(env.failed_count(), 0); queue.add_crate(&FOO, &V1, -100, None)?; - assert_eq!(queue.failed_count()?, 0); + assert_eq!(env.failed_count(), 0); queue.add_crate(&BAR, &V1, 0, None)?; for _ in 0..MAX_ATTEMPTS { - assert_eq!(queue.failed_count()?, 0); + assert_eq!(env.failed_count(), 0); queue.process_next_crate(|krate| { assert_eq!(FOO, krate.name); Ok(BuildPackageSummary { @@ -451,13 +472,13 @@ mod tests { }) })?; } - assert_eq!(queue.failed_count()?, 1); + assert_eq!(env.failed_count(), 1); queue.process_next_crate(|krate| { assert_eq!(BAR, krate.name); Ok(BuildPackageSummary::default()) })?; - assert_eq!(queue.failed_count()?, 1); + assert_eq!(env.failed_count(), 1); Ok(()) } @@ -470,27 +491,27 @@ mod tests { build_attempts: MAX_ATTEMPTS, delay_between_build_attempts: Duration::ZERO, })?; - let queue = env.queue; + let queue = &env.queue; - assert_eq!(queue.failed_count()?, 0); + assert_eq!(env.failed_count(), 0); queue.add_crate(&FOO, &V1, -100, None)?; - assert_eq!(queue.failed_count()?, 0); + assert_eq!(env.failed_count(), 0); queue.add_crate(&BAR, &V1, 0, None)?; for _ in 0..MAX_ATTEMPTS { - assert_eq!(queue.failed_count()?, 0); + assert_eq!(env.failed_count(), 0); queue.process_next_crate(|krate| { assert_eq!(FOO, krate.name); anyhow::bail!("this failed"); })?; } - assert_eq!(queue.failed_count()?, 1); + assert_eq!(env.failed_count(), 1); queue.process_next_crate(|krate| { assert_eq!(BAR, krate.name); Ok(BuildPackageSummary::default()) })?; - assert_eq!(queue.failed_count()?, 1); + assert_eq!(env.failed_count(), 1); Ok(()) } diff --git a/crates/lib/docs_rs_build_queue/src/queue/non_blocking.rs b/crates/lib/docs_rs_build_queue/src/queue/non_blocking.rs index 765f9208e..921bbf2cd 100644 --- a/crates/lib/docs_rs_build_queue/src/queue/non_blocking.rs +++ b/crates/lib/docs_rs_build_queue/src/queue/non_blocking.rs @@ -13,14 +13,12 @@ use std::{collections::HashMap, sync::Arc}; pub struct AsyncBuildQueue { pub(super) config: Arc, pub(super) db: Pool, - queue_metrics: metrics::BuildQueueMetrics, - max_attempts: i32, + pub(super) queue_metrics: metrics::BuildQueueMetrics, } impl AsyncBuildQueue { pub fn new(db: Pool, config: Arc, otel_meter_provider: &AnyMeterProvider) -> Self { AsyncBuildQueue { - max_attempts: config.build_attempts.into(), config, db, queue_metrics: metrics::BuildQueueMetrics::new(otel_meter_provider), @@ -81,13 +79,11 @@ impl AsyncBuildQueue { Ok(sqlx::query!( r#" - SELECT - priority, - COUNT(*) as "count!" - FROM queue - WHERE attempt < $1 - GROUP BY priority"#, - self.max_attempts, + SELECT + priority, + COUNT(*) as "count!" + FROM queue + GROUP BY priority"#, ) .fetch(&mut *conn) .map_ok(|row| (row.priority, row.count as usize)) @@ -95,17 +91,6 @@ impl AsyncBuildQueue { .await?) } - pub async fn failed_count(&self) -> Result { - let mut conn = self.db.get_async().await?; - - Ok(sqlx::query_scalar!( - r#"SELECT COUNT(*) as "count!" FROM queue WHERE attempt >= $1;"#, - self.max_attempts, - ) - .fetch_one(&mut *conn) - .await? as usize) - } - pub async fn queued_crates(&self) -> Result> { let mut conn = self.db.get_async().await?; @@ -119,9 +104,7 @@ impl AsyncBuildQueue { registry, attempt FROM queue - WHERE attempt < $1 ORDER BY priority ASC, attempt ASC, id ASC"#, - self.max_attempts ) .fetch_all(&mut *conn) .await?) @@ -133,11 +116,9 @@ impl AsyncBuildQueue { "SELECT id FROM queue WHERE - attempt < $1 AND - name = $2 AND - version = $3 + name = $1 AND + version = $2 ", - self.max_attempts, name as _, version as _, ) @@ -197,12 +178,10 @@ impl AsyncBuildQueue { WHERE name = $2 AND version != $3 - AND attempt < $4 ", new_priority, name as _, latest_version as _, - self.max_attempts, ) .execute(&mut *conn) .await?; @@ -291,18 +270,19 @@ mod tests { let env = test_queue().await?; let queue = env.queue; + assert_eq!(queue.pending_count().await?, 0); + let mut conn = env.db.async_conn().await?; sqlx::query!( - " - INSERT INTO queue (name, version, priority, attempt, last_attempt ) - VALUES ($1, $2, 0, 99, NOW())", + "INSERT INTO queue (name, version, priority, attempt, last_attempt ) + VALUES ($1, $2, 0, 5, NOW())", FAILED_KRATE as _, V1 as _ ) .execute(&mut *conn) .await?; - assert_eq!(queue.pending_count().await?, 0); + assert_eq!(queue.pending_count().await?, 1); queue.add_crate(&FAILED_KRATE, &V1, 9, None).await?; @@ -310,9 +290,9 @@ mod tests { let row = sqlx::query!( "SELECT priority, attempt, last_attempt - FROM queue - WHERE name = $1 AND version = $2", - "failed_crate", + FROM queue + WHERE name = $1 AND version = $2", + FAILED_KRATE as _, V1 as _ ) .fetch_one(&mut *conn) @@ -334,7 +314,7 @@ mod tests { let mut conn = env.db.async_conn().await?; assert!(queue.has_build_queued(&KRATE, &V1).await.unwrap()); - sqlx::query!("UPDATE queue SET attempt = 6") + sqlx::query!("DELETE FROM queue") .execute(&mut *conn) .await .unwrap(); diff --git a/crates/lib/docs_rs_context/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json b/crates/lib/docs_rs_context/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json deleted file mode 100644 index 14efdbfd4..000000000 --- a/crates/lib/docs_rs_context/.sqlx/query-130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n AND attempt < $4\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int4", - "Text", - "Text", - "Int4" - ] - }, - "nullable": [] - }, - "hash": "130cd68b74145ec609a4903c644ce6bc8c9a6d1c3af4953e81a1dfc248a05a3c" -} diff --git a/crates/lib/docs_rs_context/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json b/crates/lib/docs_rs_context/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json new file mode 100644 index 000000000..e1d0c0a19 --- /dev/null +++ b/crates/lib/docs_rs_context/.sqlx/query-412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT id\n FROM queue\n WHERE\n name = $1 AND\n version = $2\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Text", + "Text" + ] + }, + "nullable": [ + false + ] + }, + "hash": "412ad6a09abd2798dfc1c0b39a52d5b08f9f29f07b033251b9ce9ae5df354ceb" +} diff --git a/crates/lib/docs_rs_context/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json b/crates/lib/docs_rs_context/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json deleted file mode 100644 index ae5a0b475..000000000 --- a/crates/lib/docs_rs_context/.sqlx/query-48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n attempt < $1 AND\n (last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $2))\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "name: KrateName", - "type_info": "Text" - }, - { - "ordinal": 2, - "name": "version: Version", - "type_info": "Text" - }, - { - "ordinal": 3, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, - "name": "attempt", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4", - "Float8" - ] - }, - "nullable": [ - false, - false, - false, - false, - true, - false - ] - }, - "hash": "48eac6628305a8235aa12b45e1299615bfce99d0e693739d5d497f37600a6349" -} diff --git a/crates/lib/docs_rs_context/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json b/crates/lib/docs_rs_context/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json deleted file mode 100644 index 59d4a4eaf..000000000 --- a/crates/lib/docs_rs_context/.sqlx/query-7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE attempt < $1\n ORDER BY priority ASC, attempt ASC, id ASC", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "name: KrateName", - "type_info": "Text" - }, - { - "ordinal": 2, - "name": "version: Version", - "type_info": "Text" - }, - { - "ordinal": 3, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, - "name": "attempt", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - false, - false, - false, - false, - true, - false - ] - }, - "hash": "7c7149524e09ebc1578b1806643b3c5be340e9f9a60e994e6da80b2e9302a168" -} diff --git a/crates/lib/docs_rs_context/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/lib/docs_rs_context/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json new file mode 100644 index 000000000..f25ade8d2 --- /dev/null +++ b/crates/lib/docs_rs_context/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json @@ -0,0 +1,50 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "name: KrateName", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "version: Version", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 4, + "name": "registry", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + false, + false, + false, + true, + false + ] + }, + "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" +} diff --git a/crates/lib/docs_rs_context/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json b/crates/lib/docs_rs_context/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json deleted file mode 100644 index 4f561d6a6..000000000 --- a/crates/lib/docs_rs_context/.sqlx/query-a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n WHERE attempt < $1\n GROUP BY priority", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "priority", - "type_info": "Int4" - }, - { - "ordinal": 1, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - false, - null - ] - }, - "hash": "a76e4776415625ee9d323db74a68a8670070276be0cea27a46a73f487430c5a3" -} diff --git a/crates/lib/docs_rs_context/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json b/crates/lib/docs_rs_context/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json new file mode 100644 index 000000000..0ebe18d32 --- /dev/null +++ b/crates/lib/docs_rs_context/.sqlx/query-ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064.json @@ -0,0 +1,26 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n priority,\n COUNT(*) as \"count!\"\n FROM queue\n GROUP BY priority", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "count!", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + null + ] + }, + "hash": "ada0debe54392d7ffc05d6dfa2ad33760cc3361550f19a26c179ff53a7a33064" +} diff --git a/crates/lib/docs_rs_context/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json b/crates/lib/docs_rs_context/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json deleted file mode 100644 index ba6be127c..000000000 --- a/crates/lib/docs_rs_context/.sqlx/query-d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT COUNT(*) as \"count!\" FROM queue WHERE attempt >= $1;", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "count!", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Int4" - ] - }, - "nullable": [ - null - ] - }, - "hash": "d16fc68c2607f6a1c94e92ca7cf95d26725b4fa8cc664a0c1474eceb67c31570" -} diff --git a/crates/lib/docs_rs_context/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json b/crates/lib/docs_rs_context/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json new file mode 100644 index 000000000..530ae1ffe --- /dev/null +++ b/crates/lib/docs_rs_context/.sqlx/query-e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE queue\n SET priority = GREATEST(priority, $1)\n WHERE\n name = $2\n AND version != $3\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int4", + "Text", + "Text" + ] + }, + "nullable": [] + }, + "hash": "e550304c4f4f1b7aba42b7eb0eb7c1fb7732b174f49c76a145ae86fad2556671" +} diff --git a/crates/lib/docs_rs_context/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/lib/docs_rs_context/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json new file mode 100644 index 000000000..57870465c --- /dev/null +++ b/crates/lib/docs_rs_context/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json @@ -0,0 +1,52 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\n registry,\n attempt\n FROM queue\n WHERE\n last_attempt IS NULL OR last_attempt < NOW() - make_interval(secs => $1)\n ORDER BY priority ASC, attempt ASC, id ASC\n LIMIT 1\n FOR UPDATE SKIP LOCKED", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int4" + }, + { + "ordinal": 1, + "name": "name: KrateName", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "version: Version", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "priority", + "type_info": "Int4" + }, + { + "ordinal": 4, + "name": "registry", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Float8" + ] + }, + "nullable": [ + false, + false, + false, + false, + true, + false + ] + }, + "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" +} diff --git a/crates/lib/docs_rs_context/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json b/crates/lib/docs_rs_context/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json deleted file mode 100644 index 403de85f9..000000000 --- a/crates/lib/docs_rs_context/.sqlx/query-f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT id\n FROM queue\n WHERE\n attempt < $1 AND\n name = $2 AND\n version = $3\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Int4", - "Text", - "Text" - ] - }, - "nullable": [ - false - ] - }, - "hash": "f4765711eacc30103180cabe501b9c37ae3bbe46dceaa7e9332e8c898aed659c" -} diff --git a/crates/lib/docs_rs_database/migrations/20260131071854_failed-queued-crates.down.sql b/crates/lib/docs_rs_database/migrations/20260131071854_failed-queued-crates.down.sql new file mode 100644 index 000000000..e69de29bb diff --git a/crates/lib/docs_rs_database/migrations/20260131071854_failed-queued-crates.up.sql b/crates/lib/docs_rs_database/migrations/20260131071854_failed-queued-crates.up.sql new file mode 100644 index 000000000..04055ab50 --- /dev/null +++ b/crates/lib/docs_rs_database/migrations/20260131071854_failed-queued-crates.up.sql @@ -0,0 +1,2 @@ +-- Add up migration script here +DELETE FROM queue WHERE attempt >= 5; diff --git a/crates/lib/docs_rs_opentelemetry/Cargo.toml b/crates/lib/docs_rs_opentelemetry/Cargo.toml index b1c0151a9..26d8986dc 100644 --- a/crates/lib/docs_rs_opentelemetry/Cargo.toml +++ b/crates/lib/docs_rs_opentelemetry/Cargo.toml @@ -18,3 +18,7 @@ opentelemetry-resource-detectors = "0.10.0" opentelemetry_sdk = { workspace = true } tracing = { workspace = true } url = { workspace = true } + +[dev-dependencies] +docs_rs_config = { path = "../docs_rs_config", features = ["testing"] } +opentelemetry_sdk = { workspace = true, features = ["testing"] } diff --git a/crates/lib/docs_rs_opentelemetry/src/lib.rs b/crates/lib/docs_rs_opentelemetry/src/lib.rs index e7ef58eb3..eba027f9f 100644 --- a/crates/lib/docs_rs_opentelemetry/src/lib.rs +++ b/crates/lib/docs_rs_opentelemetry/src/lib.rs @@ -1,5 +1,5 @@ mod config; -#[cfg(feature = "testing")] +#[cfg(any(test, feature = "testing"))] pub mod testing; pub use config::Config; diff --git a/crates/lib/docs_rs_opentelemetry/src/testing/collected_metrics.rs b/crates/lib/docs_rs_opentelemetry/src/testing/collected_metrics.rs index 089d10850..1a21fcbaf 100644 --- a/crates/lib/docs_rs_opentelemetry/src/testing/collected_metrics.rs +++ b/crates/lib/docs_rs_opentelemetry/src/testing/collected_metrics.rs @@ -21,7 +21,8 @@ impl CollectedMetrics { .0 .iter() .flat_map(|rm| rm.scope_metrics()) - .find(|sm| sm.scope().name() == scope) + .filter(|sm| sm.scope().name() == scope) + .last() .ok_or_else(|| { anyhow!( "Scope '{}' not found in collected metrics: {:?}", @@ -33,7 +34,8 @@ impl CollectedMetrics { Ok(CollectedMetric( scope_metrics .metrics() - .find(|m| m.name() == name) + .filter(|m| m.name() == name) + .last() .ok_or_else(|| { anyhow!( "Metric '{}' not found in scope '{}': {:?}", diff --git a/crates/lib/docs_rs_opentelemetry/src/testing/test_env.rs b/crates/lib/docs_rs_opentelemetry/src/testing/test_env.rs index ec7a7ded1..ac7fbfaef 100644 --- a/crates/lib/docs_rs_opentelemetry/src/testing/test_env.rs +++ b/crates/lib/docs_rs_opentelemetry/src/testing/test_env.rs @@ -37,3 +37,69 @@ impl Default for TestMetrics { Self::new() } } + +#[cfg(test)] +mod tests { + use super::*; + use opentelemetry::metrics::Counter; + + const METER: &str = "meter"; + const METRIC: &str = "metric1"; + + fn create_metric(meter_provider: &AnyMeterProvider) -> Counter { + let meter = meter_provider.meter(METER); + meter.u64_counter(METRIC).with_unit("1").build() + } + + #[test] + fn test_collect_once() -> anyhow::Result<()> { + let metrics = TestMetrics::new(); + + let dummy = create_metric(metrics.provider()); + dummy.add(42, &[]); + dummy.add(24, &[]); + + assert_eq!( + 66, + metrics + .collected_metrics() + .get_metric(METER, METRIC)? + .get_u64_counter() + .value() + ); + + Ok(()) + } + + #[test] + fn test_collect_twice() -> anyhow::Result<()> { + let metrics = TestMetrics::new(); + + let dummy = create_metric(metrics.provider()); + dummy.add(42, &[]); + + eprintln!("first asserts"); + assert_eq!( + 42, + metrics + .collected_metrics() + .get_metric(METER, METRIC)? + .get_u64_counter() + .value() + ); + + dummy.add(24, &[]); + + eprintln!("second asserts"); + assert_eq!( + 66, + metrics + .collected_metrics() + .get_metric(METER, METRIC)? + .get_u64_counter() + .value() + ); + + Ok(()) + } +}