Merge pull request #20 from Smityz/timeout

add timeout for rawkv function

Author: andylokandy

Cargo.lock

@@ -13,9 +13,9 @@ anyhow = "1"
 cxx = "1.0.18"
 futures = "0.3"
 env_logger = "0.8"
+tokio = { version = "1.28.2", features = ["full"] }
 tikv-client = { git = "https://github.com/tikv/client-rust.git", rev = "8875c96" }
 
 [patch.crates-io]
 raft-proto = { git = "https://github.com/tikv/raft-rs", rev="95c532612ee6a83591fce9a8b51d6afe87b58835"}
-protobuf-codegen = { git = "https://github.com/pingcap/rust-protobuf", rev="82b49fea7e696fd647b5aca0a6c6ec944eab3189" }
 protobuf = { git = "https://github.com/pingcap/rust-protobuf", rev="82b49fea7e696fd647b5aca0a6c6ec944eab3189" }

Cargo.toml

@@ -46,12 +46,12 @@ class TransactionClient {
 class RawKVClient {
 public:
     RawKVClient(const std::vector<std::string> &pd_endpoints);
-    std::optional<std::string> get(const std::string &key,const std::uint32_t timeout);
-    void put(const std::string &key, const std::string &value, const std::uint32_t timeout);
-    void batch_put(const std::vector<KvPair> &kvs, const std::uint32_t timeout);
-    void remove(const std::string &key, const std::uint32_t timeout);
-    void remove_range(const std::string &start_key, const std::string &end_key, const std::uint32_t timeout);
-    std::vector<KvPair> scan(const std::string &startKey, const std::string &endKey, std::uint32_t limit, const std::uint32_t timeout);
+    std::optional<std::string> get(const std::string &key,const std::uint64_t timeout);
+    void put(const std::string &key, const std::string &value, const std::uint64_t timeout);
+    void batch_put(const std::vector<KvPair> &kvs, const std::uint64_t timeout);
+    void remove(const std::string &key, const std::uint64_t timeout);
+    void remove_range(const std::string &start_key, const std::string &end_key, const std::uint64_t timeout);
+    std::vector<KvPair> scan(const std::string &startKey, const std::string &endKey, std::uint32_t limit, const std::uint64_t timeout);
 
 private:
     ::rust::cxxbridge1::Box<tikv_client_glue::RawKVClient> _client;

include/tikv_client.h

@@ -627,17 +627,17 @@ enum class Bound : ::std::uint8_t {
 namespace tikv_client_glue {
 ::rust::Box<::tikv_client_glue::RawKVClient> raw_client_new(const ::std::vector<::std::string> &pd_endpoints);
 
-::OptionalValue raw_get(const ::tikv_client_glue::RawKVClient &client, const ::std::string &key, ::std::uint32_t timeout_ms);
+::OptionalValue raw_get(const ::tikv_client_glue::RawKVClient &client, const ::std::string &key, ::std::uint64_t timeout_ms);
 
-void raw_put(const ::tikv_client_glue::RawKVClient &cli, const ::std::string &key, const ::std::string &val, ::std::uint32_t timeout_ms);
+void raw_put(const ::tikv_client_glue::RawKVClient &cli, const ::std::string &key, const ::std::string &val, ::std::uint64_t timeout_ms);
 
-::rust::Vec<::ffi::KvPair> raw_scan(const ::tikv_client_glue::RawKVClient &cli, const ::std::string &start, const ::std::string &end, ::std::uint32_t limit, ::std::uint32_t timeout_ms);
+::rust::Vec<::ffi::KvPair> raw_scan(const ::tikv_client_glue::RawKVClient &cli, const ::std::string &start, const ::std::string &end, ::std::uint32_t limit, ::std::uint64_t timeout_ms);
 
-void raw_delete(const ::tikv_client_glue::RawKVClient &cli, const ::std::string &key, ::std::uint32_t timeout_ms);
+void raw_delete(const ::tikv_client_glue::RawKVClient &cli, const ::std::string &key, ::std::uint64_t timeout_ms);
 
-void raw_delete_range(const ::tikv_client_glue::RawKVClient &cli, const ::std::string &startKey, const ::std::string &endKey, ::std::uint32_t timeout_ms);
+void raw_delete_range(const ::tikv_client_glue::RawKVClient &cli, const ::std::string &startKey, const ::std::string &endKey, ::std::uint64_t timeout_ms);
 
-void raw_batch_put(const ::tikv_client_glue::RawKVClient &cli, const ::std::vector<::ffi::KvPair> &pairs, ::std::uint32_t timeout_ms);
+void raw_batch_put(const ::tikv_client_glue::RawKVClient &cli, const ::std::vector<::ffi::KvPair> &pairs, ::std::uint64_t timeout_ms);
 
 ::rust::Box<::tikv_client_glue::TransactionClient> transaction_client_new(const ::std::vector<::std::string> &pd_endpoints);