From c98c791877fa7c4c95bebed46637b31742cbd97d Mon Sep 17 00:00:00 2001 From: xiaowang Date: Tue, 1 Nov 2022 18:26:14 +0800 Subject: [PATCH 1/2] fix bug --- tests_integration/src/redis/basic/collection.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests_integration/src/redis/basic/collection.rs b/tests_integration/src/redis/basic/collection.rs index b44852a1e..cc061e3f4 100644 --- a/tests_integration/src/redis/basic/collection.rs +++ b/tests_integration/src/redis/basic/collection.rs @@ -467,10 +467,9 @@ fn set_basic() { assert_eq!(con.sadd(arykey, "one"), Ok(1)); assert_eq!(con.sadd(arykey, "two"), Ok(1)); - assert_eq!( - con.smembers(arykey), - Ok(vec!["one".to_string(), "two".to_string(),]) - ); + let res: Result, RedisError> = con.smembers(arykey); + assert!(res.is_ok()); + assert_eq!(res.expect("ok").len(), 2); assert_eq!(con.srem(arykey, "one"), Ok(1)); assert_eq!(con.sismember(arykey, "one"), Ok(0)); From ccc1ea4396805eaff6e680d26633477b5aa4d694 Mon Sep 17 00:00:00 2001 From: xiaowang Date: Tue, 1 Nov 2022 20:29:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4mc=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests_integration/src/mc.rs | 293 ------------------------------ tests_integration/src/mc/basic.rs | 157 ++++++++++++++++ tests_integration/src/mc/mod.rs | 124 +++++++++++++ 3 files changed, 281 insertions(+), 293 deletions(-) delete mode 100644 tests_integration/src/mc.rs create mode 100644 tests_integration/src/mc/basic.rs create mode 100644 tests_integration/src/mc/mod.rs diff --git a/tests_integration/src/mc.rs b/tests_integration/src/mc.rs deleted file mode 100644 index 905941660..000000000 --- a/tests_integration/src/mc.rs +++ /dev/null @@ -1,293 +0,0 @@ -/// # 已测试场景： -/// - 验证 mesh buffer 扩容，同一个连接，同一个key，set 8次不同大小的String value -/// key: "fooset" value: 每个字符内容为 ‘A’ -/// 乱序set: [1048507, 4, 4000, 40, 8000, 20000, 0, 400] -/// 顺序set: [0, 4, 40, 400, 4000, 8000, 20000, 1048507] -/// -/// - 模拟mc已有10000条数据，通过 mesh 读取，验证数据一致性 -/// 数据由 java SDK 预先写入：key: 0...9999 value: 0...9999 -/// -/// - 模拟简单mc 基本命令: -/// 包括: add、get、replace、delete、append、prepend、gets、cas、incr、decr -/// set命令未单独测试； -/// -/// - -mod mc_test { - - use std::collections::HashMap; - - use memcache::{Client, MemcacheError}; - - use crate::ci::env::{exists_key_iter, Mesh}; - - /// 测试场景：buffer扩容验证: 同一个连接，同一个key, set不同大小的value - /// 特征: key；固定为"fooset" value: 不同长度的String,内容固定: 每个字符内容为 ‘A’ - /// - /// 测试步骤： - /// <1> 建立连接 - /// <2> 乱序set，先set 1M的value,再乱序set其他大小的value [1048507, 4, 4000, 40, 8000, 20000, 0, 400] - /// <3> 将set进去的value get出来，对比set进去的值与get出来的值； - /// <4> 由小到大分别set不同大小的value，从0开始递增，覆盖从4k->8k, 8k->32k，以及 1M 的场景， - /// <5> 重复步骤 <3> - /// - #[test] - fn buffer_capacity_a() { - let client = mc_get_conn(); - let key = "fooset"; - let mut v_sizes = [1048507, 4, 4000, 40, 8000, 20000, 0, 400]; - for v_size in v_sizes { - let val = vec![0x41; v_size]; - assert_eq!( - client - .set(key, &String::from_utf8_lossy(&val).to_string(), 2) - .is_ok(), - true - ); - let result: Result, MemcacheError> = client.get(key); - assert!(result.is_ok()); - assert_eq!( - result.expect("ok").expect("ok"), - String::from_utf8_lossy(&val).to_string() - ); - } - v_sizes = [0, 4, 40, 400, 4000, 8000, 20000, 1048507]; - for v_size in v_sizes { - let val = vec![0x41; v_size]; - assert!(client - .set(key, &String::from_utf8_lossy(&val).to_string(), 2) - .is_ok()); - let result: Result, MemcacheError> = client.get(key); - assert!(result.is_ok()); - assert_eq!( - result.expect("ok").expect("ok"), - String::from_utf8_lossy(&val).to_string() - ); - } - } - - /// 测试场景：针对目前线上存在的业务方写，mesh 读数据的场景进行模拟，验证数据一致性； - /// 特征: 预先通过java SDK 直接向后端资源写入10000条数据 - /// key: “1”.."10000" value: 1..10000 - /// 测试步骤：根据已知的 key&value,通过 mesh 获取并对比结果 - #[test] - fn only_get_value() { - let client = mc_get_conn(); - let mut key: String; - for value in exists_key_iter() { - key = value.to_string(); - let result: Result, MemcacheError> = client.get(&key); - assert!(result.is_ok()); - assert_eq!(result.expect("ok").expect("ok"), value); - } - } - - /// 测试场景: 测试mc 单次最多gets 多少个key - #[test] - fn mc_gets_keys() { - let client = mc_get_conn(); - let mut key: Vec = Vec::new(); - for keycount in 10001..=11000u64 { - let k = keycount.to_string(); - let s = client.set(&k, keycount, 1000); - assert!(s.is_ok(), "panic res:{:?}", s); - key.push(k); - } - - let mut mkey: Vec<&str> = Vec::new(); - for (count, k) in key.iter().enumerate() { - mkey.push(k.as_str()); - let result: Result, MemcacheError> = - client.gets(mkey.as_slice()); - println!("count is :{}", count + 1); - println!("keys is :{:?}", mkey); - println!("result is: {:?}", result); - assert!(result.is_ok()); - assert_eq!(result.expect("ok").len(), count + 1); - } - } - - /// 测试场景: 测试key的长度 - #[test] - fn mc_key_length() { - let client = mc_get_conn(); - for k_len in 1..=251usize { - let key = vec![0x42; k_len]; - let set_res = client.set( - &String::from_utf8_lossy(&key).to_string(), - k_len.to_string(), - 2, - ); - if k_len < 251 { - assert!(set_res.is_ok()); - } else { - assert!(set_res.is_err()) - } - let result: Result, MemcacheError> = - client.get(&String::from_utf8_lossy(&key).to_string()); - if k_len < 251 { - assert!(result.is_ok()); - assert_eq!(result.expect("ok").expect("ok"), k_len.to_string()); - } else { - assert!(result.is_err()) - } - } - } - - /// 测试场景：基本的mc add 命令验证 - #[test] - fn mc_max_key() { - let client = mc_get_conn(); - let key = "simplefooadd"; - let value = "bar"; - let result: Result, MemcacheError> = client.get(key); - assert_eq!(true, result.expect("ok").is_none()); - assert!(client.add(key, value, 10).is_ok()); - let result: Result, MemcacheError> = client.get(key); - assert_eq!(true, result.is_ok()); - assert_eq!(result.expect("ok").expect("ok"), value); - } - - /// 测试场景：基本的mc add 命令验证 - #[test] - fn mc_simple_add() { - let client = mc_get_conn(); - let key = "fooadd"; - let value = "bar"; - let result: Result, MemcacheError> = client.get(key); - assert_eq!(true, result.expect("ok").is_none()); - assert!(client.add(key, value, 10).is_ok()); - let result: Result, MemcacheError> = client.get(key); - assert_eq!(true, result.is_ok()); - assert_eq!(result.expect("ok").expect("ok"), value); - } - - /// 测试场景：基本的mc get 命令验证 - /// 测试步骤：get(key) key 为预先写入的key - #[test] - fn mc_simple_get() { - let client = mc_get_conn(); - let result: Result, MemcacheError> = client.get("307"); - assert!(result.is_ok()); - assert_eq!(result.expect("ok").expect("ok"), "307"); - } - - /// 测试场景：基本的mc replace 命令验证 - #[test] - fn mc_simple_replace() { - let client = mc_get_conn(); - let key = "fooreplace"; - let value = "bar"; - assert!(client.set(key, value, 3).is_ok()); - assert_eq!(true, client.replace(key, "baz", 3).is_ok()); - let result: Result, MemcacheError> = client.get(key); - assert_eq!(result.is_ok(), true); - assert_eq!(result.expect("ok").expect("ok"), "baz"); - } - - ///测试场景：基本的mc delete 命令验证 - #[test] - fn mc_simple_delete() { - let client = mc_get_conn(); - let key = "foodel"; - let value = "bar"; - let result: Result, MemcacheError> = client.get(key); - assert_eq!(true, result.expect("ok").is_none()); - assert!(client.add(key, value, 2).is_ok()); - assert!(client.delete(key).is_ok()); - let result: Result, MemcacheError> = client.get(key); - assert_eq!(true, result.expect("ok").is_none()); - } - - /* - #[test] - fn only_set_value() { - let client = mc_get_conn(); - let mut key: String; - let mut number: u32 = 0; - while number < 10000 { - key = number.to_string(); - let result = client.set(key, number, 500); - assert_eq!(true,result.is_ok()); - number += 1; - } - }*/ - - ///测试场景：基本的mc append 命令验证 - #[test] - fn mc_simple_append() { - let client = mc_get_conn(); - let key = "append"; - let value = "bar"; - let append_value = "baz"; - assert!(client.set(key, value, 3).is_ok()); - assert!(client.append(key, append_value).is_ok()); - let result: Result, MemcacheError> = client.get(key); - assert_eq!(result.is_ok(), true); - assert_eq!(result.expect("ok").expect("ok"), "barbaz"); - } - - ///测试场景：基本的mc prepend 命令验证 - #[test] - fn mc_simple_prepend() { - let client = mc_get_conn(); - let key = "prepend"; - let value = "bar"; - let prepend_value = "foo"; - assert!(client.set(key, value, 3).is_ok()); - assert!(client.prepend(key, prepend_value).is_ok()); - let result: Result, MemcacheError> = client.get(key); - assert_eq!(result.is_ok(), true); - assert_eq!(result.expect("ok").expect("ok"), "foobar"); - } - - ///测试场景：基本的mc cas 命令验证 - #[test] - fn mc_simple_cas() { - let client = mc_get_conn(); - assert!(client.set("foocas", "bar", 10).is_ok()); - let getsres: Result, u32, Option)>, MemcacheError> = - client.gets(&["foocas"]); - assert!(getsres.is_ok()); - let result: HashMap, u32, Option)> = getsres.expect("ok"); - let (_, _, cas) = result.get("foocas").expect("ok"); - let cas = cas.expect("ok"); - assert_eq!(true, client.cas("foocas", "bar2", 10, cas).expect("ok")); - } - - ///测试场景：基本的mc gets 命令验证 - #[test] - fn mc_simple_gets() { - //多个key - let client = mc_get_conn(); - let key = "getsfoo"; - let value = "getsbar"; - assert!(client.set(key, value, 2).is_ok()); - assert!(client.set(value, key, 2).is_ok()); - let result: Result, MemcacheError> = - client.gets(&["getsfoo", "getsbar"]); - assert!(result.is_ok()); - assert_eq!(result.expect("ok").len(), 2); - } - - ///测试场景：基本的mc incr和decr 命令验证 - #[test] - fn mc_simple_incr_decr() { - let client = mc_get_conn(); - let key = "fooinde"; - assert!(client.set(key, 10, 3).is_ok()); - let res = client.increment(key, 5); - assert!(res.is_ok()); - assert_eq!(res.expect("ok"), 15); - let res = client.decrement(key, 5); - assert!(res.is_ok()); - assert_eq!(res.expect("ok"), 10); - } - - fn mc_get_conn() -> Client { - let host_ip = file!().get_host(); - let host = String::from("memcache://") + &host_ip; - let client = memcache::connect(host); - assert_eq!(true, client.is_ok()); - return client.expect("ok"); - } -} diff --git a/tests_integration/src/mc/basic.rs b/tests_integration/src/mc/basic.rs new file mode 100644 index 000000000..b253ac7aa --- /dev/null +++ b/tests_integration/src/mc/basic.rs @@ -0,0 +1,157 @@ +/// # 已测试场景： +/// - 验证 mesh buffer 扩容，同一个连接，同一个key，set 8次不同大小的String value +/// key: "fooset" value: 每个字符内容为 ‘A’ +/// 乱序set: [1048507, 4, 4000, 40, 8000, 20000, 0, 400] +/// 顺序set: [0, 4, 40, 400, 4000, 8000, 20000, 1048507] +/// +/// - 模拟mc已有10000条数据，通过 mesh 读取，验证数据一致性 +/// 数据由 java SDK 预先写入：key: 0...9999 value: 0...9999 +/// +/// - 模拟简单mc 基本命令: +/// 包括: add、get、replace、delete、append、prepend、gets、cas、incr、decr +/// set命令未单独测试； +/// +/// - + +use std::collections::HashMap; +use memcache::{MemcacheError}; +use crate::{mc::mc_get_conn}; +/// 测试场景：基本的mc add 命令验证 +#[test] +fn mc_max_key() { + let client = mc_get_conn(); + let key = "simplefooadd"; + let value = "bar"; + let result: Result, MemcacheError> = client.get(key); + assert_eq!(true, result.expect("ok").is_none()); + assert!(client.add(key, value, 10).is_ok()); + let result: Result, MemcacheError> = client.get(key); + assert_eq!(true, result.is_ok()); + assert_eq!(result.expect("ok").expect("ok"), value); +} +/// 测试场景：基本的mc add 命令验证 +#[test] +fn mc_simple_add() { + let client = mc_get_conn(); + let key = "fooadd"; + let value = "bar"; + let result: Result, MemcacheError> = client.get(key); + assert_eq!(true, result.expect("ok").is_none()); + assert!(client.add(key, value, 10).is_ok()); + let result: Result, MemcacheError> = client.get(key); + assert_eq!(true, result.is_ok()); + assert_eq!(result.expect("ok").expect("ok"), value); +} +/// 测试场景：基本的mc get 命令验证 +/// 测试步骤：get(key) key 为预先写入的key +#[test] +fn mc_simple_get() { + let client = mc_get_conn(); + let result: Result, MemcacheError> = client.get("307"); + assert!(result.is_ok()); + assert_eq!(result.expect("ok").expect("ok"), "307"); +} +/// 测试场景：基本的mc replace 命令验证 +#[test] +fn mc_simple_replace() { + let client = mc_get_conn(); + let key = "fooreplace"; + let value = "bar"; + assert!(client.set(key, value, 3).is_ok()); + assert_eq!(true, client.replace(key, "baz", 3).is_ok()); + let result: Result, MemcacheError> = client.get(key); + assert_eq!(result.is_ok(), true); + assert_eq!(result.expect("ok").expect("ok"), "baz"); +} +///测试场景：基本的mc delete 命令验证 +#[test] +fn mc_simple_delete() { + let client = mc_get_conn(); + let key = "foodel"; + let value = "bar"; + let result: Result, MemcacheError> = client.get(key); + assert_eq!(true, result.expect("ok").is_none()); + assert!(client.add(key, value, 2).is_ok()); + assert!(client.delete(key).is_ok()); + let result: Result, MemcacheError> = client.get(key); + assert_eq!(true, result.expect("ok").is_none()); +} +/* +#[test] +fn only_set_value() { + let client = mc_get_conn(); + let mut key: String; + let mut number: u32 = 0; + while number < 10000 { + key = number.to_string(); + let result = client.set(key, number, 500); + assert_eq!(true,result.is_ok()); + number += 1; + } +}*/ +///测试场景：基本的mc append 命令验证 +#[test] +fn mc_simple_append() { + let client = mc_get_conn(); + let key = "append"; + let value = "bar"; + let append_value = "baz"; + assert!(client.set(key, value, 3).is_ok()); + assert!(client.append(key, append_value).is_ok()); + let result: Result, MemcacheError> = client.get(key); + assert_eq!(result.is_ok(), true); + assert_eq!(result.expect("ok").expect("ok"), "barbaz"); +} +///测试场景：基本的mc prepend 命令验证 +#[test] +fn mc_simple_prepend() { + let client = mc_get_conn(); + let key = "prepend"; + let value = "bar"; + let prepend_value = "foo"; + assert!(client.set(key, value, 3).is_ok()); + assert!(client.prepend(key, prepend_value).is_ok()); + let result: Result, MemcacheError> = client.get(key); + assert_eq!(result.is_ok(), true); + assert_eq!(result.expect("ok").expect("ok"), "foobar"); +} +///测试场景：基本的mc cas 命令验证 +#[test] +fn mc_simple_cas() { + let client = mc_get_conn(); + assert!(client.set("foocas", "bar", 10).is_ok()); + let getsres: Result, u32, Option)>, MemcacheError> = + client.gets(&["foocas"]); + assert!(getsres.is_ok()); + let result: HashMap, u32, Option)> = getsres.expect("ok"); + let (_, _, cas) = result.get("foocas").expect("ok"); + let cas = cas.expect("ok"); + assert_eq!(true, client.cas("foocas", "bar2", 10, cas).expect("ok")); +} +///测试场景：基本的mc gets 命令验证 +#[test] +fn mc_simple_gets() { + //多个key + let client = mc_get_conn(); + let key = "getsfoo"; + let value = "getsbar"; + assert!(client.set(key, value, 2).is_ok()); + assert!(client.set(value, key, 2).is_ok()); + let result: Result, MemcacheError> = + client.gets(&["getsfoo", "getsbar"]); + assert!(result.is_ok()); + assert_eq!(result.expect("ok").len(), 2); +} +///测试场景：基本的mc incr和decr 命令验证 +#[test] +fn mc_simple_incr_decr() { + let client = mc_get_conn(); + let key = "fooinde"; + assert!(client.set(key, 10, 3).is_ok()); + let res = client.increment(key, 5); + assert!(res.is_ok()); + assert_eq!(res.expect("ok"), 15); + let res = client.decrement(key, 5); + assert!(res.is_ok()); + assert_eq!(res.expect("ok"), 10); +} diff --git a/tests_integration/src/mc/mod.rs b/tests_integration/src/mc/mod.rs new file mode 100644 index 000000000..e57f740cc --- /dev/null +++ b/tests_integration/src/mc/mod.rs @@ -0,0 +1,124 @@ +mod basic; +use std::collections::HashMap; +use memcache::{Client, MemcacheError}; +use crate::ci::env::{exists_key_iter, Mesh}; + +/// 测试场景：buffer扩容验证: 同一个连接，同一个key, set不同大小的value +/// 特征: key；固定为"fooset" value: 不同长度的String,内容固定: 每个字符内容为 ‘A’ +/// +/// 测试步骤： +/// <1> 建立连接 +/// <2> 乱序set，先set 1M的value,再乱序set其他大小的value [1048507, 4, 4000, 40, 8000, 20000, 0, 400] +/// <3> 将set进去的value get出来，对比set进去的值与get出来的值； +/// <4> 由小到大分别set不同大小的value，从0开始递增，覆盖从4k->8k, 8k->32k，以及 1M 的场景， +/// <5> 重复步骤 <3> +#[test] +fn buffer_capacity_a() { + let client = mc_get_conn(); + let key = "fooset"; + let mut v_sizes = [1048507, 4, 4000, 40, 8000, 20000, 0, 400]; + for v_size in v_sizes { + let val = vec![0x41; v_size]; + assert_eq!( + client + .set(key, &String::from_utf8_lossy(&val).to_string(), 2) + .is_ok(), + true + ); + let result: Result, MemcacheError> = client.get(key); + assert!(result.is_ok()); + assert_eq!( + result.expect("ok").expect("ok"), + String::from_utf8_lossy(&val).to_string() + ); + } + v_sizes = [0, 4, 40, 400, 4000, 8000, 20000, 1048507]; + for v_size in v_sizes { + let val = vec![0x41; v_size]; + assert!(client + .set(key, &String::from_utf8_lossy(&val).to_string(), 2) + .is_ok()); + let result: Result, MemcacheError> = client.get(key); + assert!(result.is_ok()); + assert_eq!( + result.expect("ok").expect("ok"), + String::from_utf8_lossy(&val).to_string() + ); + } +} + +/// 测试场景：针对目前线上存在的业务方写，mesh 读数据的场景进行模拟，验证数据一致性； +/// 特征: 预先通过java SDK 直接向后端资源写入10000条数据 +/// key: “1”.."10000" value: 1..10000 +/// 测试步骤：根据已知的 key&value,通过 mesh 获取并对比结果 +#[test] +fn only_get_value() { + let client = mc_get_conn(); + let mut key: String; + for value in exists_key_iter() { + key = value.to_string(); + let result: Result, MemcacheError> = client.get(&key); + assert!(result.is_ok()); + assert_eq!(result.expect("ok").expect("ok"), value); + } +} + +/// 测试场景: 测试mc 单次最多gets 多少个key +#[test] +fn mc_gets_keys() { + let client = mc_get_conn(); + let mut key: Vec = Vec::new(); + for keycount in 10001..=11000u64 { + let k = keycount.to_string(); + let s = client.set(&k, keycount, 1000); + assert!(s.is_ok(), "panic res:{:?}", s); + key.push(k); + } + + let mut mkey: Vec<&str> = Vec::new(); + for (count, k) in key.iter().enumerate() { + mkey.push(k.as_str()); + let result: Result, MemcacheError> = + client.gets(mkey.as_slice()); + println!("count is :{}", count + 1); + println!("keys is :{:?}", mkey); + println!("result is: {:?}", result); + assert!(result.is_ok()); + assert_eq!(result.expect("ok").len(), count + 1); + } +} + +/// 测试场景: 测试key的长度 +#[test] +fn mc_key_length() { + let client = mc_get_conn(); + for k_len in 1..=251usize { + let key = vec![0x42; k_len]; + let set_res = client.set( + &String::from_utf8_lossy(&key).to_string(), + k_len.to_string(), + 2, + ); + if k_len < 251 { + assert!(set_res.is_ok()); + } else { + assert!(set_res.is_err()) + } + let result: Result, MemcacheError> = + client.get(&String::from_utf8_lossy(&key).to_string()); + if k_len < 251 { + assert!(result.is_ok()); + assert_eq!(result.expect("ok").expect("ok"), k_len.to_string()); + } else { + assert!(result.is_err()) + } + } +} + +fn mc_get_conn() -> Client { + let host_ip = "mc".get_host(); + let host = String::from("memcache://") + &host_ip; + let client = memcache::connect(host); + assert_eq!(true, client.is_ok()); + return client.expect("ok"); +} \ No newline at end of file