Add proptest support

Signed-off-by: Ana Hobden <[email protected]>

Author: Hoverbear

Cargo.toml

@@ -12,7 +12,10 @@ edition = "2018"
 default = []
 # Enable integration tests with a running TiKV and PD instance.
 # Use $PD_ADDRS, comma separated, to set the addresses the tests use. 
-integration-tests = []
+integration-tests = ["property-testing"]
+# Enable propery testing features with `proptest`.
+property-testing = ["proptest", "proptest-derive"]
+
 
 [lib]
 name = "tikv_client"
@@ -28,6 +31,8 @@ serde = "1.0"
 serde_derive = "1.0"
 tokio-core = "0.1"
 tokio-timer = "0.2"
+proptest = { version = "0.9", optional = true }
+proptest-derive = { version = "0.1.0", optional = true }
 
 [dependencies.kvproto]
 git = "https://github.com/pingcap/kvproto.git"

rust-toolchain

@@ -0,0 +1 @@
+nightly-2019-06-01

src/kv.rs

@@ -4,6 +4,15 @@ use std::ops::{
     Bound, Deref, DerefMut, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive,
 };
 use std::{fmt, str, u8};
+#[cfg(feature = "proptest-derive")]
+use proptest::{collection::size_range, arbitrary::any_with};
+#[cfg(feature = "proptest-derive")]
+use proptest_derive::Arbitrary;
+
+#[cfg(feature = "proptest-derive")]
+const PROPTEST_KEY_MAX: usize = 1024 * 2; // 2 KB
+#[cfg(feature = "proptest-derive")]
+const PROPTEST_VALUE_MAX: usize = 1024 * 16; // 16 KB
 
 use crate::{Error, Result};
 
@@ -56,7 +65,11 @@ impl<'a> fmt::Display for HexRepr<'a> {
 /// accept an `Into<Key>`, which means all of the above types can be passed directly to those
 /// functions.
 #[derive(Default, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct Key(Vec<u8>);
+#[cfg_attr(feature = "proptest-derive", derive(Arbitrary))]
+pub struct Key(
+    #[cfg_attr(feature = "proptest-derive", proptest(strategy = "any_with::<Vec<u8>>((size_range(PROPTEST_KEY_MAX), ()))"))]
+    Vec<u8>
+);
 
 impl Key {
     #[inline]
@@ -170,7 +183,11 @@ impl fmt::Debug for Key {
 /// accept an `Into<Value>`, which means all of the above types can be passed directly to those
 /// functions.
 #[derive(Default, Clone, Eq, PartialEq, Hash)]
-pub struct Value(Vec<u8>);
+#[cfg_attr(feature = "proptest-derive", derive(Arbitrary))]
+pub struct Value(
+    #[cfg_attr(feature = "proptest-derive", proptest(strategy = "any_with::<Vec<u8>>((size_range(PROPTEST_VALUE_MAX), ()))"))]
+    Vec<u8>
+);
 
 impl Value {
     #[inline]
@@ -239,6 +256,7 @@ impl fmt::Debug for Value {
 /// Many functions which accept a `KvPair` accept an `Into<KvPair>`, which means all of the above
 /// types (Like a `(Key, Value)`) can be passed directly to those functions.
 #[derive(Default, Clone, Eq, PartialEq)]
+#[cfg_attr(feature = "proptest-derive", derive(Arbitrary))]
 pub struct KvPair(Key, Value);
 
 impl KvPair {

tests/integration_tests/mod.rs renamed to tests/integration/mod.rs

@@ -1,14 +1,14 @@
-// Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
-
-mod raw;
-
-use std::env::var;
-const ENV_PD_ADDR: &str = "PD_ADDR";
-
-pub fn pd_addr() -> Vec<String> {
-    var(ENV_PD_ADDR)
-        .expect(&format!("Expected {}:", ENV_PD_ADDR))
-        .split(",")
-        .map(From::from)
-        .collect()
-}
+// Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
+
+mod raw;
+
+use std::env::var;
+const ENV_PD_ADDR: &str = "PD_ADDR";
+
+pub fn pd_addr() -> Vec<String> {
+    var(ENV_PD_ADDR)
+        .expect(&format!("Expected {}:", ENV_PD_ADDR))
+        .split(",")
+        .map(From::from)
+        .collect()
+}

tests/integration/raw.rs

@@ -0,0 +1,82 @@
+// Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
+
+use crate::{arb_batch, integration::pd_addr};
+use proptest::{arbitrary::{any, any_with}, collection::size_range, proptest};
+use futures::executor::block_on;
+use tikv_client::{KvPair, raw::Client, Config, Value};
+
+proptest! {
+    #[test]
+    fn point(
+        pair in any::<KvPair>(),
+    ) {
+        let client = block_on(Client::connect(Config::new(pd_addr()))).unwrap();
+
+        block_on(
+            client.put(pair.key().clone(), pair.value().clone())
+        ).unwrap();
+        
+        let out_value = block_on(
+            client.get(pair.key().clone())
+        ).unwrap();
+        assert_eq!(Some(Value::from(pair.value().clone())), out_value);
+        
+        block_on(
+            client.delete(pair.key().clone())
+        ).unwrap();
+    }
+}
+
+proptest! {
+    #[test]
+    fn batch(
+        kvs in arb_batch(any::<KvPair>(), None),
+    ) {
+        let client = block_on(Client::connect(Config::new(pd_addr()))).unwrap();
+        let keys = kvs.iter().map(|kv| kv.key()).cloned().collect::<Vec<_>>();
+
+        block_on(
+            client.batch_put(kvs.clone())
+        ).unwrap();
+        
+        let out_value = block_on(
+            client.batch_get(keys.clone())
+        ).unwrap();
+        assert_eq!(kvs, out_value);
+        
+        block_on(
+            client.batch_delete(keys.clone())
+        ).unwrap();
+    }
+}
+
+proptest! {
+    #[test]
+    fn scan(
+        kvs in arb_batch(any::<KvPair>(), None),
+    ) {
+        let client = block_on(Client::connect(Config::new(pd_addr()))).unwrap();
+        let mut keys = kvs.iter().map(|kv| kv.key()).cloned().collect::<Vec<_>>();
+        keys.sort();
+        // If we aren't getting values this is an empty vector, so use dummy values.
+        let start_key = keys.iter().cloned().next().unwrap_or(vec![0].into());
+        let end_key = keys.iter().cloned().last().unwrap_or(vec![0].into());
+
+        block_on(
+            client.batch_put(kvs.clone())
+        ).unwrap();
+
+        let out_value = block_on(
+            client.scan(start_key..=end_key, 10240) // Magic max number is TiKV intrinsic
+        ).unwrap();
+
+        // Since TiKV returns empty keys as tombstones in scans, we just check we can find all the items.
+        assert!(kvs.iter().all(|kv| {
+            out_value.iter().find(|out| kv == *out).is_some()
+        }));
+        
+        block_on(
+            client.batch_delete(keys.clone())
+        ).unwrap();
+    }
+}

tests/integration_tests/raw.rs

@@ -3,4 +3,16 @@
 #![feature(async_await)]
 
 #[cfg(feature = "integration-tests")]
-mod integration_tests;
+mod integration;
+
+#[cfg(feature = "proptest")]
+use proptest::strategy::Strategy;
+
+#[cfg(feature = "proptest")]
+const PROPTEST_BATCH_SIZE_MAX: usize = 16;
+
+#[cfg(feature = "proptest")]
+pub fn arb_batch<T: core::fmt::Debug>(single_strategy: impl Strategy<Value = T>, max_batch_size: impl Into<Option<usize>>) -> impl Strategy<Value = Vec<T>> {
+    let max_batch_size = max_batch_size.into().unwrap_or(PROPTEST_BATCH_SIZE_MAX);
+    proptest::collection::vec(single_strategy, 0..max_batch_size)
+}