Merge remote-tracking branch 'origin/phoebe/tpcc-distributed-naive-http-requests' into phoebe/tpcc/reducer-return-value

Manually resolved conflicts in the module and loader related to removing `spacetimedb_uri`.

Author: gefjon

modules/tpcc/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 anyhow.workspace = true
 log.workspace = true
-spacetimedb = { workspace = true, features = ["unstable"] }
+spacetimedb = { workspace = true, features = ["unstable", "rand"] }
 spacetimedb-sats = { workspace = true, features = ["serde"] }
 http.workspace = true
 serde_json.workspace = true

modules/tpcc/src/lib.rs

@@ -1,4 +1,3 @@
-use remote::reset_remote_warehouses;
 use spacetimedb::{
     log_stopwatch::LogStopwatch, reducer, table, ReducerContext, ScheduleAt, SpacetimeType, Table, Timestamp,
 };
@@ -12,6 +11,7 @@ macro_rules! ensure {
     };
 }
 
+mod load;
 mod new_order;
 mod payment;
 mod remote;
@@ -310,6 +310,12 @@ pub struct DeliveryCompletion {
 
 #[reducer]
 pub fn reset_tpcc(ctx: &ReducerContext) -> Result<(), String> {
+    clear_tpcc_business_tables(ctx);
+    load::clear_load_metadata(ctx);
+    Ok(())
+}
+
+pub(crate) fn clear_tpcc_business_tables(ctx: &ReducerContext) {
     for row in ctx.db.delivery_job().iter() {
         ctx.db.delivery_job().delete(row);
     }
@@ -343,8 +349,6 @@ pub fn reset_tpcc(ctx: &ReducerContext) -> Result<(), String> {
     for row in ctx.db.warehouse().iter() {
         ctx.db.warehouse().delete(row);
     }
-    reset_remote_warehouses(ctx);
-    Ok(())
 }
 
 #[reducer]