Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
name: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
- name: Install Protoc
uses: arduino/setup-protoc@v1
uses: arduino/setup-protoc@149f6c87b92550901b26acd1632e11c3662e381f # v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Rust Cache
uses: Swatinem/rust-cache@v2
uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
- name: make check
run: make check
- name: Catch unexpected changes in the generated code
Expand All @@ -38,16 +38,18 @@ jobs:
NEXTEST_PROFILE: ci
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
- name: Install Protoc
uses: arduino/setup-protoc@v1
uses: arduino/setup-protoc@149f6c87b92550901b26acd1632e11c3662e381f # v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Rust Cache
uses: Swatinem/rust-cache@v2
uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
- name: Install latest nextest release
uses: taiki-e/install-action@nextest
uses: taiki-e/install-action@d9be7d8cda89035c9c843f78bd44d4f72d8403d4 # v2
with:
tool: nextest
- name: unit test
run: make unit-test

Expand All @@ -64,14 +66,14 @@ jobs:
RUST_LOG: info
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
- name: Install Protoc
uses: arduino/setup-protoc@v1
uses: arduino/setup-protoc@149f6c87b92550901b26acd1632e11c3662e381f # v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Rust Cache
uses: Swatinem/rust-cache@v2
uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
- name: install tiup
run: curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh
- name: start tiup playground
Expand All @@ -85,12 +87,14 @@ jobs:
sleep 1
done
- name: Install latest nextest release
uses: taiki-e/install-action@nextest
uses: taiki-e/install-action@d9be7d8cda89035c9c843f78bd44d4f72d8403d4 # v2
with:
tool: nextest
- name: Integration test
run: MULTI_REGION=1 make ${{ matrix.case }}
- name: Upload logs
if: failure()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: cluster-logs
path: |
Expand Down
61 changes: 36 additions & 25 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "surrealdb-tikv-client"
version = "0.3.0-surreal.4"
version = "0.5.0"
keywords = ["TiKV", "KV", "distributed-systems"]
license = "Apache-2.0"
authors = ["The TiKV Project Authors"]
repository = "https://github.com/tikv/client-rust"
description = "The Rust language implementation of TiKV client."
repository = "https://github.com/surrealdb/tikv-client"
description = "The Rust language implementation of TiKV client (SurrealDB fork)."
edition = "2021"

[features]
Expand All @@ -25,42 +25,53 @@ members = [
]

[dependencies]
async-recursion = "0.3"
async-recursion = "1.1"
async-trait = "0.1"
derive-new = "0.5"
either = "1.6"
fail = "0.4"
futures = { version = "0.3" }
lazy_static = "1"
derive-new = "0.7"
either = "1.15"
fail = "0.5"
futures = "0.3"
log = "0.4"
pin-project = "1"
prometheus = { version = "0.13", default-features = false }
prost = "0.12"
rand = "0.8"
pin-project = "1.1"
prometheus = { version = "0.14", default-features = false }
prost = "0.14"
rand = "0.9"
regex = "1"
semver = "1.0"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1"
take_mut = "0.2.2"
thiserror = "1"
thiserror = "2"
tokio = { version = "1", features = ["sync", "rt-multi-thread", "macros"] }
tonic = { version = "0.10", features = ["tls"] }
tonic = { version = "0.14", features = ["tls-native-roots"] }
tonic-prost = "0.14"

# Upstream `tikv/client-rust`'s `[dev-dependencies]` block was much
# heavier (clap 2, env_logger, proptest, proptest-derive, reqwest,
# rstest, tempfile) because it served the CLI examples and the
# in-crate proptest derives — both of which were dropped during the
# SurrealDB fork's modernisation. What's left below is the strict
# minimum the `tests/` tree still needs to exercise the live-cluster
# integration suite against a TiKV cluster.
#
# `serial_test 3.x` replaces the previous 0.5 pin: the latter pulled
# in `parking_lot 0.11` / `instant` (RUSTSEC-2024-0384). 3.x drops
# both. The `#[serial]` attribute API has been stable across the bump.

[dev-dependencies]
clap = "2"
env_logger = "0.10"
fail = { version = "0.4", features = ["failpoints"] }
proptest = "1"
proptest-derive = "0.5.1"
reqwest = { version = "0.11", features = ["json", "native-tls-vendored"] }
rstest = "0.18.2"
env_logger = "0.11"
fail = { version = "0.5", features = ["failpoints"] }
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] }
serde_json = "1"
serial_test = "0.5.0"
tempfile = "3.6"
serial_test = "3"
tokio = { version = "1", features = ["sync", "rt-multi-thread", "macros"] }

[[test]]
name = "failpoint_tests"
path = "tests/failpoint_tests.rs"
required-features = ["fail/failpoints"]

[[test]]
name = "integration_tests"
path = "tests/integration_tests.rs"
required-features = ["integration-tests"]
71 changes: 0 additions & 71 deletions examples/common/mod.rs

This file was deleted.

83 changes: 0 additions & 83 deletions examples/pessimistic.rs

This file was deleted.

Loading
Loading