Inlined some functions

eXo-OpenSource · Jul 27, 2019 · 7571810 · 7571810
1 parent 238fba9
commit 7571810
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 35 deletions.
diff --git a/module/RedisClient.cpp b/module/RedisClient.cpp
@@ -17,23 +17,6 @@ redis_client::~redis_client()
 	delete _subscriber;
 }
 
-void redis_client::connect(const std::string& host, const int& port) const
-{
-	_client->connect(host, port);
-	_subscriber->connect(host, port);
-}
-
-void redis_client::disconnect() const
-{
-	_client->disconnect(true);
-	_subscriber->disconnect(true);
-}
-
-bool redis_client::is_connected() const
-{
-	return _client->is_connected() && _subscriber->is_connected();
-}
-
 cpp_redis::reply redis_client::set(const std::string& key, const std::string& value) const
 {
 	auto result = _client->set(key, value);
@@ -43,13 +26,6 @@ cpp_redis::reply redis_client::set(const std::string& key, const std::string& va
 	return result.get();
 }
 
-void redis_client::set(const std::string& key, const std::string& value,
-	const cpp_redis::client::reply_callback_t& callback) const
-{
-	_client->set(key, value, callback);
-	_client->commit();
-}
-
 void redis_client::set(const std::map<std::string, std::string>& pairs, const std::function<void(const std::string&, cpp_redis::reply &)>& callback) const
 {
 	for(auto& [key, value]: pairs)
@@ -71,12 +47,6 @@ cpp_redis::reply redis_client::get(const std::string& key) const
 	return result.get();
 }
 
-void redis_client::get(const std::string& key, const cpp_redis::client::reply_callback_t& callback) const
-{
-	_client->get(key, callback);
-	_client->commit();
-}
-
 void redis_client::get(const std::list<std::string>& keys, const std::function<void(const std::string&, cpp_redis::reply &)>& callback) const
 {
 	for (auto& key : keys)

diff --git a/module/RedisClient.h b/module/RedisClient.h
@@ -8,16 +8,16 @@ class redis_client
 	redis_client();
 	~redis_client();
 
-	void connect(const std::string& host, const int& port) const;
-	void disconnect() const;
-	[[nodiscard]] bool is_connected() const;
+	void connect(const std::string& host, const int& port) const { _client->connect(host, port); _subscriber->connect(host, port); }
+	void disconnect() const { _client->disconnect(); _subscriber->disconnect(); }
+	[[nodiscard]] bool is_connected() const { return _client->is_connected() && _subscriber->is_connected(); }
 
 	[[nodiscard]] cpp_redis::reply set(const std::string& key, const std::string& value) const;
-	void set(const std::string& key, const std::string& value, const cpp_redis::client::reply_callback_t& callback) const;
+	void set(const std::string& key, const std::string& value, const cpp_redis::client::reply_callback_t& callback) const { _client->set(key, value, callback); _client->commit(); }
 	void set(const std::map<std::string, std::string>& pairs, const std::function<void(const std::string&, cpp_redis::reply &)>& callback) const;
 
 	[[nodiscard]] cpp_redis::reply get(const std::string& key) const;
-	void get(const std::string& key, const cpp_redis::client::reply_callback_t& callback) const;
+	void get(const std::string& key, const cpp_redis::client::reply_callback_t& callback) const { _client->get(key, callback); _client->commit(); };
 	void get(const std::list<std::string>& keys, const std::function<void(const std::string&, cpp_redis::reply &)>& callback) const;
 private:
 	cpp_redis::client* _client;