add string api

Author: yph025869

include/cppredis/client.hpp

@@ -145,7 +145,73 @@ namespace cpp_redis {
 				return false;
 			}
 
-			return client_->setex(std::forward<std::string>(key), std::forward<std::string>(value), seconds);
+			return client_->setex(std::forward<std::string>(key), 
+				std::forward<std::string>(value),unit::int_to_string(seconds));
+		}
+
+		bool psetex(std::string&& key, std::string&& value, size_t milliseconds)
+		{
+			static_assert(is_sting_, "This API Support String Request");
+
+			if (client_ == nullptr || key.empty()) {
+				return false;
+			}
+
+			return client_->psetex(std::forward<std::string>(key), 
+				std::forward<std::string>(value),unit::int_to_string(milliseconds));
+		}
+
+		//提高这以下四个接口，主要防止，有些版本不支持setex的接口
+		bool set_has_seconds(std::string&& key, std::string&& value,std::size_t seconds)
+		{
+			static_assert(is_sting_, "This API Support String Request");
+
+			if (client_ == nullptr || key.empty()) {
+				return false;
+			}
+
+			return client_->set_has_seconds(std::forward<std::string>(key),
+				std::forward<std::string>(value), unit::int_to_string(seconds));
+		}
+
+		//此接口相当于setnx 加上秒，is_exist:true(NX) false(XX)
+		bool set_has_seconds_if(std::string&& key, std::string&& value, std::size_t seconds,bool is_exist)
+		{
+			static_assert(is_sting_, "This API Support String Request");
+
+			if (client_ == nullptr || key.empty()) {
+				return false;
+			}
+
+			return client_->set_has_seconds_if(std::forward<std::string>(key),
+				std::forward<std::string>(value), unit::int_to_string(seconds),is_exist);
+		}
+	
+		bool set_has_milliseconds(std::string&& key, std::string&& value, std::size_t milliseconds)
+		{
+			static_assert(is_sting_, "This API Support String Request");
+
+			if (client_ == nullptr || key.empty()) {
+				return false;
+			}
+
+
+			return client_->set_has_milliseconds(std::forward<std::string>(key),
+				std::forward<std::string>(value), unit::int_to_string(milliseconds));
+		}
+
+		//is_exist:true(NX)false(XX)
+		bool set_has_milliseconds_if(std::string&& key, std::string&& value, std::size_t milliseconds,bool is_exist)
+		{
+			static_assert(is_sting_, "This API Support String Request");
+
+			if (client_ == nullptr || key.empty()) {
+				return false;
+			}
+
+
+			return client_->set_has_milliseconds_if(std::forward<std::string>(key),
+				std::forward<std::string>(value), unit::int_to_string(milliseconds), is_exist);
 		}
 
 		bool set(std::string&& key, std::string&& value)
@@ -158,6 +224,18 @@ namespace cpp_redis {
 			return client_->set(std::forward<std::string>(key), std::forward<std::string>(value));
 		}
 
+		std::string get_range(std::string&& key,int start,int end)
+		{
+			static_assert(is_sting_, "This API Support String Request");
+			if (client_ == nullptr || key.empty()) {
+				return "";
+			}
+
+			return client_->get_range(std::forward<std::string>(key),
+				unit::int_to_string(start),unit::int_to_string(end));
+		}
+
+
 		std::tuple<bool, int> incr(std::string&& key, int increment = 1)
 		{
 			static_assert(is_sting_, "This API Support String Request");
@@ -402,18 +480,25 @@ namespace cpp_redis {
 				return false;
 			}
 
-			return client_->list_set(std::forward<std::string>(key), std::forward<std::string>(value), index);
+			return client_->list_set(std::forward<std::string>(key), 
+				std::forward<std::string>(value),unit::int_to_string(index));
 		}
 
-		std::tuple<bool, int> list_del_elem(std::string&& key, std::string&& value, int index = 0)
+
+		//没有移除就为0 ，有移除就大于0，count表示list的起始位置,一般从0开始删除,-1表示最后一个元素删除
+		//如果从0开始删除，有多少删除多少
+		//如果从-1开始删除,就只会删除一个元素
+		//数量为>=|count|
+		std::tuple<bool, int> list_del_elem(std::string&& key, std::string&& value, int count = 0)
 		{
 			static_assert(is_list_, "This API Support List Request");
 
 			if (client_  == nullptr || key.empty()) {
 				return { false,-1 };
 			}
 
-			return client_->list_del_elem(std::forward<std::string>(key), std::forward<std::string>(value), index);
+			return client_->list_del_elem(std::forward<std::string>(key), 
+				std::forward<std::string>(value),unit::int_to_string(count));
 		}
 
 		std::string list_rpoplpush(std::string&& src_key, std::string&& dst_key)

include/cppredis/client_interface.hpp

@@ -168,7 +168,12 @@ namespace cpp_redis {
 			return int_results[0];
 		}
 
-		virtual bool setex(std::string&& key, std::string&& value, size_t seconds)
+		virtual bool setex(std::string&& key, std::string&& value,std::string && seconds)
+		{
+			return false;
+		}
+
+		virtual bool psetex(std::string&& key, std::string&& value,std::string && milliseconds)
 		{
 			return false;
 		}
@@ -178,6 +183,34 @@ namespace cpp_redis {
 			return false;
 		}
 
+		virtual bool set_has_seconds(std::string&& key, std::string&& value,std::string&&seconds)
+		{
+			return false;
+		}
+
+
+		virtual bool set_has_seconds_if(std::string&& key, std::string&& value, 
+			std::string&& seconds,bool is_exist)
+		{
+			return false;
+		}
+
+		virtual bool set_has_milliseconds(std::string&& key, std::string&& value,std::string&&milliseconds)
+		{
+			return false;
+		}
+
+		virtual bool set_has_milliseconds_if(std::string&& key, std::string&& value, 
+			std::string&& milliseconds,bool is_exist)
+		{
+			return false;
+		}
+
+		virtual std::string get_range(std::string&&key, std::string&& start, std::string&& end)
+		{
+			return "";
+		}
+
 		virtual std::tuple<bool, int> incr(std::string&& key, int increment = 1)
 		{
 			return { false,-1 };
@@ -269,12 +302,12 @@ namespace cpp_redis {
 			return "";
 		}
 
-		virtual bool list_set(std::string&& key, std::string&& value, int index)
+		virtual bool list_set(std::string&& key, std::string&& value,std::string && index)
 		{
 			return "";
 		}
 
-		virtual std::tuple<bool, int> list_del_elem(std::string&& key, std::string&& value, int index = 0)
+		virtual std::tuple<bool, int> list_del_elem(std::string&& key, std::string&& value,std::string&&count)
 		{
 			return { false,-1 };
 		}

include/cppredis/cpp_define.h

@@ -18,7 +18,9 @@ namespace cpp_redis {
 	const std::string g_ttl_cmd                  = "TTL";
 	/****************字符串操作***********************************/
 	const std::string g_setx_cmd                 = "SETEX";
+	const std::string g_psetx_cmd                = "PSETEX";
 	const std::string g_set_cmd                  = "SET";
+	const std::string g_strsub_cmd               = "GETRANGE";//2.0之前叫substr
 	const std::string g_incrby_cmd               = "INCRBY";
 	const std::string g_get_cmd                  = "GET";
 	const std::string g_get_set_cmd              = "GETSET";
@@ -123,83 +125,85 @@ namespace cpp_redis {
 		select                                   = 1,
 		set                                      = 2,
 		setex                                    = 3,
-		incrby                                   = 4,
-		del                                      = 5,
-		exists                                   = 6,
-		get                                      = 7,
-		expire                                   = 8,
-		expire_at                                = 9,
-		ttl                                      = 10,
-		get_set                                  = 11,
-		substr                                   = 12,
-		mget                                     = 13,
-		mset                                     = 14,
-		msetnx                                   = 15,
-		append                                   = 16,
-		rpush                                    = 17,
-		lpush                                    = 18,
-		llen                                     = 19,
-		lrange                                   = 20,
-		rpop                                     = 21,
-		lpop                                     = 22,
-		brpop                                    = 23,
-		blpop                                    = 24,
-		ltrim                                    = 25,
-		lindex                                   = 26,
-		lset                                     = 27,
-		lrem                                     = 28,
-		rpoplpush                                = 29,
-		lpushx                                   = 30,
-		rpushx                                   = 31,
-		list_insert                              = 32,
-		brpoplpush                               = 33,
-		sadd                                     = 34,
-		srem                                     = 35,
-		sismember                                = 36,
-		spop_elem                                = 37,
-		srandmember                              = 38,
-		smove                                    = 39,
-		ssize                                    = 40,
-		smembers                                 = 41,
-		sinter                                   = 42,
-		ssinter_store                            = 43,
-		sunion                                   = 44,
-		ssunion_store                            = 45,
-		sdiff                                    = 46,
-		sdiff_store                              = 47,
-		zset_add                                 = 48,
-		zset_score                               = 49,
-		zset_incrby                              = 50,
-		zset_card                                = 51,
-		zset_count                               = 52,
-		zset_range                               = 53,
-		zset_rank                                = 54,
-		zset_rem                                 = 55,
-		zset_revrank                             = 56,
-		zset_revrange                            = 57,
-		zset_lexcount                            = 58,
-		zset_rangebylex                          = 59,
-		zset_union_store                         = 60,
-		zset_inter_store                         = 61,
-		zset_range_score                         = 62,
-		zset_remrangebylex                       = 63,
-		zset_rerange_score                       = 64,
-		zset_remrangebyscore                     = 65,
-		zset_remrangeby_rank                     = 66,
-		hash_set                                 = 67,
-		hash_setx                                = 68,
-		hash_exists                              = 69,
-		hash_get                                 = 70,
-		hash_del                                 = 71,
-		hash_len                                 = 72,
-		hash_mset                                = 73,
-		hash_mget                                = 74,
-		hash_vals                                = 75,
-		hash_keys                                = 76,
-		hash_strlen                              = 77,
-		hash_incrby                              = 78,
-		hash_get_all                             = 79,
-		hash_incrby_float                        = 80,
+		psetex                                   = 4,
+		strsub                                   = 5,
+		incrby                                   = 6,
+		del                                      = 7,
+		exists                                   = 8,
+		get                                      = 9,
+		expire                                   = 10,
+		expire_at                                = 11,
+		ttl                                      = 12,
+		get_set                                  = 13,
+		substr                                   = 14,
+		mget                                     = 15,
+		mset                                     = 16,
+		msetnx                                   = 17,
+		append                                   = 18,
+		rpush                                    = 19,
+		lpush                                    = 20,
+		llen                                     = 21,
+		lrange                                   = 22,
+		rpop                                     = 23,
+		lpop                                     = 24,
+		brpop                                    = 25,
+		blpop                                    = 26,
+		ltrim                                    = 27,
+		lindex                                   = 28,
+		lset                                     = 29,
+		lrem                                     = 30,
+		rpoplpush                                = 31,
+		lpushx                                   = 32,
+		rpushx                                   = 33,
+		list_insert                              = 34,
+		brpoplpush                               = 35,
+		sadd                                     = 36,
+		srem                                     = 37,
+		sismember                                = 38,
+		spop_elem                                = 39,
+		srandmember                              = 40,
+		smove                                    = 41,
+		ssize                                    = 42,
+		smembers                                 = 43,
+		sinter                                   = 44,
+		ssinter_store                            = 45,
+		sunion                                   = 46,
+		ssunion_store                            = 47,
+		sdiff                                    = 48,
+		sdiff_store                              = 49,
+		zset_add                                 = 50,
+		zset_score                               = 51,
+		zset_incrby                              = 52,
+		zset_card                                = 53,
+		zset_count                               = 54,
+		zset_range                               = 55,
+		zset_rank                                = 56,
+		zset_rem                                 = 57,
+		zset_revrank                             = 58,
+		zset_revrange                            = 59,
+		zset_lexcount                            = 60,
+		zset_rangebylex                          = 61,
+		zset_union_store                         = 62,
+		zset_inter_store                         = 63,
+		zset_range_score                         = 64,
+		zset_remrangebylex                       = 65,
+		zset_rerange_score                       = 66,
+		zset_remrangebyscore                     = 67,
+		zset_remrangeby_rank                     = 68,
+		hash_set                                 = 69,
+		hash_setx                                = 70,
+		hash_exists                              = 71,
+		hash_get                                 = 72,
+		hash_del                                 = 73,
+		hash_len                                 = 74,
+		hash_mset                                = 75,
+		hash_mget                                = 76,
+		hash_vals                                = 77,
+		hash_keys                                = 78,
+		hash_strlen                              = 79,
+		hash_incrby                              = 80,
+		hash_get_all                             = 81,
+		hash_incrby_float                        = 82,
 	};
 
 	enum request_type

include/cppredis/cpp_redis_list.hpp

@@ -254,12 +254,13 @@ namespace cpp_redis {
 		}
 
 		//指定索引上设置元素值
-		virtual bool list_set(std::string&& key, std::string&& value, int index)
+		virtual bool list_set(std::string&& key, std::string&& value,std::string&& index)
 		{
 			check_args();
 
-			auto pair = request_->make_pair(std::forward<std::string>(key), std::forward<std::string>(value));
-			std::string msg = request_->req_key_value_has_index(request_->get_cmd(cpp_redis::lset), std::move(pair), std::forward<std::string>(unit::int_to_string(index)));
+			std::string msg = request_->req_n_key(request_->get_cmd(cpp_redis::lset),std::forward<std::string>(key),
+				std::forward<std::string>(index),std::forward<std::string>(value));
+
 			socket_->send_msg(std::move(msg));
 			const auto res = socket_->get_responese();
 
@@ -270,15 +271,17 @@ namespace cpp_redis {
 			return false;
 		}
 
-		//没有移除就为0 ，有移除就大于0，index表示list的起始位置,一般从0开始删除,-1表示最后一个元素删除
+		//没有移除就为0 ，有移除就大于0，count表示list的起始位置,一般从0开始删除,-1表示最后一个元素删除
 		//如果从0开始删除，有多少删除多少
 		//如果从-1开始删除,就只会删除一个元素
-		virtual std::tuple<bool, int> list_del_elem(std::string&& key, std::string&& value, int index = 0)
+		//数量为>=|count|
+		virtual std::tuple<bool, int> list_del_elem(std::string&& key, std::string&& value,std::string &&count)
 		{
 			check_args();
 
-			auto pair = request_->make_pair(std::forward<std::string>(key), std::forward<std::string>(value));
-			std::string msg = request_->req_key_value_has_index(request_->get_cmd(cpp_redis::lrem), std::move(pair), std::forward<std::string>(unit::int_to_string(index)));
+			std::string msg = request_->req_n_key(request_->get_cmd(cpp_redis::lrem),std::forward<std::string>(key),
+				std::forward<std::string>(count),std::forward<std::string>(value));
+
 			socket_->send_msg(std::move(msg));
 
 			const auto res = socket_->get_responese();