Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Make eval api simpler #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2019
Merged

Make eval api simpler #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions 21 includes/cpp_redis/core/client.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include <cpp_redis/misc/logger.hpp>
#include <cpp_redis/network/redis_connection.hpp>
#include <cpp_redis/network/tcp_client_iface.hpp>
#include <cpp_redis/misc/deprecated.hpp>

namespace cpp_redis {

Expand Down Expand Up @@ -779,16 +780,28 @@ namespace cpp_redis {

std::future<reply> echo(const std::string &msg);

client &eval(const std::string &script, int numkeys, const std::vector<std::string> &keys,
client &eval(const std::string &script, const std::vector<std::string> &keys,
const std::vector<std::string> &args, const reply_callback_t &reply_callback);

std::future<reply> eval(const std::string &script, int numkeys, const std::vector<std::string> &keys,
DEPRECATED client &eval(const std::string &script, int numkeys, const std::vector<std::string> &keys,
const std::vector<std::string> &args, const reply_callback_t &reply_callback);

std::future<reply> eval(const std::string &script, const std::vector<std::string> &keys,
const std::vector<std::string> &args);

DEPRECATED std::future<reply> eval(const std::string &script, int numkeys, const std::vector<std::string> &keys,
const std::vector<std::string> &args);

client &evalsha(const std::string &sha1, int numkeys, const std::vector<std::string> &keys,
client &evalsha(const std::string &sha1, const std::vector<std::string> &keys,
const std::vector<std::string> &args, const reply_callback_t &reply_callback);

std::future<reply> evalsha(const std::string &sha1, int numkeys, const std::vector<std::string> &keys,
DEPRECATED client &evalsha(const std::string &sha1, int numkeys, const std::vector<std::string> &keys,
const std::vector<std::string> &args, const reply_callback_t &reply_callback);

std::future<reply> evalsha(const std::string &sha1, const std::vector<std::string> &keys,
const std::vector<std::string> &args);

DEPRECATED std::future<reply> evalsha(const std::string &sha1, int numkeys, const std::vector<std::string> &keys,
const std::vector<std::string> &args);

client &exec(const reply_callback_t &reply_callback);
Expand Down
10 changes: 10 additions & 0 deletions 10 includes/cpp_redis/misc/deprecated.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#pragma once

#if defined(__GNUC__) || defined(__clang__)
#define DEPRECATED __attribute__((deprecated))
#elif defined(_MSC_VER)
#define DEPRECATED __declspec(deprecated)
#else
#pragma message("WARNING: You need to implement DEPRECATED for this compiler")
#define DEPRECATED
#endif
38 changes: 36 additions & 2 deletions 38 sources/core/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,16 @@ namespace cpp_redis {
return *this;
}

client &
client::eval(const std::string &script, const std::vector<std::string> &keys,
const std::vector<std::string> &args, const reply_callback_t &reply_callback) {
std::vector<std::string> cmd = {"EVAL", script, std::to_string(keys.size())};
cmd.insert(cmd.end(), keys.begin(), keys.end());
cmd.insert(cmd.end(), args.begin(), args.end());
send(cmd, reply_callback);
return *this;
}

client &
client::evalsha(const std::string &sha1, int numkeys, const std::vector<std::string> &keys,
const std::vector<std::string> &args, const reply_callback_t &reply_callback) {
Expand All @@ -1013,6 +1023,16 @@ namespace cpp_redis {
return *this;
}

client &
client::evalsha(const std::string &sha1, const std::vector<std::string> &keys,
const std::vector<std::string> &args, const reply_callback_t &reply_callback) {
std::vector<std::string> cmd = {"EVALSHA", sha1, std::to_string(keys.size())};
cmd.insert(cmd.end(), keys.begin(), keys.end());
cmd.insert(cmd.end(), args.begin(), args.end());
send(cmd, reply_callback);
return *this;
}

client &
client::exec(const reply_callback_t &reply_callback) {
send({"EXEC"}, reply_callback);
Expand Down Expand Up @@ -3671,13 +3691,27 @@ namespace cpp_redis {
std::future<reply>
client::eval(const std::string &script, int numkeys, const std::vector<std::string> &keys,
const std::vector<std::string> &args) {
return exec_cmd([=](const reply_callback_t &cb) -> client & { return eval(script, numkeys, keys, args, cb); });
(void) numkeys;
return exec_cmd([=](const reply_callback_t &cb) -> client & { return eval(script, keys, args, cb); });
}

std::future<reply>
client::eval(const std::string &script, const std::vector<std::string> &keys,
const std::vector<std::string> &args) {
return exec_cmd([=](const reply_callback_t &cb) -> client & { return eval(script, keys, args, cb); });
}

std::future<reply>
client::evalsha(const std::string &sha1, const std::vector<std::string> &keys,
const std::vector<std::string> &args) {
return exec_cmd([=](const reply_callback_t &cb) -> client & { return evalsha(sha1, keys, args, cb); });
}

std::future<reply>
client::evalsha(const std::string &sha1, int numkeys, const std::vector<std::string> &keys,
const std::vector<std::string> &args) {
return exec_cmd([=](const reply_callback_t &cb) -> client & { return evalsha(sha1, numkeys, keys, args, cb); });
(void) numkeys;
return exec_cmd([=](const reply_callback_t &cb) -> client & { return evalsha(sha1, keys, args, cb); });
}

std::future<reply>
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.