[tyler/fix-on-conflict]: Merge remote-tracking branch 'origin/master' into tyler/fix-on-conflict

Author: bfops

.github/workflows/attach-artifacts.yml

@@ -0,0 +1,67 @@
+name: Attach client binaries to release
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        description: "Release tag (e.g. v1.9.0)"
+        required: true
+
+jobs:
+  upload-assets:
+    runs-on: spacetimedb-new-runner
+    container:
+      image: localhost:5000/spacetimedb-ci:latest
+      options: >-
+        --privileged
+    permissions:
+      contents: write  # needed to modify releases
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Download artifacts from private base URL
+        env:
+          RELEASE_TAG: ${{ github.event.inputs.release_tag }}
+          BASE_URL: ${{ secrets.ARTIFACT_BASE_URL }}
+        run: |
+          set -euo pipefail
+
+          FULL_URL="$BASE_URL/$RELEASE_TAG"
+
+          mkdir -p artifacts
+          cd artifacts
+
+          download() {
+            local filename="$1"
+            if ! wget -q "${FULL_URL}/${filename}" -O "${filename}"; then
+              echo "Failed to download ${filename}"
+              exit 1
+            fi
+          }
+
+          download "spacetime-aarch64-apple-darwin.tar.gz"
+          download "spacetime-aarch64-unknown-linux-gnu.tar.gz"
+          download "spacetime-x86_64-apple-darwin.tar.gz"
+          download "spacetime-x86_64-pc-windows-msvc.zip"
+          download "spacetime-x86_64-unknown-linux-gnu.tar.gz"
+          download "spacetimedb-update-aarch64-apple-darwin"
+          download "spacetimedb-update-aarch64-unknown-linux-gnu"
+          download "spacetimedb-update-x86_64-apple-darwin"
+          download "spacetimedb-update-x86_64-pc-windows-msvc.exe"
+          download "spacetimedb-update-x86_64-unknown-linux-gnu"
+
+      - name: Upload artifacts to GitHub Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RELEASE_TAG: ${{ github.event.inputs.release_tag }}
+        run: |
+          set -euo pipefail
+
+          cd artifacts
+
+          gh release upload "$RELEASE_TAG" ./* \
+            --repo "$GITHUB_REPOSITORY" \
+            --clobber
+

.github/workflows/ci.yml

@@ -317,16 +317,21 @@ jobs:
           fi
 
   update:
-    name: Test spacetimedb-update flow
+    name: Test spacetimedb-update flow (${{ matrix.target }})
     permissions: read-all
     strategy:
       matrix:
         include:
-          - { target: x86_64-unknown-linux-gnu, runner: spacetimedb-runner }
+          - runner: spacetimedb-new-runner
+            target: x86_64-unknown-linux-gnu
+            container:
+              image: localhost:5000/spacetimedb-ci:latest
+              options: --privileged
           - { target: aarch64-unknown-linux-gnu, runner: arm-runner }
           - { target: aarch64-apple-darwin, runner: macos-latest }
           - { target: x86_64-pc-windows-msvc, runner: windows-latest }
     runs-on: ${{ matrix.runner }}
+    container: ${{ matrix.container }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -512,7 +517,7 @@ jobs:
           cargo run --features markdown-docs -p spacetimedb-cli > docs/docs/cli-reference.md
           pnpm format
           git status
-          if git diff --exit-code HEAD; then
+          if git diff --exit-code HEAD -- docs/docs/cli-reference.md; then
             echo "No docs changes detected"
           else
             echo "It looks like the CLI docs have changed:"

.github/workflows/discord-posts.yml

@@ -60,11 +60,11 @@ jobs:
             message+=$'\n'
             # This uses special Discord syntax for pinging a particular role.
             # Note the '&' - this is the difference between pinging a *role* and pinging a *person*.
-            message+=" (cc <@&${MENTION_ON_FAILURE}>"
             if [[ -n "${author_discord_id}" ]]; then
-              message+=" <@${author_discord_id}>"
+              message+="<@${author_discord_id}> please investigate these failures."
             fi
-            message+=")"
+            message+=$'\n'
+            message+="(cc <@&${MENTION_ON_FAILURE}> - Releases may be affected)"
           fi
           # Use `jq` to construct the json data blob in the format required by the webhook.
           data="$(jq --null-input --arg msg "$message" '.content=$msg')"

.github/workflows/upgrade-version-check.yml

@@ -8,7 +8,10 @@ permissions: read-all
 
 jobs:
   version_upgrade_check:
-    runs-on: spacetimedb-runner
+    runs-on: spacetimedb-new-runner
+    container:
+      image: localhost:5000/spacetimedb-ci:latest
+      options: --privileged
     steps:
       - name: Checkout
         uses: actions/checkout@v3

Cargo.lock

@@ -44,10 +44,12 @@ members = [
   "modules/sdk-test",
   "modules/sdk-test-connect-disconnect",
   "modules/sdk-test-procedure",
+  "modules/sdk-test-view",
   "sdks/rust/tests/test-client",
   "sdks/rust/tests/test-counter",
   "sdks/rust/tests/connect_disconnect_client",
   "sdks/rust/tests/procedure-client",
+  "sdks/rust/tests/view-client",
   "tools/upgrade-version",
   "tools/license-check",
   "tools/replace-spacetimedb",
@@ -179,7 +181,7 @@ env_logger = "0.10"
 ethnum = { version = "1.5.0", features = ["serde"] }
 flate2 = "1.0.24"
 flume = { version = "0.11", default-features = false, features = ["async"] }
-foldhash = "0.1.4"
+foldhash = "0.2.0"
 fs-err = "2.9.0"
 fs_extra = "1.3.0"
 fs2 = "0.4.3"
@@ -189,7 +191,7 @@ futures-util = "0.3"
 getrandom02 = { package = "getrandom", version = "0.2" }
 git2 = "0.19"
 glob = "0.3.1"
-hashbrown = { version = "0.15", default-features = false, features = ["equivalent", "inline-more"] }
+hashbrown = { version = "0.16.1", default-features = false, features = ["equivalent", "inline-more", "rayon", "serde"] }
 headers = "0.4"
 heck = "0.4"
 hex = "0.4.3"

Cargo.toml

@@ -52,13 +52,15 @@ spacetimedb-standalone = { path = "../standalone" }
 spacetimedb-table = { path = "../table" }
 spacetimedb-testing = { path = "../testing" }
 
+ahash.workspace = true
 anyhow.workspace = true
 anymap.workspace = true
 byte-unit.workspace = true
 clap.workspace = true
 criterion.workspace = true
 futures.workspace = true
 foldhash.workspace = true
+hashbrown.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 mimalloc.workspace = true

crates/bench/Cargo.toml

@@ -1,12 +1,12 @@
-use core::{hint::black_box, iter::repeat_with, time::Duration};
+use core::{hash::BuildHasherDefault, hint::black_box, iter::repeat_with, time::Duration};
 use criterion::{
     criterion_group, criterion_main,
     measurement::{Measurement as _, WallTime},
     BenchmarkGroup, Criterion,
 };
 use foldhash::{HashSet, HashSetExt};
+use hashbrown::{hash_map::Entry, HashMap};
 use itertools::Itertools as _;
-use spacetimedb_data_structures::map::{Entry, HashMap};
 use spacetimedb_sats::layout::Size;
 use spacetimedb_table::indexes::{PageIndex, PageOffset, RowPointer, SquashedOffset};
 use spacetimedb_table::table_index::unique_direct_index::UniqueDirectIndex;
@@ -191,7 +191,7 @@ impl Index for IBTree {
 }
 
 #[derive(Clone)]
-struct IAHash(HashMap<K, RowPointer>);
+struct IAHash(HashMap<K, RowPointer, BuildHasherDefault<ahash::AHasher>>);
 impl Index for IAHash {
     const NAME: &'static str = "IAHash";
     fn new() -> Self {