Skip to content

Commit 851f494

Browse files
committed
Merge branch 'master' into jsdt/views-allow-queries
2 parents 719274d + 0a3dda7 commit 851f494

116 files changed

Lines changed: 5103 additions & 593 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ jobs:
512512
cargo run --features markdown-docs -p spacetimedb-cli > docs/docs/cli-reference.md
513513
pnpm format
514514
git status
515-
if git diff --exit-code HEAD; then
515+
if git diff --exit-code HEAD -- docs/docs/cli-reference.md; then
516516
echo "No docs changes detected"
517517
else
518518
echo "It looks like the CLI docs have changed:"

.github/workflows/discord-posts.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ jobs:
6060
message+=$'\n'
6161
# This uses special Discord syntax for pinging a particular role.
6262
# Note the '&' - this is the difference between pinging a *role* and pinging a *person*.
63-
message+=" (cc <@&${MENTION_ON_FAILURE}>"
6463
if [[ -n "${author_discord_id}" ]]; then
65-
message+=" <@${author_discord_id}>"
64+
message+="<@${author_discord_id}> please investigate these failures."
6665
fi
67-
message+=")"
66+
message+=$'\n'
67+
message+="(cc <@&${MENTION_ON_FAILURE}> - Releases may be affected)"
6868
fi
6969
# Use `jq` to construct the json data blob in the format required by the webhook.
7070
data="$(jq --null-input --arg msg "$message" '.content=$msg')"

Cargo.lock

Lines changed: 41 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,12 @@ members = [
4444
"modules/sdk-test",
4545
"modules/sdk-test-connect-disconnect",
4646
"modules/sdk-test-procedure",
47+
"modules/sdk-test-view",
4748
"sdks/rust/tests/test-client",
4849
"sdks/rust/tests/test-counter",
4950
"sdks/rust/tests/connect_disconnect_client",
5051
"sdks/rust/tests/procedure-client",
52+
"sdks/rust/tests/view-client",
5153
"tools/upgrade-version",
5254
"tools/license-check",
5355
"tools/replace-spacetimedb",
@@ -179,7 +181,7 @@ env_logger = "0.10"
179181
ethnum = { version = "1.5.0", features = ["serde"] }
180182
flate2 = "1.0.24"
181183
flume = { version = "0.11", default-features = false, features = ["async"] }
182-
foldhash = "0.1.4"
184+
foldhash = "0.2.0"
183185
fs-err = "2.9.0"
184186
fs_extra = "1.3.0"
185187
fs2 = "0.4.3"
@@ -189,7 +191,7 @@ futures-util = "0.3"
189191
getrandom02 = { package = "getrandom", version = "0.2" }
190192
git2 = "0.19"
191193
glob = "0.3.1"
192-
hashbrown = { version = "0.15", default-features = false, features = ["equivalent", "inline-more"] }
194+
hashbrown = { version = "0.16.1", default-features = false, features = ["equivalent", "inline-more", "rayon", "serde"] }
193195
headers = "0.4"
194196
heck = "0.4"
195197
hex = "0.4.3"

crates/bench/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,15 @@ spacetimedb-standalone = { path = "../standalone" }
5252
spacetimedb-table = { path = "../table" }
5353
spacetimedb-testing = { path = "../testing" }
5454

55+
ahash.workspace = true
5556
anyhow.workspace = true
5657
anymap.workspace = true
5758
byte-unit.workspace = true
5859
clap.workspace = true
5960
criterion.workspace = true
6061
futures.workspace = true
6162
foldhash.workspace = true
63+
hashbrown.workspace = true
6264
lazy_static.workspace = true
6365
log.workspace = true
6466
mimalloc.workspace = true

crates/bench/benches/index.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
use core::{hint::black_box, iter::repeat_with, time::Duration};
1+
use core::{hash::BuildHasherDefault, hint::black_box, iter::repeat_with, time::Duration};
22
use criterion::{
33
criterion_group, criterion_main,
44
measurement::{Measurement as _, WallTime},
55
BenchmarkGroup, Criterion,
66
};
77
use foldhash::{HashSet, HashSetExt};
8+
use hashbrown::{hash_map::Entry, HashMap};
89
use itertools::Itertools as _;
9-
use spacetimedb_data_structures::map::{Entry, HashMap};
1010
use spacetimedb_sats::layout::Size;
1111
use spacetimedb_table::indexes::{PageIndex, PageOffset, RowPointer, SquashedOffset};
1212
use spacetimedb_table::table_index::unique_direct_index::UniqueDirectIndex;
@@ -191,7 +191,7 @@ impl Index for IBTree {
191191
}
192192

193193
#[derive(Clone)]
194-
struct IAHash(HashMap<K, RowPointer>);
194+
struct IAHash(HashMap<K, RowPointer, BuildHasherDefault<ahash::AHasher>>);
195195
impl Index for IAHash {
196196
const NAME: &'static str = "IAHash";
197197
fn new() -> Self {

crates/bindings-csharp/Codegen.Tests/fixtures/diag/snapshots/Module#FFI.verified.cs

Lines changed: 56 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)