Skip to content

HRCPP-411 Fixed args passing for remote exec #309

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
Oct 26, 2017
Merged

HRCPP-411 Fixed args passing for remote exec #309

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
15 changes: 6 additions & 9 deletions src/hotrod/impl/operations/ExecuteCmdOperation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ExecuteCmdOperation::ExecuteCmdOperation(
Topology& topologyId_,
uint32_t flags_,
const std::vector<char>& cmdName_,
const std::map<std::vector<char>,std::vector<char>>& cmdArgs_)
: RetryOnFailureOperation<std::vector<char>>(
const std::map<std::vector<char>,std::vector<char>>& cmdArgs_)
: RetryOnFailureOperation<std::vector<char>>(
codec_, transportFactory_, cacheName_, topologyId_, flags_), cmdName(cmdName_), cmdArgs(cmdArgs_)
{}

Expand All @@ -38,14 +38,11 @@ std::vector<char> ExecuteCmdOperation::sendExecuteOperation(
transport.writeArray(this->cmdName);
transport.writeVInt((int)this->cmdArgs.size());

for (auto i=(int)this->cmdArgs.size()-1; i>=0; i--)
for (auto it = cmdArgs.begin(); it!=cmdArgs.end(); it++)
{
for (auto it = cmdArgs.begin(); it!=cmdArgs.end(); it++)
{
std::vector<char> nameBuf, valBuf;
transport.writeArray(it->first);
transport.writeArray(it->second);
}
std::vector<char> nameBuf, valBuf;
transport.writeArray(it->first);
transport.writeArray(it->second);
}
transport.flush();

Expand Down
178 changes: 89 additions & 89 deletions test/Simple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ namespace infinispan {

class MyRoundRobinBalancingStrategy: public FailOverRequestBalancingStrategy {
public:
MyRoundRobinBalancingStrategy() :
index(0) {
}
MyRoundRobinBalancingStrategy() :
index(0) {
}

static FailOverRequestBalancingStrategy *newInstance() {
return new MyRoundRobinBalancingStrategy();
Expand All @@ -38,8 +38,8 @@ class MyRoundRobinBalancingStrategy: public FailOverRequestBalancingStrategy {
}
}

~MyRoundRobinBalancingStrategy() {
}
~MyRoundRobinBalancingStrategy() {
}

const transport::InetSocketAddress &getServerByIndex(size_t pos) {
const transport::InetSocketAddress &server = servers[pos];
Expand All @@ -48,22 +48,22 @@ class MyRoundRobinBalancingStrategy: public FailOverRequestBalancingStrategy {
private:
std::vector<transport::InetSocketAddress> servers;
size_t index;
const transport::InetSocketAddress &nextServer(
const std::set<transport::InetSocketAddress>& failedServers) {
for (unsigned int i = 0; i <= servers.size(); i++) {
const transport::InetSocketAddress &server = getServerByIndex(
index++);
if (failedServers.empty() || failedServers.find(server)!=failedServers.end() || i>failedServers.size()) {
const transport::InetSocketAddress &nextServer(
const std::set<transport::InetSocketAddress>& failedServers) {
for (unsigned int i = 0; i <= servers.size(); i++) {
const transport::InetSocketAddress &server = getServerByIndex(
index++);
if (failedServers.empty() || failedServers.find(server)!=failedServers.end() || i>failedServers.size()) {
if (index >= servers.size()) {
index = 0;
}
}
}
return server;
}


throw Exception("Bad news, no server available.");
}
throw Exception("Bad news, no server available.");
}
};

}
Expand Down Expand Up @@ -347,52 +347,52 @@ int basicTest(RemoteCacheManager &cacheManager, RemoteCache<K,V> &cache) {
// Now user pass a lambda func that will be executed in the async thread after the put completion
std::future<std::string*> future_put1= cache.putAsync(ak2,av2,0,0,[&] (std::string *v){flag=true; return v;});
{
// If the async put is not completed flag must be false
if (future_put1.wait_for(std::chrono::seconds(0))!=std::future_status::ready)
{
if (flag)
{
std::cerr << "fail: expected false got true" << std::endl;
return 1;
}
}
// If the async put is not completed flag must be false
if (future_put1.wait_for(std::chrono::seconds(0))!=std::future_status::ready)
{
if (flag)
{
std::cerr << "fail: expected false got true" << std::endl;
return 1;
}
}
}
// Now wait for put completion
future_put1.wait();
{
// The user lambda must be executed so flag must be true
if (!flag)
{
std::cerr << "fail: expected true got false" << std::endl;
return 1;
}
// The user lambda must be executed so flag must be true
if (!flag)
{
std::cerr << "fail: expected true got false" << std::endl;
return 1;
}
}
// Same test for get
flag=false;
std::future<std::string*> future_get1= cache.getAsync(ak2,[&] (std::string *v){flag=true; return v;});

if (future_get1.wait_for(std::chrono::seconds(0))!=std::future_status::ready)
{
if (flag)
{
std::cerr << "fail: expected false got true" << std::endl;
return 1;
}
if (flag)
{
std::cerr << "fail: expected false got true" << std::endl;
return 1;
}
}
future_get1.wait();
{
if (!flag)
{
std::cerr << "fail: expected true got false" << std::endl;
return 1;
}
if (!flag)
{
std::cerr << "fail: expected true got false" << std::endl;
return 1;
}
}
std::string* arv3= future_get1.get();

if (!arv3 || arv3->compare(av2))
{
std::cerr << "fail: expected " << av2 << " got " << (arv3 ? *arv3 : "null") << std::endl;
return 1;
std::cerr << "fail: expected " << av2 << " got " << (arv3 ? *arv3 : "null") << std::endl;
return 1;
}
delete arv3;
std::cout << "PASS: Async test" << std::endl;
Expand All @@ -402,7 +402,7 @@ int basicTest(RemoteCacheManager &cacheManager, RemoteCache<K,V> &cache) {
int main(int argc, char** argv) {

int result=0;
std::cout << "Tests for CacheManager" << std::endl;
std::cout << "Tests for CacheManager" << std::endl;
{
ConfigurationBuilder builder;
builder.addServer().host(argc > 1 ? argv[1] : "127.0.0.1").port(argc > 2 ? atoi(argv[2]) : 11222);
Expand Down Expand Up @@ -442,7 +442,7 @@ int main(int argc, char** argv) {
}

if (result!=0)
return result;
return result;
std::cout << "PASS: Tests for CacheManager" << std::endl;
// Call basic test for every marshaller and every codec
std::cout << "Basic Test with BasicMarshaller" << std::endl;
Expand Down Expand Up @@ -486,49 +486,49 @@ int main(int argc, char** argv) {
}
}

try {
result = basicTest<std::string, std::string>(cacheManager, cache);
std::map<std::string, std::string> s;
std::string argName = std::string("a");
std::string argValue = std::string("b");
// execute() operation needs explicit JBossMarshalling<string> format for argument values
s.insert(
std::pair<std::string, std::string>(argName,
JBasicMarshaller<std::string>::addPreamble(
argValue)));
std::string script("// mode=local,language=javascript\n "
"var cache = cacheManager.getCache(\"namedCache\");\n"
"cache.put(\"a\", \"abc\");\n"
"cache.put(\"b\", \"b\");\n"
"cache.get(\"a\");\n");
std::string script_name("script.js");
std::string p_script_name =
JBasicMarshaller<std::string>::addPreamble(script_name);
std::string p_script = JBasicMarshaller<std::string>::addPreamble(
script);
RemoteCache<std::string, std::string> scriptCache =
cacheManager.getCache<std::string, std::string>(
"___script_cache", false);
scriptCache.put(p_script_name, p_script);
std::vector<unsigned char> execResult = cache.execute(script_name,
s);

// We know the remote script returns a string and
// we use the helper to unmarshall
std::string res(
JBasicMarshallerHelper::unmarshall<std::string>(
(char*) execResult.data()));
if (res.compare("abc") != 0) {
std::cerr << "fail: cache.exec() returned unexpected result"
<< std::endl;
return 1;
}
} catch (const Exception& e) {
cacheManager.stop();
std::cout << "is: " << typeid(e).name() << '\n';
std::cerr << "fail unexpected exception: " << e.what() << std::endl;
return 1;
}
try {
result = basicTest<std::string, std::string>(cacheManager, cache);
std::map<std::string, std::string> s;
std::string argName = std::string("a");
std::string argValue = std::string("abc");
// execute() operation needs explicit JBossMarshalling<string> format for argument values
s.insert(
std::pair<std::string, std::string>(argName,
JBasicMarshaller<std::string>::addPreamble(
argValue)));
std::string script("// mode=local,language=javascript, parameters=[a]\n"
"var cache = cacheManager.getCache(\"namedCache\");\n"
"cache.put(\"a\", a);\n"
"cache.put(\"b\", \"b\");\n"
"cache.get(\"a\");\n");
std::string script_name("script.js");
std::string p_script_name =
JBasicMarshaller<std::string>::addPreamble(script_name);
std::string p_script = JBasicMarshaller<std::string>::addPreamble(
script);
RemoteCache<std::string, std::string> scriptCache =
cacheManager.getCache<std::string, std::string>(
"___script_cache", false);
scriptCache.put(p_script_name, p_script);
std::vector<unsigned char> execResult = cache.execute(script_name,
s);

// We know the remote script returns a string and
// we use the helper to unmarshall
std::string res(
JBasicMarshallerHelper::unmarshall<std::string>(
(char*) execResult.data()));
if (res.compare("abc") != 0) {
std::cerr << "fail: cache.exec() returned unexpected result"
<< std::endl;
return 1;
}
} catch (const Exception& e) {
cacheManager.stop();
std::cout << "is: " << typeid(e).name() << '\n';
std::cerr << "fail unexpected exception: " << e.what() << std::endl;
return 1;
}
std::cout << "PASS: script execution on server" << std::endl;

cacheManager.stop();
Expand Down Expand Up @@ -556,14 +556,14 @@ int main(int argc, char** argv) {
result = basicTest<std::string, std::string>(cacheManager, cache);
std::map<std::string,std::string> s;
std::string argName = std::string("a");
std::string argValue = std::string("b");
std::string argValue = std::string("abc");
// execute() operation needs explicit JBossMarshalling<string> format for argument values
JBasicMarshaller<std::string> *km1 = new JBasicMarshaller<std::string>();
JBasicMarshaller<std::string> *vm1 = new JBasicMarshaller<std::string>();
s.insert(std::pair<std::string, std::string>(argName,JBasicMarshaller<std::string>::addPreamble(argValue)));
std::string script ("// mode=local,language=javascript\n "
std::string script ("// mode=local,language=javascript, parameters=[a]\n "
"var cache = cacheManager.getCache(\"namedCache\");\n"
"cache.put(\"a\", \"abc\");\n"
"cache.put(\"a\", a);\n"
"cache.put(\"b\", \"b\");\n"
"cache.get(\"a\");\n");
std::string script_name("script.js");
Expand Down