studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bump rocksdb.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-06-08 05:04:36 +00:00
parent f63cc84c98
commit e6d782c701
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

@@ -3556,8 +3556,8 @@ dependencies = [
[[package]] [[package]]
name = "rust-librocksdb-sys" name = "rust-librocksdb-sys"
version = "0.33.0+9.11.1" version = "0.37.0+10.2.1"
source = "git+https://github.com/matrix-construct/rust-rocksdb?rev=cca241c5ca48f7c7f5c1469294f11dc156dd987a#cca241c5ca48f7c7f5c1469294f11dc156dd987a" source = "git+https://github.com/matrix-construct/rust-rocksdb?rev=225a42519276e502205bdc845cebdb22d70ee245#225a42519276e502205bdc845cebdb22d70ee245"
dependencies = [ dependencies = [
"bindgen 0.71.1", "bindgen 0.71.1",
"bzip2-sys", "bzip2-sys",
@@ -3573,8 +3573,8 @@ dependencies = [
[[package]] [[package]]
name = "rust-rocksdb" name = "rust-rocksdb"
version = "0.37.0" version = "0.41.0"
source = "git+https://github.com/matrix-construct/rust-rocksdb?rev=cca241c5ca48f7c7f5c1469294f11dc156dd987a#cca241c5ca48f7c7f5c1469294f11dc156dd987a" source = "git+https://github.com/matrix-construct/rust-rocksdb?rev=225a42519276e502205bdc845cebdb22d70ee245#225a42519276e502205bdc845cebdb22d70ee245"
dependencies = [ dependencies = [
"libc", "libc",
"rust-librocksdb-sys", "rust-librocksdb-sys",
@@ -4380,7 +4380,7 @@ dependencies = [
[[package]] [[package]]
name = "tikv-jemalloc-ctl" name = "tikv-jemalloc-ctl"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/matrix-construct/jemallocator?rev=82af58d6a13ddd5dcdc7d4e91eae3b63292995b8#82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" source = "git+https://github.com/matrix-construct/jemallocator?rev=03bed96afbbc898bef4d4f7d335c0519e3d1afad#03bed96afbbc898bef4d4f7d335c0519e3d1afad"
dependencies = [ dependencies = [
"libc", "libc",
"paste", "paste",
@@ -4390,7 +4390,7 @@ dependencies = [
[[package]] [[package]]
name = "tikv-jemalloc-sys" name = "tikv-jemalloc-sys"
version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
source = "git+https://github.com/matrix-construct/jemallocator?rev=82af58d6a13ddd5dcdc7d4e91eae3b63292995b8#82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" source = "git+https://github.com/matrix-construct/jemallocator?rev=03bed96afbbc898bef4d4f7d335c0519e3d1afad#03bed96afbbc898bef4d4f7d335c0519e3d1afad"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@@ -4399,7 +4399,7 @@ dependencies = [
[[package]] [[package]]
name = "tikv-jemallocator" name = "tikv-jemallocator"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/matrix-construct/jemallocator?rev=82af58d6a13ddd5dcdc7d4e91eae3b63292995b8#82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" source = "git+https://github.com/matrix-construct/jemallocator?rev=03bed96afbbc898bef4d4f7d335c0519e3d1afad#03bed96afbbc898bef4d4f7d335c0519e3d1afad"
dependencies = [ dependencies = [
"libc", "libc",
"tikv-jemalloc-sys", "tikv-jemalloc-sys",

8
Cargo.toml
View File

@@ -354,7 +354,7 @@ default-features = false
[workspace.dependencies.rust-rocksdb] [workspace.dependencies.rust-rocksdb]
git = "https://github.com/matrix-construct/rust-rocksdb" git = "https://github.com/matrix-construct/rust-rocksdb"
rev = "cca241c5ca48f7c7f5c1469294f11dc156dd987a" rev = "225a42519276e502205bdc845cebdb22d70ee245"
default-features = false default-features = false
features = [ features = [
"multi-threaded-cf", "multi-threaded-cf",
@@ -459,7 +459,7 @@ default-features = false
[workspace.dependencies.tikv-jemallocator] [workspace.dependencies.tikv-jemallocator]
git = "https://github.com/matrix-construct/jemallocator" git = "https://github.com/matrix-construct/jemallocator"
rev = "82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" rev = "03bed96afbbc898bef4d4f7d335c0519e3d1afad"
default-features = false default-features = false
features = [ features = [
"background_threads_runtime_support", "background_threads_runtime_support",
@@ -468,13 +468,13 @@ features = [
[workspace.dependencies.tikv-jemalloc-ctl] [workspace.dependencies.tikv-jemalloc-ctl]
git = "https://github.com/matrix-construct/jemallocator" git = "https://github.com/matrix-construct/jemallocator"
rev = "82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" rev = "03bed96afbbc898bef4d4f7d335c0519e3d1afad"
default-features = false default-features = false
features = ["use_std"] features = ["use_std"]
[workspace.dependencies.tikv-jemalloc-sys] [workspace.dependencies.tikv-jemalloc-sys]
git = "https://github.com/matrix-construct/jemallocator" git = "https://github.com/matrix-construct/jemallocator"
rev = "82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" rev = "03bed96afbbc898bef4d4f7d335c0519e3d1afad"
default-features = false default-features = false
features = [ features = [
"background_threads_runtime_support", "background_threads_runtime_support",

12
docker/Dockerfile.rocksdb
View File

@@ -1,6 +1,9 @@
# syntax = docker/dockerfile:1.11-labs # syntax = docker/dockerfile:1.11-labs
FROM input AS rocksdb-fetch FROM input AS rocksdb-fetch
ARG rocksdb_branch="tuwunel-changes"
ARG rust_rocksdb_branch="conduwuit-changes"
ARG librocksdb_submodule="librocksdb-sys/rocksdb"
WORKDIR / WORKDIR /
COPY --link --from=input . . COPY --link --from=input . .
@@ -10,12 +13,13 @@ COPY --link --from=recipe rocksdb.url .
RUN <<EOF RUN <<EOF
set -eux set -eux
submodule="librocksdb-sys/rocksdb" rocksdb_url="$(cat rocksdb.url)"
url="$(cat rocksdb.url)"
git clone \ git clone \
--depth 1 \ --depth 1 \
--recurse-submodules="${submodule}" \ --single-branch \
"${url}" \ --branch "${rust_rocksdb_branch}" \
"--recurse-submodules=${librocksdb_submodule}" \
"${rocksdb_url}" \
/usr/src/rocksdb /usr/src/rocksdb
EOF EOF

1
docker/Dockerfile.source
View File

@@ -91,6 +91,7 @@ RUN \
package="rust-librocksdb-sys" package="rust-librocksdb-sys"
cmd="cargo tree --manifest-path ${manifest} -f {r} -p ${package}" cmd="cargo tree --manifest-path ${manifest} -f {r} -p ${package}"
url="$(rustup run ${rust_toolchain} ${cmd} | head -n 1)" url="$(rustup run ${rust_toolchain} ${cmd} | head -n 1)"
url="https://github.com/matrix-construct/rust-rocksdb" #TODO fixme
echo "$url" > rocksdb.url echo "$url" > rocksdb.url
sha1sum recipe.json rocksdb.url sha1sum recipe.json rocksdb.url