From 5ee766d4e192d702cf5c08058c3eb9e340adaded Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 2 Sep 2024 20:25:08 -0400 Subject: [PATCH] codegen db, misc --- ...3f845142920b16dc7d36f8640481760405d96.json | 25 ++++++++ ...3e1749f544152578d503fc86d0503a425ae8d.json | 12 ++++ ...359e981c20abebd7024844bea6e1b9486b458.json | 58 +++++++++++++++++++ .../media_uploads.sql | 0 ...neric_inference_jobs.sql => kill_jobs.sql} | 5 ++ ...ic_inference_jobs.sql => pending_jobs.sql} | 0 .../run_migration.rs | 2 +- 7 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 .sqlx/query-3bbfaf131b5228c10320e915f553f845142920b16dc7d36f8640481760405d96.json create mode 100644 .sqlx/query-99e69537a33dd54d4c4433f24863e1749f544152578d503fc86d0503a425ae8d.json create mode 100644 .sqlx/query-f68d01ee1339c0a1ea8301fcc74359e981c20abebd7024844bea6e1b9486b458.json rename _sql/actions_and_analytics/{generic_inference => deprecated}/media_uploads.sql (100%) rename _sql/actions_and_analytics/generic_inference/{kill_generic_inference_jobs.sql => kill_jobs.sql} (91%) rename _sql/actions_and_analytics/generic_inference/{count_generic_inference_jobs.sql => pending_jobs.sql} (100%) diff --git a/.sqlx/query-3bbfaf131b5228c10320e915f553f845142920b16dc7d36f8640481760405d96.json b/.sqlx/query-3bbfaf131b5228c10320e915f553f845142920b16dc7d36f8640481760405d96.json new file mode 100644 index 0000000000..3afef36bdf --- /dev/null +++ b/.sqlx/query-3bbfaf131b5228c10320e915f553f845142920b16dc7d36f8640481760405d96.json @@ -0,0 +1,25 @@ +{ + "db_name": "MySQL", + "query": "\nSELECT\n COUNT(*) as record_count\n FROM media_files as f\n left outer join model_weights as w\n on f.maybe_origin_model_token = w.token\n left outer join model_weights as w_old\n on f.maybe_origin_model_token = w_old.maybe_migration_old_model_token\n WHERE (w.token = ? OR w_old.token = ?)\n AND f.created_at >= ?\n AND f.created_at < ? + INTERVAL 1 DAY\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "record_count", + "type_info": { + "type": "LongLong", + "flags": "NOT_NULL | BINARY", + "char_set": 63, + "max_size": 21 + } + } + ], + "parameters": { + "Right": 4 + }, + "nullable": [ + false + ] + }, + "hash": "3bbfaf131b5228c10320e915f553f845142920b16dc7d36f8640481760405d96" +} diff --git a/.sqlx/query-99e69537a33dd54d4c4433f24863e1749f544152578d503fc86d0503a425ae8d.json b/.sqlx/query-99e69537a33dd54d4c4433f24863e1749f544152578d503fc86d0503a425ae8d.json new file mode 100644 index 0000000000..648fb760af --- /dev/null +++ b/.sqlx/query-99e69537a33dd54d4c4433f24863e1749f544152578d503fc86d0503a425ae8d.json @@ -0,0 +1,12 @@ +{ + "db_name": "MySQL", + "query": "\nINSERT INTO model_weight_usage_counts\nSET\n token = ?,\n on_date = ?,\n usage_count = ?\n\n\nON DUPLICATE KEY UPDATE\n usage_count = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 4 + }, + "nullable": [] + }, + "hash": "99e69537a33dd54d4c4433f24863e1749f544152578d503fc86d0503a425ae8d" +} diff --git a/.sqlx/query-f68d01ee1339c0a1ea8301fcc74359e981c20abebd7024844bea6e1b9486b458.json b/.sqlx/query-f68d01ee1339c0a1ea8301fcc74359e981c20abebd7024844bea6e1b9486b458.json new file mode 100644 index 0000000000..4dda8a339e --- /dev/null +++ b/.sqlx/query-f68d01ee1339c0a1ea8301fcc74359e981c20abebd7024844bea6e1b9486b458.json @@ -0,0 +1,58 @@ +{ + "db_name": "MySQL", + "query": "\n SELECT\n token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n created_at,\n updated_at\n FROM model_weights\n WHERE\n updated_at > ?\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "token: tokens::tokens::model_weights::ModelWeightToken", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 1, + "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 2, + "name": "created_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | BINARY | TIMESTAMP", + "char_set": 63, + "max_size": 19 + } + }, + { + "ordinal": 3, + "name": "updated_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP | ON_UPDATE_NOW", + "char_set": 63, + "max_size": 19 + } + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false, + false, + false + ] + }, + "hash": "f68d01ee1339c0a1ea8301fcc74359e981c20abebd7024844bea6e1b9486b458" +} diff --git a/_sql/actions_and_analytics/generic_inference/media_uploads.sql b/_sql/actions_and_analytics/deprecated/media_uploads.sql similarity index 100% rename from _sql/actions_and_analytics/generic_inference/media_uploads.sql rename to _sql/actions_and_analytics/deprecated/media_uploads.sql diff --git a/_sql/actions_and_analytics/generic_inference/kill_generic_inference_jobs.sql b/_sql/actions_and_analytics/generic_inference/kill_jobs.sql similarity index 91% rename from _sql/actions_and_analytics/generic_inference/kill_generic_inference_jobs.sql rename to _sql/actions_and_analytics/generic_inference/kill_jobs.sql index f3c65824d1..7cf1ea50b2 100644 --- a/_sql/actions_and_analytics/generic_inference/kill_generic_inference_jobs.sql +++ b/_sql/actions_and_analytics/generic_inference/kill_jobs.sql @@ -2,6 +2,11 @@ -- noinspection SqlNoDataSourceInspectionForFile -- noinspection SqlResolveForFile +-- Get pending job count +select count(*) +from generic_inference_jobs +where status = 'pending'; + -- Kill *ALL* pending / outstanding jobs of any type update generic_inference_jobs set status = 'dead' diff --git a/_sql/actions_and_analytics/generic_inference/count_generic_inference_jobs.sql b/_sql/actions_and_analytics/generic_inference/pending_jobs.sql similarity index 100% rename from _sql/actions_and_analytics/generic_inference/count_generic_inference_jobs.sql rename to _sql/actions_and_analytics/generic_inference/pending_jobs.sql diff --git a/crates/cli/production/db-backfill/src/operations/calculate_model_weights_usages/run_migration.rs b/crates/cli/production/db-backfill/src/operations/calculate_model_weights_usages/run_migration.rs index 15bcd90e56..a1c4419f2a 100644 --- a/crates/cli/production/db-backfill/src/operations/calculate_model_weights_usages/run_migration.rs +++ b/crates/cli/production/db-backfill/src/operations/calculate_model_weights_usages/run_migration.rs @@ -45,7 +45,7 @@ pub async fn run_migration(mysql: Pool) -> AnyhowResult<()> { const THREAD_COUNT : usize = 8; let chunk_size = models.len() / THREAD_COUNT; - + let model_chunks = split_vec(models, chunk_size); let mut join_handles = Vec::with_capacity(model_chunks.len());