Merge branch 'master' into bfops/wasm-test

Author: bfops

crates/bench/benches/index.rs

@@ -1,4 +1,6 @@
-use core::{any::type_name, hash::BuildHasherDefault, hint::black_box, iter::repeat_with, mem, time::Duration};
+use core::{
+    any::type_name, hash::BuildHasherDefault, hash::Hash, hint::black_box, iter::repeat_with, mem, time::Duration,
+};
 use criterion::{
     criterion_group, criterion_main,
     measurement::{Measurement as _, WallTime},
@@ -14,13 +16,9 @@ use rand::{
 use spacetimedb_lib::AlgebraicValue;
 use spacetimedb_sats::{layout::Size, product, u256};
 use spacetimedb_table::indexes::{PageIndex, PageOffset, RowPointer, SquashedOffset};
-use spacetimedb_table::table_index::uniquemap::UniqueMap;
-use spacetimedb_table::table_index::Index as _;
-use spacetimedb_table::table_index::{
-    unique_direct_index::{ToFromUsize, UniqueDirectIndex},
-    KeySize,
-};
-use std::hash::Hash;
+use spacetimedb_table::table_index::unique_btree_index::UniqueBTreeIndex;
+use spacetimedb_table::table_index::unique_direct_index::{ToFromUsize, UniqueDirectIndex};
+use spacetimedb_table::table_index::{Index as _, KeySize};
 
 fn time<R>(body: impl FnOnce() -> R) -> Duration {
     let start = WallTime.start();
@@ -201,7 +199,7 @@ trait Index: Clone {
 }
 
 #[derive(Clone)]
-struct IBTree<K: KeySize<MemoStorage: Clone + Default>>(UniqueMap<K>);
+struct IBTree<K: KeySize<MemoStorage: Clone + Default>>(UniqueBTreeIndex<K>);
 impl<K: KeySize<MemoStorage: Clone + Default> + Clone + Eq + Hash + Ord> Index for IBTree<K> {
     type K = K;
     fn new() -> Self {

crates/cli/src/subcommands/dev.rs

@@ -470,8 +470,23 @@ pub async fn exec(mut config: Config, args: &ArgMatches) -> Result<(), anyhow::E
 
     let spacetime_config = loaded_config.as_ref().map(|lc| &lc.config);
     let using_spacetime_config = spacetime_config.is_some();
-    let generate_configs_from_file: Vec<HashMap<String, serde_json::Value>> =
-        spacetime_config.and_then(|c| c.generate.clone()).unwrap_or_default();
+    let generate_configs_from_file: Vec<HashMap<String, serde_json::Value>> = {
+        let mut entries = spacetime_config.and_then(|c| c.generate.clone()).unwrap_or_default();
+        // Inherit top-level `module-path` into generate entries that don't specify their own.
+        // Without this, `generate` entries fall back to the hardcoded "spacetimedb" default
+        // even when the top-level config has a module-path set.
+        if let Some(top_level_module_path) = spacetime_config
+            .and_then(|c| c.additional_fields.get("module-path"))
+            .cloned()
+        {
+            for entry in &mut entries {
+                entry
+                    .entry("module-path".to_string())
+                    .or_insert(top_level_module_path.clone());
+            }
+        }
+        entries
+    };
 
     // Re-resolve publish targets now that config files may have been created by init.
     if publish_configs.is_empty() {