Merge branch 'master' into bfops/fix-cli-rebuild

Author: bfops

.github/workflows/ci.yml

@@ -338,9 +338,6 @@ jobs:
 
           wasm-bindgen --version
 
-      - name: Check engine simulation build
-        run: cargo check -p spacetimedb-engine --no-default-features --features simulation
-
         # Source emsdk environment to make emcc (Emscripten compiler) available in PATH.
       - name: Run tests
         run: |

.github/workflows/llm-benchmark-periodic.yml

@@ -113,7 +113,7 @@ jobs:
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           LLM_VENDOR: openrouter
           LLM_BENCHMARK_API_KEY: ${{ secrets.LLM_BENCHMARK_API_KEY }}
-          LLM_BENCHMARK_UPLOAD_URL: ${{ inputs.LLM_BENCHMARK_UPLOAD_URL }}
+          LLM_BENCHMARK_UPLOAD_URL: ${{ vars.LLM_BENCHMARK_UPLOAD_URL }}
           DOTNET_MULTILEVEL_LOOKUP: "0"
           DOTNET_CLI_HOME: ${{ runner.temp }}/dotnet-home
           DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "1"

.github/workflows/release.yml

@@ -124,11 +124,11 @@ jobs:
       - name: Run release (dry-run)
         if: ${{ inputs.dry_run }}
         # NOTE: This will print a warning that `cargo-release release crates` dry runs are not supported
-        run: cargo-release release crates --dry-run
+        run: cargo-release release crates ${{ github.event.inputs.release_tag }} --dry-run
 
       - name: Run release
         if: ${{ !inputs.dry_run }}
-        run: cargo-release release crates
+        run: cargo-release release crates ${{ github.event.inputs.release_tag }}
 
   release-csharp:
     needs: build-cargo-release

Cargo.lock

@@ -77,7 +77,7 @@ members = [
   "crates/bindings-typescript/test-app/server",
   "crates/bindings-typescript/test-react-router-app/server",
   "crates/bindings-typescript/test-solid-router/server",
-  "crates/query-builder",
+  "crates/query-builder", "crates/dst",
 ]
 default-members = ["crates/cli", "crates/standalone", "crates/update"]
 # cargo feature graph resolver. v3 is default in edition2024 but workspace

Cargo.toml

@@ -100,14 +100,14 @@ pub struct ModuleHostWithBootstrap {
 /// The handle owns any wait state needed to prove that the database has a
 /// durable `st_module` row.
 pub struct BootstrapCompletion {
-    program_hash: Hash,
+    bootstrap_generation: u64,
     status: ProgramBootstrap,
 }
 
 /// Has the module been bootstrapped from the controldb?
 ///
 /// Once we have inserted into `st_module`, bootstrapping is no longer necessary,
-/// and the initial program bytes can be dropped fromt the controldb.
+/// and the initial program bytes can be dropped from the controldb.
 enum ProgramBootstrap {
     /// The module's program bytes have already been written to `st_module`
     Durable,
@@ -119,32 +119,32 @@ enum ProgramBootstrap {
 }
 
 impl BootstrapCompletion {
-    fn durable(program_hash: Hash) -> Self {
+    fn durable(bootstrap_generation: u64) -> Self {
         Self {
-            program_hash,
+            bootstrap_generation,
             status: ProgramBootstrap::Durable,
         }
     }
 
-    fn pending(program_hash: Hash, tx_offset: TransactionOffset, durable_offset: Option<DurableOffset>) -> Self {
+    fn pending(bootstrap_generation: u64, tx_offset: TransactionOffset, durable_offset: Option<DurableOffset>) -> Self {
         Self {
-            program_hash,
+            bootstrap_generation,
             status: ProgramBootstrap::Pending {
                 tx_offset,
                 durable_offset,
             },
         }
     }
 
-    pub fn program_hash(&self) -> Hash {
-        self.program_hash
+    pub fn bootstrap_generation(&self) -> u64 {
+        self.bootstrap_generation
     }
 
     /// Wait until it is safe to complete program bootstrap in controldb.
     /// That is, wait until the initial `st_module` insert becomes durable.
-    pub async fn wait(self) -> anyhow::Result<Hash> {
+    pub async fn wait(self) -> anyhow::Result<()> {
         match self.status {
-            ProgramBootstrap::Durable => Ok(self.program_hash),
+            ProgramBootstrap::Durable => Ok(()),
             ProgramBootstrap::Pending {
                 tx_offset,
                 durable_offset,
@@ -160,7 +160,7 @@ impl BootstrapCompletion {
                         .context("failed waiting for initialized program to become durable")?;
                 }
 
-                Ok(self.program_hash)
+                Ok(())
             }
         }
     }
@@ -1132,7 +1132,8 @@ impl Host {
                 (program, true)
             }
         };
-        let mut bootstrap_completion = Some(BootstrapCompletion::durable(program.hash));
+        let bootstrap_generation = database.bootstrap_generation;
+        let mut bootstrap_completion = Some(BootstrapCompletion::durable(bootstrap_generation));
 
         let relational_db = Arc::new(db);
         let (program, launched) = match HostType::from(program.kind) {
@@ -1222,13 +1223,12 @@ impl Host {
         };
 
         if program_needs_init {
-            let program_hash = program.hash;
             let InitDatabaseResult { reducer, tx_offset } = launched.module_host.init_database(program).await?;
             if let Some(call_result) = reducer {
                 Result::from(call_result)?;
             }
             bootstrap_completion = Some(BootstrapCompletion::pending(
-                program_hash,
+                bootstrap_generation,
                 tx_offset,
                 launched.module_host.durable_tx_offset(),
             ));
@@ -1540,6 +1540,7 @@ pub(crate) async fn extract_schema_with_pools(
         owner_identity,
         host_type,
         initial_program: program.hash,
+        bootstrap_generation: 0,
     };
 
     let core = AllocatedJobCore::default();

crates/core/src/host/host_controller.rs

@@ -1377,6 +1377,7 @@ mod test {
                     owner_identity: Identity::ZERO,
                     host_type: HostType::Wasm,
                     initial_program: Hash::ZERO,
+                    bootstrap_generation: 0,
                 },
                 replica_id: 0,
                 logger,

crates/core/src/host/instance_env.rs

@@ -37,6 +37,8 @@ pub struct Database {
     ///
     /// Updating the database's module will **not** change this value.
     pub initial_program: Hash,
+    /// Generation of the current bootstrap requirement for `initial_program`.
+    pub bootstrap_generation: u64,
 }
 
 #[derive(Clone, PartialEq, Serialize, Deserialize)]

crates/core/src/messages/control_db.rs

@@ -10,14 +10,14 @@ rust-version.workspace = true
 spacetimedb-data-structures.workspace = true
 spacetimedb-lib = { workspace = true, features = ["serde", "metrics_impls"] }
 spacetimedb-commitlog.workspace = true
-spacetimedb-durability = { path = "../durability", default-features = false }
+spacetimedb-durability.workspace = true
 spacetimedb-metrics.workspace = true
 spacetimedb-primitives.workspace = true
 spacetimedb-paths.workspace = true
 spacetimedb-sats = { workspace = true, features = ["serde"] }
 spacetimedb-schema.workspace = true
 spacetimedb-table.workspace = true
-spacetimedb-snapshot = { path = "../snapshot", default-features = false }
+spacetimedb-snapshot.workspace = true
 spacetimedb-execution.workspace = true
 
 anyhow = { workspace = true, features = ["backtrace"] }
@@ -39,9 +39,7 @@ thin-vec.workspace = true
 [features]
 # Print a warning when doing an unindexed `iter_by_col_range` on a large table.
 unindexed_iter_by_col_range_warn = []
-default = ["unindexed_iter_by_col_range_warn", "tokio"]
-tokio = ["spacetimedb-durability/tokio", "spacetimedb-snapshot/tokio"]
-simulation = ["spacetimedb-durability/simulation", "spacetimedb-snapshot/simulation"]
+default = ["unindexed_iter_by_col_range_warn"]
 # Enable test helpers and utils
 test = ["spacetimedb-commitlog/test", "spacetimedb-schema/test"]
 

crates/datastore/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "spacetimedb-dst"
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+clap.workspace = true
+spacetimedb-datastore.workspace = true
+spacetimedb-commitlog.workspace = true
+spacetimedb-durability.workspace = true
+spacetimedb-engine.workspace = true
+spacetimedb-lib.workspace = true
+spacetimedb-primitives.workspace = true
+spacetimedb-runtime = { workspace = true, features = ["simulation"] }
+spacetimedb-sats.workspace = true
+spacetimedb-schema.workspace = true
+spacetimedb-table.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+
+[lints]
+workspace = true