Introduce API V2

.github/config/tikv.toml

@@ -0,0 +1,3 @@
+[storage]
+enable-ttl = true
+api-version = 2

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
             target/
           key: cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-                        cargo-
+            cargo-
       - name: Run format
         env:
           RUSTFLAGS: -Dwarnings
@@ -69,14 +69,21 @@ jobs:
         working-directory: ./
         run: |
           cargo check
-      - name: Setup tikv instance
+      - name: Setup TiKV instance
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh
-          /home/runner/.tiup/bin/tiup playground nightly --mode tikv-slim --without-monitor &
+          ~/.tiup/bin/tiup install playground tikv:nightly pd:nightly
+          ~/.tiup/bin/tiup playground nightly --mode tikv-slim \
+            --without-monitor --kv 3 --kv.config .github/config/tikv.toml &
+          while :; do
+            echo "waiting cluster to be ready"
+            [[ "$(curl -I http://127.0.0.1:2379/pd/api/v1/regions 2>/dev/null | head -n 1 | cut -d$' ' -f2)" -ne "405" ]] || break
+            sleep 1
+          done
       - name: Setup tikv-service
         run: |
           cargo build -r
-          ./target/release/tikv-service-server --config="config.toml" &
+          ./target/release/tikv-service-server --config=config.toml &
       - name: Setup test tool env
         uses: actions/setup-python@v3
         with:

.gitignore

@@ -1,2 +1,5 @@
 /target
 **/*.rs.bk
+/.idea
+**/__pycache__
+**/*.log

Cargo.toml

@@ -20,25 +20,36 @@ atoi = "0.3.2"
 bytes = "1"
 crc = "2.0"
 structopt = "0.3.14"
-slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
+slog = { version = "2.3", features = [
+    "max_level_trace",
+    "release_max_level_debug",
+] }
 slog-term = { version = "2.4" }
 tokio = { version = "1", features = ["full"] }
 tokio-stream = "0.1"
 tokio-util = { version = "0.7.1", features = ["rt"] }
-tikv-client = { git = "https://github.com/yongman/client-rust.git", rev = "6675112143896419d233394b5e02612f50a72a3d" }
+tikv-client = { git = "https://github.com/iosmanthus/client-rust.git", branch = "api-v2" }
 lazy_static = "1.4.0"
 thiserror = "1"
-prometheus = { version = "0.13.0", features = ["process"]}
+prometheus = { version = "0.13.0", features = ["process"] }
 pprof = { version = "0.9", features = ["flamegraph", "protobuf-codec"] }
 hyper = { version = "0.14.17", features = ["full"] }
 async-std = { version = "1.11.0", features = ["unstable"] }
-async-tls = { version = "0.11.0", features = ["server"], default-features = false }
+async-tls = { version = "0.11.0", features = [
+    "server",
+], default-features = false }
 rustls = "0.19.0"
-rand = {version = "0.8.5", features = ["small_rng"] }
+rand = { version = "0.8.5", features = ["small_rng"] }
 toml = { version = "0.5.8" }
 serde = { version = "1.0", features = ["derive"] }
 futures = { version = "0.3", default-features = false }
-mlua = { version = "0.7.4", features = ["lua51", "async", "vendored", "macros", "send"]}
+mlua = { version = "0.7.4", features = [
+    "lua51",
+    "async",
+    "vendored",
+    "macros",
+    "send",
+] }
 sha1 = "0.10.0"
 hex = "0.4.3"
 

rust-toolchain

@@ -1 +1 @@
-1.61.0
+nightly-2022-05-01

src/cmd/cmdtype.rs

@@ -1,12 +1,12 @@
 use std::sync::Arc;
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use crate::tikv::errors::AsyncResult;
 use crate::tikv::string::StringCommandCtx;
 use crate::utils::resp_invalid_arguments;
 use crate::{Connection, Frame, Parse};
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 use crate::config::is_use_txn_api;

src/cmd/del.rs

@@ -2,12 +2,12 @@ use std::sync::Arc;
 
 use crate::config::is_use_txn_api;
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use crate::tikv::errors::{AsyncResult, REDIS_NOT_SUPPORTED_ERR};
 use crate::tikv::string::StringCommandCtx;
 use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame, Parse};
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 use super::Invalid;

src/cmd/exists.rs

@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
 use crate::config::is_use_txn_api;
+use crate::tikv::client::Transaction;
 use crate::tikv::errors::AsyncResult;
 use crate::tikv::string::StringCommandCtx;
 use crate::utils::resp_invalid_arguments;
 use crate::{Connection, Frame, Parse};
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 use crate::cmd::Invalid;

src/cmd/expire.rs

@@ -3,12 +3,12 @@ use std::sync::Arc;
 use crate::cmd::Invalid;
 use crate::config::is_use_txn_api;
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use crate::tikv::errors::{AsyncResult, REDIS_NOT_SUPPORTED_ERR};
 use crate::tikv::string::StringCommandCtx;
 use crate::utils::{resp_err, resp_invalid_arguments, timestamp_from_ttl};
 use crate::{Connection, Frame, Parse};
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/get.rs

@@ -1,12 +1,12 @@
 use std::sync::Arc;
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use crate::tikv::errors::AsyncResult;
 use crate::tikv::string::StringCommandCtx;
 use crate::utils::resp_invalid_arguments;
 use crate::{Connection, Frame, Parse};
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 use crate::config::is_use_txn_api;

src/cmd/hdel.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/hexists.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/hget.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/hgetall.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/hincrby.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/hkeys.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/hlen.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/hmget.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/hset.rs

@@ -8,8 +8,9 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::{KvPair, Transaction};
+use tikv_client::KvPair;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/hstrlen.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/hvals.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/incrdecr.rs

@@ -8,8 +8,8 @@ use crate::{Connection, Frame, Parse};
 
 use crate::cmd::Invalid;
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/lindex.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/linsert.rs

@@ -8,9 +8,9 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use bytes::Bytes;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 use super::Invalid;

src/cmd/llen.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/lrange.rs

@@ -8,8 +8,8 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 #[derive(Debug)]

src/cmd/lrem.rs

@@ -8,9 +8,9 @@ use crate::utils::{resp_err, resp_invalid_arguments};
 use crate::{Connection, Frame};
 
 use crate::config::LOGGER;
+use crate::tikv::client::Transaction;
 use bytes::Bytes;
 use slog::debug;
-use tikv_client::Transaction;
 use tokio::sync::Mutex;
 
 use super::Invalid;