diff --git a/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json b/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json new file mode 100644 index 000000000..95a5f8f94 --- /dev/null +++ b/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO queue (name, version, priority)\n VALUES ($1, $2, $3)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n attempt = 0,\n last_attempt = NULL\n ;", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb" +} diff --git a/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json b/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json deleted file mode 100644 index 55b209a3f..000000000 --- a/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO queue (name, version, priority, registry)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n registry = EXCLUDED.registry,\n attempt = 0,\n last_attempt = NULL\n ;", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Text", - "Text", - "Int4", - "Text" - ] - }, - "nullable": [] - }, - "hash": "743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67" -} diff --git a/crates/bin/cratesfyi/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json similarity index 69% rename from crates/bin/cratesfyi/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json rename to .sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json index f25ade8d2..f04968526 100644 --- a/crates/bin/cratesfyi/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json +++ b/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.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 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 attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", "describe": { "columns": [ { @@ -25,11 +25,6 @@ }, { "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, "name": "attempt", "type_info": "Int4" } @@ -42,9 +37,8 @@ false, false, false, - true, false ] }, - "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" + "hash": "83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885" } diff --git a/crates/bin/docs_rs_admin/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json similarity index 64% rename from crates/bin/docs_rs_admin/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json rename to .sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json index 57870465c..9a98b5711 100644 --- a/crates/bin/docs_rs_admin/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json +++ b/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.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 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", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": [ { @@ -25,11 +25,6 @@ }, { "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, "name": "attempt", "type_info": "Int4" } @@ -44,9 +39,8 @@ false, false, false, - true, false ] }, - "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" + "hash": "d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7" } diff --git a/Cargo.lock b/Cargo.lock index 8c6ad2459..6d6e7dc45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3002,21 +3002,6 @@ version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" -[[package]] -name = "git2" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b88256088d75a56f8ecfa070513a775dd9107f6530ef14919dac831af9cfe2b" -dependencies = [ - "bitflags 2.11.1", - "libc", - "libgit2-sys", - "log", - "openssl-probe 0.1.6", - "openssl-sys", - "url", -] - [[package]] name = "gix" version = "0.83.0" @@ -4756,20 +4741,6 @@ version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" -[[package]] -name = "libgit2-sys" -version = "0.18.4+1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b26f66f35e1871b22efcf7191564123d2a446ca0538cde63c23adfefa9b15b7" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - [[package]] name = "libm" version = "0.2.16" @@ -4799,32 +4770,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "libssh2-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3a226e576f50782b3305c5ccf458698f92798987f551c6a02efe8276721e22" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -5073,7 +5018,7 @@ dependencies = [ "libc", "log", "openssl", - "openssl-probe 0.2.1", + "openssl-probe", "openssl-sys", "schannel", "security-framework", @@ -5455,12 +5400,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "openssl-probe" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" - [[package]] name = "openssl-probe" version = "0.2.1" @@ -6547,7 +6486,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" dependencies = [ - "openssl-probe 0.2.1", + "openssl-probe", "rustls-pki-types", "schannel", "security-framework", @@ -6610,9 +6549,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "rustwide" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b91bb263a28b24abbbe4fbac9fa152daf5b3ed127f09eb9cf36aa2a0e82d14f" +checksum = "34bab9135a7a794196ff7557fa6e6900c56ba013788e5551e1380a39cafd9fb4" dependencies = [ "anyhow", "attohttpc", @@ -6621,7 +6560,6 @@ dependencies = [ "fs2", "futures-util", "getrandom 0.4.2", - "git2", "http 1.4.0", "log", "nix 0.30.1", @@ -6636,6 +6574,7 @@ dependencies = [ "tokio", "tokio-stream", "toml 0.9.12+spec-1.1.0", + "tracing", "walkdir", "windows-sys 0.52.0", ] diff --git a/crates/bin/cratesfyi/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json b/crates/bin/cratesfyi/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json new file mode 100644 index 000000000..95a5f8f94 --- /dev/null +++ b/crates/bin/cratesfyi/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO queue (name, version, priority)\n VALUES ($1, $2, $3)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n attempt = 0,\n last_attempt = NULL\n ;", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb" +} diff --git a/crates/bin/cratesfyi/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json b/crates/bin/cratesfyi/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json deleted file mode 100644 index 55b209a3f..000000000 --- a/crates/bin/cratesfyi/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO queue (name, version, priority, registry)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n registry = EXCLUDED.registry,\n attempt = 0,\n last_attempt = NULL\n ;", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Text", - "Text", - "Int4", - "Text" - ] - }, - "nullable": [] - }, - "hash": "743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67" -} diff --git a/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/bin/cratesfyi/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json similarity index 69% rename from .sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json rename to crates/bin/cratesfyi/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json index f25ade8d2..f04968526 100644 --- a/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json +++ b/crates/bin/cratesfyi/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.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 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 attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", "describe": { "columns": [ { @@ -25,11 +25,6 @@ }, { "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, "name": "attempt", "type_info": "Int4" } @@ -42,9 +37,8 @@ false, false, false, - true, false ] }, - "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" + "hash": "83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885" } diff --git a/crates/bin/docs_rs_builder/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/bin/cratesfyi/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json similarity index 64% rename from crates/bin/docs_rs_builder/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json rename to crates/bin/cratesfyi/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json index 57870465c..9a98b5711 100644 --- a/crates/bin/docs_rs_builder/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json +++ b/crates/bin/cratesfyi/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.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 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", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": [ { @@ -25,11 +25,6 @@ }, { "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, "name": "attempt", "type_info": "Int4" } @@ -44,9 +39,8 @@ false, false, false, - true, false ] }, - "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" + "hash": "d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7" } diff --git a/crates/bin/docs_rs_admin/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json b/crates/bin/docs_rs_admin/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json new file mode 100644 index 000000000..95a5f8f94 --- /dev/null +++ b/crates/bin/docs_rs_admin/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO queue (name, version, priority)\n VALUES ($1, $2, $3)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n attempt = 0,\n last_attempt = NULL\n ;", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb" +} diff --git a/crates/bin/docs_rs_admin/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json b/crates/bin/docs_rs_admin/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json deleted file mode 100644 index 55b209a3f..000000000 --- a/crates/bin/docs_rs_admin/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO queue (name, version, priority, registry)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n registry = EXCLUDED.registry,\n attempt = 0,\n last_attempt = NULL\n ;", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Text", - "Text", - "Int4", - "Text" - ] - }, - "nullable": [] - }, - "hash": "743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67" -} diff --git a/crates/bin/docs_rs_admin/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/bin/docs_rs_admin/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json similarity index 69% rename from crates/bin/docs_rs_admin/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json rename to crates/bin/docs_rs_admin/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json index f25ade8d2..f04968526 100644 --- a/crates/bin/docs_rs_admin/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json +++ b/crates/bin/docs_rs_admin/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.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 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 attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", "describe": { "columns": [ { @@ -25,11 +25,6 @@ }, { "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, "name": "attempt", "type_info": "Int4" } @@ -42,9 +37,8 @@ false, false, false, - true, false ] }, - "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" + "hash": "83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885" } diff --git a/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/bin/docs_rs_admin/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json similarity index 64% rename from .sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json rename to crates/bin/docs_rs_admin/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json index 57870465c..9a98b5711 100644 --- a/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json +++ b/crates/bin/docs_rs_admin/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.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 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", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": [ { @@ -25,11 +25,6 @@ }, { "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, "name": "attempt", "type_info": "Int4" } @@ -44,9 +39,8 @@ false, false, false, - true, false ] }, - "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" + "hash": "d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7" } diff --git a/crates/bin/docs_rs_admin/src/main.rs b/crates/bin/docs_rs_admin/src/main.rs index 54821f537..1869482a1 100644 --- a/crates/bin/docs_rs_admin/src/main.rs +++ b/crates/bin/docs_rs_admin/src/main.rs @@ -148,7 +148,7 @@ impl QueueSubcommand { build_priority, } => { ctx.build_queue()? - .add_crate(&crate_name, &crate_version, build_priority, None) + .add_crate(&crate_name, &crate_version, build_priority) .await? } diff --git a/crates/bin/docs_rs_admin/src/rebuilds.rs b/crates/bin/docs_rs_admin/src/rebuilds.rs index d340685e4..6612c5db9 100644 --- a/crates/bin/docs_rs_admin/src/rebuilds.rs +++ b/crates/bin/docs_rs_admin/src/rebuilds.rs @@ -54,7 +54,7 @@ pub(crate) async fn queue_rebuilds_faulty_rustdoc( "queueing rebuild" ); queue - .add_crate(&row.name, &row.version, PRIORITY_BROKEN_RUSTDOC, None) + .add_crate(&row.name, &row.version, PRIORITY_BROKEN_RUSTDOC) .await?; } } diff --git a/crates/bin/docs_rs_builder/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json b/crates/bin/docs_rs_builder/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json new file mode 100644 index 000000000..95a5f8f94 --- /dev/null +++ b/crates/bin/docs_rs_builder/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO queue (name, version, priority)\n VALUES ($1, $2, $3)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n attempt = 0,\n last_attempt = NULL\n ;", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb" +} diff --git a/crates/bin/docs_rs_builder/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json b/crates/bin/docs_rs_builder/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json deleted file mode 100644 index 55b209a3f..000000000 --- a/crates/bin/docs_rs_builder/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO queue (name, version, priority, registry)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n registry = EXCLUDED.registry,\n attempt = 0,\n last_attempt = NULL\n ;", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Text", - "Text", - "Int4", - "Text" - ] - }, - "nullable": [] - }, - "hash": "743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67" -} diff --git a/crates/bin/docs_rs_builder/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/bin/docs_rs_builder/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json similarity index 69% rename from crates/bin/docs_rs_builder/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json rename to crates/bin/docs_rs_builder/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json index f25ade8d2..f04968526 100644 --- a/crates/bin/docs_rs_builder/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json +++ b/crates/bin/docs_rs_builder/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.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 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 attempt\n FROM queue\n ORDER BY priority ASC, attempt ASC, id ASC", "describe": { "columns": [ { @@ -25,11 +25,6 @@ }, { "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, "name": "attempt", "type_info": "Int4" } @@ -42,9 +37,8 @@ false, false, false, - true, false ] }, - "hash": "91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f" + "hash": "83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885" } diff --git a/crates/bin/cratesfyi/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/bin/docs_rs_builder/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json similarity index 64% rename from crates/bin/cratesfyi/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json rename to crates/bin/docs_rs_builder/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json index 57870465c..9a98b5711 100644 --- a/crates/bin/cratesfyi/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json +++ b/crates/bin/docs_rs_builder/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.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 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", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": [ { @@ -25,11 +25,6 @@ }, { "ordinal": 4, - "name": "registry", - "type_info": "Text" - }, - { - "ordinal": 5, "name": "attempt", "type_info": "Int4" } @@ -44,9 +39,8 @@ false, false, false, - true, false ] }, - "hash": "ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2" + "hash": "d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7" } diff --git a/crates/bin/docs_rs_builder/Cargo.toml b/crates/bin/docs_rs_builder/Cargo.toml index b70683788..2ae9a74a8 100644 --- a/crates/bin/docs_rs_builder/Cargo.toml +++ b/crates/bin/docs_rs_builder/Cargo.toml @@ -30,7 +30,7 @@ log = "0.4" num_cpus = { workspace = true } opentelemetry = { workspace = true } regex = { workspace = true } -rustwide = { version = "0.23.0", features = ["unstable", "unstable-toolchain-ci"] } +rustwide = { version = "0.24.0", default-features = false, features = ["unstable", "unstable-toolchain-ci", "tracing" ] } serde_json = { workspace = true } sqlx = { workspace = true } sysinfo = { version = "0.39.0", default-features = false, features = ["system"] } diff --git a/crates/bin/docs_rs_builder/src/build_queue.rs b/crates/bin/docs_rs_builder/src/build_queue.rs index 9ad611e0c..57003ea48 100644 --- a/crates/bin/docs_rs_builder/src/build_queue.rs +++ b/crates/bin/docs_rs_builder/src/build_queue.rs @@ -82,12 +82,6 @@ pub(crate) fn build_next_queue_package( processed = true; - let kind = krate - .registry - .as_ref() - .map(|r| PackageKind::Registry(r.as_str())) - .unwrap_or(PackageKind::CratesIo); - if let Err(err) = retry(|| builder.reinitialize_workspace_if_interval_passed(), 3) { error!(?err, "Reinitialize workspace failed after retries"); queue.lock()?; @@ -100,7 +94,12 @@ pub(crate) fn build_next_queue_package( return Err(err); } - builder.build_package(&krate.name, &krate.version, kind, krate.attempt == 0) + builder.build_package( + &krate.name, + &krate.version, + PackageKind::CratesIo, + krate.attempt == 0, + ) })?; Ok(processed) @@ -124,7 +123,7 @@ mod tests { const WILL_FAIL: KrateName = KrateName::from_static("will_fail"); - queue.add_crate(&WILL_FAIL, &V1, 0, None)?; + queue.add_crate(&WILL_FAIL, &V1, 0)?; process_next_crate(&env, &builder_metrics, |krate| { assert_eq!(WILL_FAIL, krate.name); @@ -146,7 +145,7 @@ mod tests { let builder_metrics = BuilderMetrics::new(env.meter_provider()); const WILL_SUCCEED: KrateName = KrateName::from_static("will_succeed"); - queue.add_crate(&WILL_SUCCEED, &V1, -1, None)?; + queue.add_crate(&WILL_SUCCEED, &V1, -1)?; process_next_crate(&env, &builder_metrics, |krate| { assert_eq!(WILL_SUCCEED, krate.name); diff --git a/crates/bin/docs_rs_builder/src/docbuilder/rustwide_builder.rs b/crates/bin/docs_rs_builder/src/docbuilder/rustwide_builder.rs index 911bc90dc..7763209d4 100644 --- a/crates/bin/docs_rs_builder/src/docbuilder/rustwide_builder.rs +++ b/crates/bin/docs_rs_builder/src/docbuilder/rustwide_builder.rs @@ -35,7 +35,7 @@ use docs_rs_utils::{ use docsrs_metadata::{BuildTargets, DEFAULT_TARGETS, HOST_TARGET, Metadata}; use regex::Regex; use rustwide::{ - AlternativeRegistry, Build, Crate, Toolchain, Workspace, WorkspaceBuilder, + Build, Crate, Toolchain, Workspace, WorkspaceBuilder, cmd::{Command, CommandError, ProcessStatistics, SandboxBuilder, SandboxImage}, logging::{self, LogStorage}, toolchain::ToolchainError, @@ -100,7 +100,7 @@ fn load_metadata_from_rustwide( ) -> Result { let res = Command::new(workspace, toolchain.cargo()) .args(&["metadata", "--format-version", "1"]) - .cd(source_dir) + .current_directory(source_dir) .log_output(false) .run_capture()?; let [metadata] = res.stdout_lines() else { @@ -113,7 +113,6 @@ fn load_metadata_from_rustwide( pub enum PackageKind<'a> { Local(&'a Path), CratesIo, - Registry(&'a str), } pub struct RustwideBuilder { @@ -622,9 +621,6 @@ impl RustwideBuilder { let krate = match kind { PackageKind::Local(path) => Crate::local(path), PackageKind::CratesIo => Crate::crates_io(name.as_str(), &version), - PackageKind::Registry(registry) => { - Crate::registry(AlternativeRegistry::new(registry), name.as_str(), &version) - } }; krate.fetch(&self.workspace)?; krate @@ -689,14 +685,14 @@ impl RustwideBuilder { { let _span = info_span!("cargo_generate_lockfile").entered(); Command::new(&self.workspace, self.toolchain.cargo()) - .cd(build.host_source_dir()) + .current_directory(build.host_source_dir()) .args(&["generate-lockfile"]) .run_capture()?; } { let _span = info_span!("cargo fetch --locked").entered(); Command::new(&self.workspace, self.toolchain.cargo()) - .cd(build.host_source_dir()) + .current_directory(build.host_source_dir()) .args(&["fetch", "--locked"]) .run_capture()?; } diff --git a/crates/bin/docs_rs_import_release/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json b/crates/bin/docs_rs_import_release/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json new file mode 100644 index 000000000..95a5f8f94 --- /dev/null +++ b/crates/bin/docs_rs_import_release/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO queue (name, version, priority)\n VALUES ($1, $2, $3)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n attempt = 0,\n last_attempt = NULL\n ;", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb" +} diff --git a/crates/bin/docs_rs_import_release/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json b/crates/bin/docs_rs_import_release/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json deleted file mode 100644 index 55b209a3f..000000000 --- a/crates/bin/docs_rs_import_release/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO queue (name, version, priority, registry)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n registry = EXCLUDED.registry,\n attempt = 0,\n last_attempt = NULL\n ;", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Text", - "Text", - "Int4", - "Text" - ] - }, - "nullable": [] - }, - "hash": "743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67" -} diff --git a/crates/bin/docs_rs_import_release/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json b/crates/bin/docs_rs_import_release/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json new file mode 100644 index 000000000..f04968526 --- /dev/null +++ b/crates/bin/docs_rs_import_release/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json @@ -0,0 +1,44 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + false, + false, + false, + false + ] + }, + "hash": "83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885" +} diff --git a/crates/bin/docs_rs_import_release/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/bin/docs_rs_import_release/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json deleted file mode 100644 index f25ade8d2..000000000 --- a/crates/bin/docs_rs_import_release/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json +++ /dev/null @@ -1,50 +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 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_import_release/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json b/crates/bin/docs_rs_import_release/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json new file mode 100644 index 000000000..9a98b5711 --- /dev/null +++ b/crates/bin/docs_rs_import_release/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json @@ -0,0 +1,46 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Float8" + ] + }, + "nullable": [ + false, + false, + false, + false, + false + ] + }, + "hash": "d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7" +} diff --git a/crates/bin/docs_rs_import_release/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/bin/docs_rs_import_release/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json deleted file mode 100644 index 57870465c..000000000 --- a/crates/bin/docs_rs_import_release/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.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\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-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json b/crates/bin/docs_rs_watcher/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json new file mode 100644 index 000000000..95a5f8f94 --- /dev/null +++ b/crates/bin/docs_rs_watcher/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO queue (name, version, priority)\n VALUES ($1, $2, $3)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n attempt = 0,\n last_attempt = NULL\n ;", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb" +} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json b/crates/bin/docs_rs_watcher/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json deleted file mode 100644 index 55b209a3f..000000000 --- a/crates/bin/docs_rs_watcher/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO queue (name, version, priority, registry)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n registry = EXCLUDED.registry,\n attempt = 0,\n last_attempt = NULL\n ;", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Text", - "Text", - "Int4", - "Text" - ] - }, - "nullable": [] - }, - "hash": "743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67" -} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json b/crates/bin/docs_rs_watcher/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json new file mode 100644 index 000000000..f04968526 --- /dev/null +++ b/crates/bin/docs_rs_watcher/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json @@ -0,0 +1,44 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + false, + false, + false, + false + ] + }, + "hash": "83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885" +} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/bin/docs_rs_watcher/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json deleted file mode 100644 index f25ade8d2..000000000 --- a/crates/bin/docs_rs_watcher/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json +++ /dev/null @@ -1,50 +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 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-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json b/crates/bin/docs_rs_watcher/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json new file mode 100644 index 000000000..9a98b5711 --- /dev/null +++ b/crates/bin/docs_rs_watcher/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json @@ -0,0 +1,46 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Float8" + ] + }, + "nullable": [ + false, + false, + false, + false, + false + ] + }, + "hash": "d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7" +} diff --git a/crates/bin/docs_rs_watcher/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/bin/docs_rs_watcher/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json deleted file mode 100644 index 57870465c..000000000 --- a/crates/bin/docs_rs_watcher/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.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\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/src/consistency/db.rs b/crates/bin/docs_rs_watcher/src/consistency/db.rs index 6a63cd130..052442cdb 100644 --- a/crates/bin/docs_rs_watcher/src/consistency/db.rs +++ b/crates/bin/docs_rs_watcher/src/consistency/db.rs @@ -81,7 +81,7 @@ mod tests { async fn test_load() -> Result<()> { let env = TestEnvironment::new().await?; - env.build_queue()?.add_crate(&QUEUED, &V1, 0, None).await?; + env.build_queue()?.add_crate(&QUEUED, &V1, 0).await?; env.fake_release() .await .name("krate") diff --git a/crates/bin/docs_rs_watcher/src/consistency/mod.rs b/crates/bin/docs_rs_watcher/src/consistency/mod.rs index d554e91c9..deb1c5454 100644 --- a/crates/bin/docs_rs_watcher/src/consistency/mod.rs +++ b/crates/bin/docs_rs_watcher/src/consistency/mod.rs @@ -106,7 +106,7 @@ where if !dry_run && let Err(err) = ctx .build_queue()? - .add_crate(name, version, PRIORITY_CONSISTENCY_CHECK, None) + .add_crate(name, version, PRIORITY_CONSISTENCY_CHECK) .await { warn!(?difference, ?err, "error handling CrateNotInDb"); @@ -128,7 +128,7 @@ where if !dry_run && let Err(err) = ctx .build_queue()? - .add_crate(name, version, PRIORITY_CONSISTENCY_CHECK, None) + .add_crate(name, version, PRIORITY_CONSISTENCY_CHECK) .await { warn!(?difference, ?err, "error handling ReleaseNotInDb"); diff --git a/crates/bin/docs_rs_watcher/src/db/delete.rs b/crates/bin/docs_rs_watcher/src/db/delete.rs index 873ed6442..18970a26d 100644 --- a/crates/bin/docs_rs_watcher/src/db/delete.rs +++ b/crates/bin/docs_rs_watcher/src/db/delete.rs @@ -324,9 +324,9 @@ mod tests { let mut conn = env.async_conn().await?; // crate fake entries in the build queue - queue.add_crate(&FOO, &V1, 0, None).await?; - queue.add_crate(&FOO, &V2, 0, None).await?; - queue.add_crate(&BAR, &V1, 0, None).await?; + queue.add_crate(&FOO, &V1, 0).await?; + queue.add_crate(&FOO, &V2, 0).await?; + queue.add_crate(&BAR, &V1, 0).await?; // Create fake packages in the database let pkg1_v1_id = env @@ -465,8 +465,8 @@ mod tests { } let mut conn = env.async_conn().await?; - queue.add_crate(&KRATE, &V1, 0, None).await?; - queue.add_crate(&KRATE, &V2, 0, None).await?; + queue.add_crate(&KRATE, &V1, 0).await?; + queue.add_crate(&KRATE, &V2, 0).await?; let v1 = env .fake_release() @@ -679,7 +679,7 @@ mod tests { let mut conn = env.async_conn().await?; - queue.add_crate(&krate, &version, 0, None).await?; + queue.add_crate(&krate, &version, 0).await?; let release_id = env .fake_release() .await @@ -729,7 +729,7 @@ mod tests { let mut conn = env.async_conn().await?; - queue.add_crate(&krate, &version, 0, None).await?; + queue.add_crate(&krate, &version, 0).await?; let release_id = env .fake_release() .await diff --git a/crates/bin/docs_rs_watcher/src/index_watcher.rs b/crates/bin/docs_rs_watcher/src/index_watcher.rs index bdc588bd2..68b964d79 100644 --- a/crates/bin/docs_rs_watcher/src/index_watcher.rs +++ b/crates/bin/docs_rs_watcher/src/index_watcher.rs @@ -115,7 +115,7 @@ pub(crate) async fn get_new_crates( debug!(last_seen_reference=%last_seen_reference, new_reference=%new_reference, "queueing changes"); - let crates_added = process_changes(context, &changes, index.repository_url(), config).await; + let crates_added = process_changes(context, &changes, config).await; if let Err(err) = context.build_queue()?.deprioritize_workspaces().await { error!(?err, "error deprioritizing workspaces"); @@ -129,16 +129,11 @@ pub(crate) async fn get_new_crates( Ok(crates_added) } -async fn process_changes( - context: &Context, - changes: &Vec, - registry: Option<&str>, - config: &Config, -) -> usize { +async fn process_changes(context: &Context, changes: &Vec, config: &Config) -> usize { let mut crates_added = 0; for change in changes { - match process_change(context, change, registry, config).await { + match process_change(context, change, config).await { Ok(added) => { if added { crates_added += 1; @@ -153,12 +148,7 @@ async fn process_changes( } /// Process a crate change, returning whether the change was a crate addition or not. -async fn process_change( - context: &Context, - change: &Change, - registry: Option<&str>, - config: &Config, -) -> Result { +async fn process_change(context: &Context, change: &Change, config: &Config) -> Result { let crate_version: CrateVersion = change .versions() .first() @@ -167,9 +157,9 @@ async fn process_change( .try_into()?; match change { - Change::Added(_release) => process_version_added(context, &crate_version, registry).await?, + Change::Added(_release) => process_version_added(context, &crate_version).await?, Change::AddedAndYanked(_release) => { - process_version_added(context, &crate_version, registry).await?; + process_version_added(context, &crate_version).await?; process_version_yank_status(context, &crate_version).await?; } Change::Unyanked(_release) | Change::Yanked(_release) => { @@ -195,16 +185,12 @@ async fn process_version_yank_status(context: &Context, release: &CrateVersion) Ok(()) } -async fn process_version_added( - context: &Context, - release: &CrateVersion, - registry: Option<&str>, -) -> Result<()> { +async fn process_version_added(context: &Context, release: &CrateVersion) -> Result<()> { let mut conn = context.pool()?.get_async().await?; let priority = get_crate_priority(&mut conn, &release.name).await?; context .build_queue()? - .add_crate(&release.name, &release.version, priority, registry) + .add_crate(&release.name, &release.version, priority) .await .with_context(|| { format!( @@ -359,7 +345,7 @@ mod tests { ..Default::default() }; - process_version_added(&env, &krate, None).await?; + process_version_added(&env, &krate).await?; let queue = build_queue.queued_crates().await?; assert_eq!(queue.len(), 1); assert_eq!(queue[0].priority, PRIORITY_DEFAULT); @@ -370,7 +356,7 @@ mod tests { ..Default::default() }; - process_version_added(&env, &krate, None).await?; + process_version_added(&env, &krate).await?; let queue = build_queue.queued_crates().await?; assert_eq!(queue.len(), 2); // The other queued version should be deprioritized @@ -543,7 +529,6 @@ mod tests { // Should error out, but the error should be handled gracefully Change::VersionDeleted(non_existing_version.into()), ], - None, env.config(), ) .await; diff --git a/crates/bin/docs_rs_watcher/src/rebuilds.rs b/crates/bin/docs_rs_watcher/src/rebuilds.rs index 9a3015f1f..8b35b7602 100644 --- a/crates/bin/docs_rs_watcher/src/rebuilds.rs +++ b/crates/bin/docs_rs_watcher/src/rebuilds.rs @@ -68,7 +68,7 @@ pub async fn queue_rebuilds( if !queue.has_build_queued(&row.name, &row.version).await? { info!("queueing rebuild for {} {}...", &row.name, &row.version); queue - .add_crate(&row.name, &row.version, PRIORITY_CONTINUOUS, None) + .add_crate(&row.name, &row.version, PRIORITY_CONTINUOUS) .await?; } } @@ -124,10 +124,10 @@ mod tests { let build_queue = env.build_queue()?; build_queue - .add_crate(&FOO, &V1, PRIORITY_CONTINUOUS, None) + .add_crate(&FOO, &V1, PRIORITY_CONTINUOUS) .await?; build_queue - .add_crate(&BAR, &V1, PRIORITY_CONTINUOUS, None) + .add_crate(&BAR, &V1, PRIORITY_CONTINUOUS) .await?; let mut conn = env.async_conn().await?; @@ -162,10 +162,10 @@ mod tests { let build_queue = env.build_queue()?; build_queue - .add_crate(&FOO, &V1, PRIORITY_CONTINUOUS, None) + .add_crate(&FOO, &V1, PRIORITY_CONTINUOUS) .await?; build_queue - .add_crate(&BAR, &V1, PRIORITY_CONTINUOUS, None) + .add_crate(&BAR, &V1, PRIORITY_CONTINUOUS) .await?; env.fake_release() diff --git a/crates/bin/docs_rs_web/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json b/crates/bin/docs_rs_web/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json new file mode 100644 index 000000000..95a5f8f94 --- /dev/null +++ b/crates/bin/docs_rs_web/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO queue (name, version, priority)\n VALUES ($1, $2, $3)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n attempt = 0,\n last_attempt = NULL\n ;", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb" +} diff --git a/crates/bin/docs_rs_web/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json b/crates/bin/docs_rs_web/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json deleted file mode 100644 index 55b209a3f..000000000 --- a/crates/bin/docs_rs_web/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO queue (name, version, priority, registry)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n registry = EXCLUDED.registry,\n attempt = 0,\n last_attempt = NULL\n ;", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Text", - "Text", - "Int4", - "Text" - ] - }, - "nullable": [] - }, - "hash": "743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67" -} diff --git a/crates/bin/docs_rs_web/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json b/crates/bin/docs_rs_web/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json new file mode 100644 index 000000000..f04968526 --- /dev/null +++ b/crates/bin/docs_rs_web/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json @@ -0,0 +1,44 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + false, + false, + false, + false + ] + }, + "hash": "83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885" +} diff --git a/crates/bin/docs_rs_web/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/bin/docs_rs_web/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json deleted file mode 100644 index f25ade8d2..000000000 --- a/crates/bin/docs_rs_web/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json +++ /dev/null @@ -1,50 +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 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-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json b/crates/bin/docs_rs_web/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json new file mode 100644 index 000000000..9a98b5711 --- /dev/null +++ b/crates/bin/docs_rs_web/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json @@ -0,0 +1,46 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Float8" + ] + }, + "nullable": [ + false, + false, + false, + false, + false + ] + }, + "hash": "d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7" +} diff --git a/crates/bin/docs_rs_web/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/bin/docs_rs_web/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json deleted file mode 100644 index 57870465c..000000000 --- a/crates/bin/docs_rs_web/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.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\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/src/handlers/builds.rs b/crates/bin/docs_rs_web/src/handlers/builds.rs index 723dd2028..7700425e8 100644 --- a/crates/bin/docs_rs_web/src/handlers/builds.rs +++ b/crates/bin/docs_rs_web/src/handlers/builds.rs @@ -172,12 +172,7 @@ pub(crate) async fn build_trigger_rebuild_handler( .map_err(JsonAxumNope)?; build_queue - .add_crate( - &name, - &version, - PRIORITY_MANUAL_FROM_CRATES_IO, - None, /* because crates.io is the only service that calls this endpoint */ - ) + .add_crate(&name, &version, PRIORITY_MANUAL_FROM_CRATES_IO) .await .map_err(|e| JsonAxumNope(e.into()))?; diff --git a/crates/bin/docs_rs_web/src/handlers/releases.rs b/crates/bin/docs_rs_web/src/handlers/releases.rs index ca19a053c..826b07907 100644 --- a/crates/bin/docs_rs_web/src/handlers/releases.rs +++ b/crates/bin/docs_rs_web/src/handlers/releases.rs @@ -1822,9 +1822,9 @@ mod tests { ); let queue = env.build_queue()?; - queue.add_crate(&FOO, &V1, 0, None).await?; - queue.add_crate(&BAR, &V2, -10, None).await?; - queue.add_crate(&BAZ, &V3, 10, None).await?; + queue.add_crate(&FOO, &V1, 0).await?; + queue.add_crate(&BAR, &V2, -10).await?; + queue.add_crate(&BAZ, &V3, 10).await?; let full = kuchikiki::parse_html().one(web.get("/releases/queue").await?.text().await?); let items = full @@ -1862,8 +1862,8 @@ mod tests { // we have two queued releases, where the build for one is already in progress let queue = env.build_queue()?; - queue.add_crate(&FOO, &V1, 0, None).await?; - queue.add_crate(&BAR, &V2, 0, None).await?; + queue.add_crate(&FOO, &V1, 0).await?; + queue.add_crate(&BAR, &V2, 0).await?; env.fake_release() .await @@ -1937,15 +1937,9 @@ mod tests { async_wrapper(|env| async move { let web = env.web_app().await; let queue = env.build_queue()?; - queue - .add_crate(&FOO, &V1, PRIORITY_CONTINUOUS, None) - .await?; - queue - .add_crate(&BAR, &V2, PRIORITY_CONTINUOUS + 1, None) - .await?; - queue - .add_crate(&BAZ, &V3, PRIORITY_CONTINUOUS - 1, None) - .await?; + queue.add_crate(&FOO, &V1, PRIORITY_CONTINUOUS).await?; + queue.add_crate(&BAR, &V2, PRIORITY_CONTINUOUS + 1).await?; + queue.add_crate(&BAZ, &V3, PRIORITY_CONTINUOUS - 1).await?; let full = kuchikiki::parse_html().one(web.get("/releases/queue").await?.text().await?); let items = full diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json b/crates/lib/docs_rs_build_queue/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json new file mode 100644 index 000000000..95a5f8f94 --- /dev/null +++ b/crates/lib/docs_rs_build_queue/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO queue (name, version, priority)\n VALUES ($1, $2, $3)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n attempt = 0,\n last_attempt = NULL\n ;", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb" +} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json b/crates/lib/docs_rs_build_queue/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json deleted file mode 100644 index 55b209a3f..000000000 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO queue (name, version, priority, registry)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n registry = EXCLUDED.registry,\n attempt = 0,\n last_attempt = NULL\n ;", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Text", - "Text", - "Int4", - "Text" - ] - }, - "nullable": [] - }, - "hash": "743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67" -} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json b/crates/lib/docs_rs_build_queue/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json new file mode 100644 index 000000000..f04968526 --- /dev/null +++ b/crates/lib/docs_rs_build_queue/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json @@ -0,0 +1,44 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + false, + false, + false, + false + ] + }, + "hash": "83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885" +} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/lib/docs_rs_build_queue/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json deleted file mode 100644 index f25ade8d2..000000000 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json +++ /dev/null @@ -1,50 +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 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_build_queue/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json b/crates/lib/docs_rs_build_queue/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json new file mode 100644 index 000000000..9a98b5711 --- /dev/null +++ b/crates/lib/docs_rs_build_queue/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json @@ -0,0 +1,46 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Float8" + ] + }, + "nullable": [ + false, + false, + false, + false, + false + ] + }, + "hash": "d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7" +} diff --git a/crates/lib/docs_rs_build_queue/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/lib/docs_rs_build_queue/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json deleted file mode 100644 index 57870465c..000000000 --- a/crates/lib/docs_rs_build_queue/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.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\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/src/queue/blocking.rs b/crates/lib/docs_rs_build_queue/src/queue/blocking.rs index c88f0ad57..1554c0c28 100644 --- a/crates/lib/docs_rs_build_queue/src/queue/blocking.rs +++ b/crates/lib/docs_rs_build_queue/src/queue/blocking.rs @@ -17,15 +17,9 @@ pub struct BuildQueue { /// sync versions of async methods impl BuildQueue { - pub fn add_crate( - &self, - name: &KrateName, - version: &Version, - priority: i32, - registry: Option<&str>, - ) -> Result<()> { + pub fn add_crate(&self, name: &KrateName, version: &Version, priority: i32) -> Result<()> { self.runtime - .block_on(self.inner.add_crate(name, version, priority, registry)) + .block_on(self.inner.add_crate(name, version, priority)) } pub fn is_locked(&self) -> Result { @@ -86,7 +80,6 @@ impl BuildQueue { name as "name: KrateName", version as "version: Version", priority, - registry, attempt FROM queue WHERE @@ -267,7 +260,7 @@ mod tests { let queue = &env.queue; - queue.add_crate(&KRATE, &V1, 0, None)?; + queue.add_crate(&KRATE, &V1, 0)?; // first let it fail queue.process_next_crate(|krate| { @@ -329,7 +322,7 @@ mod tests { (HIGH_PRIORITY_BAZ, -1000), ]; for krate in &test_crates { - queue.add_crate(&krate.0, &V1, krate.1, None)?; + queue.add_crate(&krate.0, &V1, krate.1)?; } let assert_next = |name| -> Result<()> { @@ -389,9 +382,9 @@ mod tests { let env = test_queue(Config::default())?; let queue = env.queue; assert_eq!(queue.pending_count()?, 0); - queue.add_crate(&FOO, &V1, 0, None)?; + queue.add_crate(&FOO, &V1, 0)?; assert_eq!(queue.pending_count()?, 1); - queue.add_crate(&BAR, &V1, 0, None)?; + queue.add_crate(&BAR, &V1, 0)?; assert_eq!(queue.pending_count()?, 2); queue.process_next_crate(|krate| { @@ -409,11 +402,11 @@ mod tests { let queue = env.queue; assert_eq!(queue.prioritized_count()?, 0); - queue.add_crate(&FOO, &V1, 0, None)?; + queue.add_crate(&FOO, &V1, 0)?; assert_eq!(queue.prioritized_count()?, 1); - queue.add_crate(&BAR, &V1, -100, None)?; + queue.add_crate(&BAR, &V1, -100)?; assert_eq!(queue.prioritized_count()?, 2); - queue.add_crate(&BAZ, &V1, 100, None)?; + queue.add_crate(&BAZ, &V1, 100)?; assert_eq!(queue.prioritized_count()?, 2); queue.process_next_crate(|krate| { @@ -432,9 +425,9 @@ mod tests { assert!(queue.pending_count_by_priority()?.is_empty()); - queue.add_crate(&FOO, &V1, 1, None)?; - queue.add_crate(&BAR, &V2, 2, None)?; - queue.add_crate(&BAZ, &V2, 2, None)?; + queue.add_crate(&FOO, &V1, 1)?; + queue.add_crate(&BAR, &V2, 2)?; + queue.add_crate(&BAZ, &V2, 2)?; assert_eq!( queue.pending_count_by_priority()?, @@ -461,9 +454,9 @@ mod tests { let queue = &env.queue; assert_eq!(env.failed_count(), 0); - queue.add_crate(&FOO, &V1, -100, None)?; + queue.add_crate(&FOO, &V1, -100)?; assert_eq!(env.failed_count(), 0); - queue.add_crate(&BAR, &V1, 0, None)?; + queue.add_crate(&BAR, &V1, 0)?; for _ in 0..MAX_ATTEMPTS { assert_eq!(env.failed_count(), 0); @@ -498,9 +491,9 @@ mod tests { let queue = &env.queue; assert_eq!(env.failed_count(), 0); - queue.add_crate(&FOO, &V1, -100, None)?; + queue.add_crate(&FOO, &V1, -100)?; assert_eq!(env.failed_count(), 0); - queue.add_crate(&BAR, &V1, 0, None)?; + queue.add_crate(&BAR, &V1, 0)?; for _ in 0..MAX_ATTEMPTS { assert_eq!(env.failed_count(), 0); @@ -527,7 +520,7 @@ mod tests { let test_crates = [(BAR, 0), (FOO, -10), (BAZ, 10)]; for krate in &test_crates { - queue.add_crate(&krate.0, &V1, krate.1, None)?; + queue.add_crate(&krate.0, &V1, krate.1)?; } assert_eq!( @@ -566,7 +559,7 @@ mod tests { let name: KrateName = "krate".repeat(100)[..64].parse().unwrap(); - queue.add_crate(&name, &V1, 0, None)?; + queue.add_crate(&name, &V1, 0)?; queue.process_next_crate(|krate| { assert_eq!(name, krate.name); @@ -587,7 +580,7 @@ mod tests { "build".repeat(100) ))?; - queue.add_crate(&KRATE, &long_version, 0, None)?; + queue.add_crate(&KRATE, &long_version, 0)?; queue.process_next_crate(|krate| { assert_eq!(long_version, krate.version); 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 245cf5c53..164edb48d 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 @@ -34,23 +34,20 @@ impl AsyncBuildQueue { name: &KrateName, version: &Version, priority: i32, - registry: Option<&str>, ) -> Result<()> { let mut conn = self.db.get_async().await?; sqlx::query!( - "INSERT INTO queue (name, version, priority, registry) - VALUES ($1, $2, $3, $4) + "INSERT INTO queue (name, version, priority) + VALUES ($1, $2, $3) ON CONFLICT (name, version) DO UPDATE SET priority = EXCLUDED.priority, - registry = EXCLUDED.registry, attempt = 0, last_attempt = NULL ;", name as _, version as _, priority, - registry, ) .execute(&mut *conn) .await?; @@ -105,7 +102,6 @@ impl AsyncBuildQueue { name as "name: KrateName", version as "version: Version", priority, - registry, attempt FROM queue ORDER BY priority ASC, attempt ASC, id ASC"#, @@ -343,8 +339,8 @@ mod tests { let env = test_queue().await?; let queue = env.queue; - queue.add_crate(&KRATE, &V1, 0, None).await?; - queue.add_crate(&KRATE, &V1, 9, None).await?; + queue.add_crate(&KRATE, &V1, 0).await?; + queue.add_crate(&KRATE, &V1, 9).await?; let queued_crates = queue.queued_crates().await?; assert_eq!(queued_crates.len(), 1); @@ -372,7 +368,7 @@ mod tests { assert_eq!(queue.pending_count().await?, 1); - queue.add_crate(&FAILED_KRATE, &V1, 9, None).await?; + queue.add_crate(&FAILED_KRATE, &V1, 9).await?; assert_eq!(queue.pending_count().await?, 1); @@ -397,7 +393,7 @@ mod tests { let env = test_queue().await?; let queue = env.queue; - queue.add_crate(&KRATE, &V1, 0, None).await?; + queue.add_crate(&KRATE, &V1, 0).await?; let mut conn = env.db.async_conn().await?; assert!(queue.has_build_queued(&KRATE, &V1).await.unwrap()); @@ -419,8 +415,8 @@ mod tests { assert_eq!(queue.pending_count().await?, 0); - queue.add_crate(&KRATE, &V1, 0, None).await?; - queue.add_crate(&KRATE, &V2, 0, None).await?; + queue.add_crate(&KRATE, &V1, 0).await?; + queue.add_crate(&KRATE, &V2, 0).await?; assert_eq!(queue.pending_count().await?, 2); queue.remove_version_from_queue(&KRATE, &V1).await?; @@ -445,8 +441,8 @@ mod tests { assert_eq!(queue.pending_count().await?, 0); - queue.add_crate(&KRATE, &V1, 0, None).await?; - queue.add_crate(&KRATE, &V2, 0, None).await?; + queue.add_crate(&KRATE, &V1, 0).await?; + queue.add_crate(&KRATE, &V2, 0).await?; assert_eq!(queue.pending_count().await?, 2); queue.remove_crate_from_queue(&KRATE).await?; @@ -494,7 +490,7 @@ mod tests { // enqueue FOO and BAR with priority 0 for krate in &[FOO, BAR, BAZ] { - queue.add_crate(krate, &V1, 0, None).await?; + queue.add_crate(krate, &V1, 0).await?; } // unchanged priorities @@ -564,7 +560,7 @@ mod tests { let queue = env.queue; for krate in &[FOO, BAR, BAZ] { - queue.add_crate(krate, &V1, PRIORITY_DEFAULT, None).await?; + queue.add_crate(krate, &V1, PRIORITY_DEFAULT).await?; } workspaces::rewrite_repository_stats(&mut conn).await?; diff --git a/crates/lib/docs_rs_build_queue/src/types.rs b/crates/lib/docs_rs_build_queue/src/types.rs index a8a57d012..3c814226d 100644 --- a/crates/lib/docs_rs_build_queue/src/types.rs +++ b/crates/lib/docs_rs_build_queue/src/types.rs @@ -6,7 +6,6 @@ pub struct QueuedCrate { pub name: KrateName, pub version: Version, pub priority: i32, - pub registry: Option, pub attempt: i32, } diff --git a/crates/lib/docs_rs_context/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json b/crates/lib/docs_rs_context/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json new file mode 100644 index 000000000..95a5f8f94 --- /dev/null +++ b/crates/lib/docs_rs_context/.sqlx/query-505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO queue (name, version, priority)\n VALUES ($1, $2, $3)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n attempt = 0,\n last_attempt = NULL\n ;", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "505ad2a45493a67761b3907bb4c9a361255121810d3973ba53500f5e59e884cb" +} diff --git a/crates/lib/docs_rs_context/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json b/crates/lib/docs_rs_context/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json deleted file mode 100644 index 55b209a3f..000000000 --- a/crates/lib/docs_rs_context/.sqlx/query-743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO queue (name, version, priority, registry)\n VALUES ($1, $2, $3, $4)\n ON CONFLICT (name, version) DO UPDATE\n SET priority = EXCLUDED.priority,\n registry = EXCLUDED.registry,\n attempt = 0,\n last_attempt = NULL\n ;", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Text", - "Text", - "Int4", - "Text" - ] - }, - "nullable": [] - }, - "hash": "743604e86c489f7f330adf83d66c810678cd8bbee215532ce26f2c4e76e54a67" -} diff --git a/crates/lib/docs_rs_context/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json b/crates/lib/docs_rs_context/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json new file mode 100644 index 000000000..f04968526 --- /dev/null +++ b/crates/lib/docs_rs_context/.sqlx/query-83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885.json @@ -0,0 +1,44 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + false, + false, + false, + false + ] + }, + "hash": "83fbc5e302bab22138c384ee71ac018e2319f46c86d8d93a8fdfdbcc49e09885" +} diff --git a/crates/lib/docs_rs_context/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json b/crates/lib/docs_rs_context/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json deleted file mode 100644 index f25ade8d2..000000000 --- a/crates/lib/docs_rs_context/.sqlx/query-91398f5f994e0440669ac251f7e5adae4cba983d1479a6b7ccaa1bf6bda7721f.json +++ /dev/null @@ -1,50 +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 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-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json b/crates/lib/docs_rs_context/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json new file mode 100644 index 000000000..9a98b5711 --- /dev/null +++ b/crates/lib/docs_rs_context/.sqlx/query-d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7.json @@ -0,0 +1,46 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n id,\n name as \"name: KrateName\",\n version as \"version: Version\",\n priority,\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": "attempt", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Float8" + ] + }, + "nullable": [ + false, + false, + false, + false, + false + ] + }, + "hash": "d4f4017d058a898fef0ccf7e7ac5a2494e58e728eb9f48e2b754332c0c02a9c7" +} diff --git a/crates/lib/docs_rs_context/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json b/crates/lib/docs_rs_context/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.json deleted file mode 100644 index 57870465c..000000000 --- a/crates/lib/docs_rs_context/.sqlx/query-ea8226cc06934df7dd79e1aab9dc427a5e21c76af88b408a911b6d3b82cdd9d2.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\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_database/migrations/20260512203454_remove-queue-registry.down.sql b/crates/lib/docs_rs_database/migrations/20260512203454_remove-queue-registry.down.sql new file mode 100644 index 000000000..a8e5ec985 --- /dev/null +++ b/crates/lib/docs_rs_database/migrations/20260512203454_remove-queue-registry.down.sql @@ -0,0 +1,2 @@ +ALTER TABLE queue ADD COLUMN registry TEXT; + diff --git a/crates/lib/docs_rs_database/migrations/20260512203454_remove-queue-registry.up.sql b/crates/lib/docs_rs_database/migrations/20260512203454_remove-queue-registry.up.sql new file mode 100644 index 000000000..47a40740c --- /dev/null +++ b/crates/lib/docs_rs_database/migrations/20260512203454_remove-queue-registry.up.sql @@ -0,0 +1 @@ +ALTER TABLE queue DROP COLUMN registry;