mirror
/
etcd-cpp-apiv3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Action class

This commit is contained in:
arches 2016-07-07 05:58:52 -04:00
parent c2af35f20b
commit 6dad838545
17 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
tst/etcd_test Executable file
View File

Binary file not shown.

12
v3/include/Action.hpp
View File

@ -34,16 +34,8 @@ namespace etcdv3
class Action
{
public:
Status status;
ClientContext context;
CompletionQueue cq_;
void waitForResponse();
};
class Actionv2
{
public:
Actionv2(etcdv3::ActionParameters params);
Action(etcdv3::ActionParameters params);
Action(){};
Status status;
ClientContext context;
CompletionQueue cq_;

2
v3/include/AsyncCompareAndDeleteAction.hpp
View File

@ -13,7 +13,7 @@ using etcdserverpb::KV;
namespace etcdv3
{
class AsyncCompareAndDeleteAction : public etcdv3::Actionv2
class AsyncCompareAndDeleteAction : public etcdv3::Action
{
public:
AsyncCompareAndDeleteAction(etcdv3::ActionParameters param, etcdv3::Atomicity_Type type);

2
v3/include/AsyncCompareAndSwapAction.hpp
View File

@ -13,7 +13,7 @@ using etcdserverpb::KV;
namespace etcdv3
{
class AsyncCompareAndSwapAction : public etcdv3::Actionv2
class AsyncCompareAndSwapAction : public etcdv3::Action
{
public:
AsyncCompareAndSwapAction(etcdv3::ActionParameters param, etcdv3::Atomicity_Type type);

2
v3/include/AsyncDeleteAction.hpp
View File

@ -13,7 +13,7 @@ using etcdserverpb::KV;
namespace etcdv3
{
class AsyncDeleteAction : public etcdv3::Actionv2
class AsyncDeleteAction : public etcdv3::Action
{
public:
AsyncDeleteAction(etcdv3::ActionParameters param);

2
v3/include/AsyncGetAction.hpp
View File

@ -13,7 +13,7 @@ using etcdserverpb::KV;
namespace etcdv3
{
class AsyncGetAction : public etcdv3::Actionv2
class AsyncGetAction : public etcdv3::Action
{
public:
AsyncGetAction(etcdv3::ActionParameters param);

2
v3/include/AsyncSetAction.hpp
View File

@ -13,7 +13,7 @@ using etcdserverpb::KV;
namespace etcdv3
{
class AsyncSetAction : public etcdv3::Actionv2
class AsyncSetAction : public etcdv3::Action
{
public:
AsyncSetAction(etcdv3::ActionParameters param, bool isCreate=false);

2
v3/include/AsyncUpdateAction.hpp
View File

@ -13,7 +13,7 @@ using etcdserverpb::KV;
namespace etcdv3
{
class AsyncUpdateAction : public etcdv3::Actionv2
class AsyncUpdateAction : public etcdv3::Action
{
public:
AsyncUpdateAction(etcdv3::ActionParameters param);

2
v3/include/AsyncWatchAction.hpp
View File

@ -15,7 +15,7 @@ using etcdserverpb::WatchResponse;
namespace etcdv3
{
class AsyncWatchAction : public etcdv3::Actionv2
class AsyncWatchAction : public etcdv3::Action
{
public:
AsyncWatchAction(etcdv3::ActionParameters param);

19
v3/src/Action.cpp
View File

@ -1,5 +1,10 @@
#include "v3/include/Action.hpp"
etcdv3::Action::Action(etcdv3::ActionParameters params)
{
parameters = params;
}
void etcdv3::Action::waitForResponse()
{
void* got_tag;
@ -8,17 +13,3 @@ void etcdv3::Action::waitForResponse()
cq_.Next(&got_tag, &ok);
GPR_ASSERT(got_tag == (void*)this);
}
void etcdv3::Actionv2::waitForResponse()
{
void* got_tag;
bool ok = false;
cq_.Next(&got_tag, &ok);
GPR_ASSERT(got_tag == (void*)this);
}
etcdv3::Actionv2::Actionv2(etcdv3::ActionParameters params)
{
parameters = params;
}

2
v3/src/AsyncCompareAndDeleteAction.cpp
View File

@ -10,7 +10,7 @@ using etcdserverpb::ResponseOp;
using etcdserverpb::TxnRequest;
etcdv3::AsyncCompareAndDeleteAction::AsyncCompareAndDeleteAction(etcdv3::ActionParameters param, etcdv3::Atomicity_Type type)
:etcdv3::Actionv2(param)
:etcdv3::Action(param)
{
etcdv3::Transaction transaction(parameters.key);
if(type == etcdv3::Atomicity_Type::PREV_VALUE)

2
v3/src/AsyncCompareAndSwapAction.cpp
View File

@ -10,7 +10,7 @@ using etcdserverpb::ResponseOp;
using etcdserverpb::TxnRequest;
etcdv3::AsyncCompareAndSwapAction::AsyncCompareAndSwapAction(etcdv3::ActionParameters param, etcdv3::Atomicity_Type type)
: etcdv3::Actionv2(param)
: etcdv3::Action(param)
{
etcdv3::Transaction transaction(parameters.key);
if(type == etcdv3::Atomicity_Type::PREV_VALUE)

2
v3/src/AsyncDeleteAction.cpp
View File

@ -5,7 +5,7 @@
using etcdserverpb::Compare;
etcdv3::AsyncDeleteAction::AsyncDeleteAction(ActionParameters param)
: etcdv3::Actionv2(param)
: etcdv3::Action(param)
{
etcdv3::Transaction transaction(parameters.key);
transaction.init_compare(Compare::CompareResult::Compare_CompareResult_GREATER,

2
v3/src/AsyncGetAction.cpp
View File

@ -4,7 +4,7 @@
using etcdserverpb::RangeRequest;
etcdv3::AsyncGetAction::AsyncGetAction(etcdv3::ActionParameters param)
: etcdv3::Actionv2(param)
: etcdv3::Action(param)
{
RangeRequest get_request;
get_request.set_key(parameters.key);

2
v3/src/AsyncSetAction.cpp
View File

@ -11,7 +11,7 @@ using etcdserverpb::ResponseOp;
using etcdserverpb::TxnRequest;
etcdv3::AsyncSetAction::AsyncSetAction(etcdv3::ActionParameters param, bool create)
: etcdv3::Actionv2(param)
: etcdv3::Action(param)
{
etcdv3::Transaction transaction(parameters.key);
isCreate = create;

2
v3/src/AsyncUpdateAction.cpp
View File

@ -11,7 +11,7 @@ using etcdserverpb::ResponseOp;
using etcdserverpb::TxnRequest;
etcdv3::AsyncUpdateAction::AsyncUpdateAction(etcdv3::ActionParameters param)
: etcdv3::Actionv2(param)
: etcdv3::Action(param)
{
etcdv3::Transaction transaction(parameters.key);
transaction.init_compare(Compare::CompareResult::Compare_CompareResult_GREATER,

2
v3/src/AsyncWatchAction.cpp
View File

@ -7,7 +7,7 @@ using etcdserverpb::RangeResponse;
using etcdserverpb::WatchCreateRequest;
etcdv3::AsyncWatchAction::AsyncWatchAction(etcdv3::ActionParameters param)
: etcdv3::Actionv2(param)
: etcdv3::Action(param)
{
stream = parameters.watch_stub->AsyncWatch(&context,&cq_,(void*)"create");