Implements the put action.

Signed-off-by: Tao He <sighingnow@gmail.com>

etcd/Client.hpp

@@ -56,6 +56,16 @@ namespace etcd
     Client(std::string const & etcd_url,
            std::string const & load_balancer = "round_robin");
 
+    /**
+     * Constructs an etcd client object.
+     *
+     * @param etcd_url is the url of the etcd server to connect to, like "http://127.0.0.1:2379",
+     *                 or multiple url, seperated by ',' or ';'.
+     * @param load_balancer is the load balance strategy, can be one of round_robin/pick_first/grpclb/xds.
+     */
+    static etcd::Client *WithUrl(std::string const & etcd_url,
+           std::string const & load_balancer = "round_robin");
+
     /**
      * Constructs an etcd client object.
      *
@@ -165,6 +175,13 @@ namespace etcd
      */
     pplx::task<Response> add(std::string const & key, std::string const & value, int64_t leaseId);
 
+    /**
+     * Put a new key-value pair.
+     * @param key is the key to be put
+     * @param value is the value to be put
+     */
+    pplx::task<Response> put(std::string const & key, std::string const & value);
+
     /**
      * Modifies an existing key. Fails if the key does not exists.
      * @param key is the key to be modified

etcd/SyncClient.hpp

@@ -46,6 +46,7 @@ namespace etcd
     Response set(std::string const & key, std::string const & value, int64_t leaseId);
     Response add(std::string const & key, std::string const & value, int ttl = 0);
     Response add(std::string const & key, std::string const & value, int64_t leaseId);
+    Response put(std::string const & key, std::string const & value);
     Response modify(std::string const & key, std::string const & value, int ttl = 0);
     Response modify(std::string const & key, std::string const & value, int64_t leaseId);
     Response modify_if(std::string const & key, std::string const & value, std::string const & old_value, int ttl = 0);

etcd/v3/Action.hpp

@@ -32,7 +32,7 @@ namespace etcdv3
     bool withPrefix;
     int revision;
     int old_revision;
-    int64_t lease_id;
+    int64_t lease_id = 0;  // no lease
     int ttl;
     int limit;
     std::string name;  // for campaign (in v3election)

etcd/v3/AsyncDeleteAction.hpp

@@ -4,7 +4,7 @@
 #include <grpc++/grpc++.h>
 #include "proto/rpc.grpc.pb.h"
 #include "etcd/v3/Action.hpp"
-#include "etcd/v3/AsyncDeleteRangeResponse.hpp"
+#include "etcd/v3/AsyncDeleteResponse.hpp"
 
 
 using grpc::ClientAsyncResponseReader;
@@ -16,7 +16,7 @@ namespace etcdv3
   {
     public:
       AsyncDeleteAction(etcdv3::ActionParameters const &param);
-      AsyncDeleteRangeResponse ParseResponse();
+      AsyncDeleteResponse ParseResponse();
     private:
       DeleteRangeResponse reply;
       std::unique_ptr<ClientAsyncResponseReader<DeleteRangeResponse>> response_reader;

etcd/v3/AsyncDeleteResponse.hpp

@@ -12,10 +12,10 @@ using etcdserverpb::DeleteRangeResponse;
 
 namespace etcdv3
 {
-  class AsyncDeleteRangeResponse : public etcdv3::V3Response
+  class AsyncDeleteResponse : public etcdv3::V3Response
   {
     public:
-      AsyncDeleteRangeResponse(){};
+      AsyncDeleteResponse(){};
       void ParseResponse(std::string const& key, bool prefix, DeleteRangeResponse& resp);
   };
 }

etcd/v3/AsyncPutAction.hpp

@@ -0,0 +1,26 @@
+#ifndef __ASYNC_PUT_HPP__
+#define __ASYNC_PUT_HPP__
+
+#include <grpc++/grpc++.h>
+#include "proto/rpc.grpc.pb.h"
+#include "etcd/v3/Action.hpp"
+#include "etcd/v3/AsyncPutResponse.hpp"
+
+
+using grpc::ClientAsyncResponseReader;
+using etcdserverpb::PutResponse;
+
+namespace etcdv3
+{
+  class AsyncPutAction : public etcdv3::Action
+  {
+    public:
+      AsyncPutAction(etcdv3::ActionParameters const &param);
+      AsyncPutResponse ParseResponse();
+    private:
+      PutResponse reply;
+      std::unique_ptr<ClientAsyncResponseReader<PutResponse>> response_reader;
+  };
+}
+
+#endif

etcd/v3/AsyncPutResponse.hpp

@@ -0,0 +1,23 @@
+#ifndef __ASYNC_PUTRESPONSE_HPP__
+#define __ASYNC_PUTRESPONSE_HPP__
+
+#include <grpc++/grpc++.h>
+#include "proto/rpc.grpc.pb.h"
+#include "etcd/v3/V3Response.hpp"
+#include "etcd/v3/Action.hpp"
+
+
+using grpc::ClientAsyncResponseReader;
+using etcdserverpb::PutResponse;
+
+namespace etcdv3
+{
+  class AsyncPutResponse : public etcdv3::V3Response
+  {
+    public:
+      AsyncPutResponse(){};
+      void ParseResponse(PutResponse& resp);
+  };
+}
+
+#endif

etcd/v3/action_constants.hpp

@@ -7,6 +7,7 @@ namespace etcdv3
   extern char const * UPDATE_ACTION;
   extern char const * SET_ACTION;
   extern char const * GET_ACTION;
+  extern char const * PUT_ACTION;
   extern char const * DELETE_ACTION;
   extern char const * COMPARESWAP_ACTION;
   extern char const * COMPAREDELETE_ACTION;

src/Client.cpp

@@ -32,7 +32,8 @@
 #include "etcd/v3/Action.hpp"
 #include "etcd/v3/AsyncRangeResponse.hpp"
 #include "etcd/v3/AsyncWatchResponse.hpp"
-#include "etcd/v3/AsyncDeleteRangeResponse.hpp"
+#include "etcd/v3/AsyncDeleteResponse.hpp"
+#include "etcd/v3/AsyncPutResponse.hpp"
 #include "etcd/v3/AsyncLockResponse.hpp"
 #include "etcd/v3/AsyncElectionResponse.hpp"
 #include "etcd/v3/AsyncTxnResponse.hpp"
@@ -45,6 +46,7 @@
 #include "etcd/v3/AsyncHeadAction.hpp"
 #include "etcd/v3/AsyncRangeAction.hpp"
 #include "etcd/v3/AsyncDeleteAction.hpp"
+#include "etcd/v3/AsyncPutAction.hpp"
 #include "etcd/v3/AsyncWatchAction.hpp"
 #include "etcd/v3/AsyncLeaseAction.hpp"
 #include "etcd/v3/AsyncLockAction.hpp"
@@ -198,6 +200,11 @@ etcd::Client::Client(std::string const & address,
   stubs->electionServiceStub = Election::NewStub(this->channel);
 }
 
+etcd::Client *etcd::Client::WithUrl(std::string const & etcd_url,
+                                    std::string const & load_balancer) {
+  return new etcd::Client(etcd_url, load_balancer);
+}
+
 etcd::Client::Client(std::string const & address,
                      std::string const & username,
                      std::string const & password,
@@ -373,6 +380,14 @@ pplx::task<etcd::Response> etcd::Client::add(std::string const & key, std::strin
   return Response::create(call);
 }
 
+pplx::task<etcd::Response> etcd::Client::put(std::string const & key, std::string const & value) {
+  etcdv3::ActionParameters params;
+  params.key.assign(key);
+  params.value.assign(value);
+  params.kv_stub = stubs->kvServiceStub.get();
+  std::shared_ptr<etcdv3::AsyncPutAction> call(new etcdv3::AsyncPutAction(params));
+  return Response::create(call);
+}
 
 pplx::task<etcd::Response> etcd::Client::modify(std::string const & key, std::string const & value, int ttl)
 {

src/SyncClient.cpp

@@ -53,6 +53,11 @@ etcd::Response etcd::SyncClient::add(std::string const & key, std::string const
   CHECK_EXCEPTIONS(client.add(key, value, leaseId).get());
 }
 
+etcd::Response etcd::SyncClient::put(std::string const & key, std::string const & value)
+{
+  CHECK_EXCEPTIONS(client.put(key, value).get());
+}
+
 etcd::Response etcd::SyncClient::modify(std::string const & key, std::string const & value, int ttl)
 {
   CHECK_EXCEPTIONS(client.modify(key, value, ttl).get());

src/v3/AsyncDeleteAction.cpp

@@ -26,9 +26,9 @@ etcdv3::AsyncDeleteAction::AsyncDeleteAction(
   response_reader->Finish(&reply, &status, (void*)this);
 }
 
-etcdv3::AsyncDeleteRangeResponse etcdv3::AsyncDeleteAction::ParseResponse()
+etcdv3::AsyncDeleteResponse etcdv3::AsyncDeleteAction::ParseResponse()
 {
-  AsyncDeleteRangeResponse del_resp;
+  AsyncDeleteResponse del_resp;
   del_resp.set_action(etcdv3::DELETE_ACTION);
 
   if(!status.ok())

src/v3/AsyncDeleteResponse.cpp

@@ -1,8 +1,8 @@
-#include "etcd/v3/AsyncDeleteRangeResponse.hpp"
+#include "etcd/v3/AsyncDeleteResponse.hpp"
 #include "etcd/v3/action_constants.hpp"
 
 
-void etcdv3::AsyncDeleteRangeResponse::ParseResponse(std::string const& key, bool prefix, DeleteRangeResponse& resp)
+void etcdv3::AsyncDeleteResponse::ParseResponse(std::string const& key, bool prefix, DeleteRangeResponse& resp)
 {
   index = resp.header().revision();
 

src/v3/AsyncPutAction.cpp

@@ -0,0 +1,36 @@
+#include "etcd/v3/AsyncPutAction.hpp"
+#include "etcd/v3/action_constants.hpp"
+
+using etcdserverpb::PutRequest;
+
+etcdv3::AsyncPutAction::AsyncPutAction(
+    ActionParameters const &param)
+  : etcdv3::Action(param)
+{
+  PutRequest put_request;
+  put_request.set_key(parameters.key);
+  put_request.set_value(parameters.value);
+  put_request.set_lease(parameters.lease_id);
+  put_request.set_prev_kv(true);
+
+  response_reader = parameters.kv_stub->AsyncPut(&context, put_request, &cq_);
+  response_reader->Finish(&reply, &status, (void*)this);
+}
+
+etcdv3::AsyncPutResponse etcdv3::AsyncPutAction::ParseResponse()
+{
+  AsyncPutResponse put_resp;
+  put_resp.set_action(etcdv3::PUT_ACTION);
+
+  if(!status.ok())
+  {
+    put_resp.set_error_code(status.error_code());
+    put_resp.set_error_message(status.error_message());
+  }
+  else
+  {
+    put_resp.ParseResponse(reply);
+  }
+
+  return   put_resp;
+}

src/v3/AsyncPutResponse.cpp

@@ -0,0 +1,13 @@
+#include "etcd/v3/AsyncPutResponse.hpp"
+#include "etcd/v3/action_constants.hpp"
+
+
+void etcdv3::AsyncPutResponse::ParseResponse(PutResponse& resp)
+{
+  index = resp.header().revision();
+
+  //get all previous values
+  etcdv3::KeyValue kv; 
+  kv.kvs.CopyFrom(resp.prev_kv());
+  prev_value = kv;
+}

src/v3/AsyncTxnResponse.cpp

@@ -1,6 +1,6 @@
 #include "etcd/v3/AsyncTxnResponse.hpp"
 #include "etcd/v3/AsyncRangeResponse.hpp"
-#include "etcd/v3/AsyncDeleteRangeResponse.hpp"
+#include "etcd/v3/AsyncDeleteResponse.hpp"
 #include "etcd/v3/action_constants.hpp"
 
 using etcdserverpb::ResponseOp;
@@ -36,7 +36,7 @@ void etcdv3::AsyncTxnResponse::ParseResponse(std::string const& key, bool prefix
     }
     else if(ResponseOp::ResponseCase::kResponseDeleteRange == resp.response_case())
     {
-      AsyncDeleteRangeResponse response;
+      AsyncDeleteResponse response;
       response.ParseResponse(key,prefix,*(resp.mutable_response_delete_range()));
 
       prev_value.kvs.CopyFrom(response.get_prev_value().kvs);

src/v3/action_constants.cpp

@@ -5,6 +5,7 @@ char const * etcdv3::COMPARESWAP_ACTION = "compareAndSwap";
 char const * etcdv3::UPDATE_ACTION = "update";
 char const * etcdv3::SET_ACTION = "set";
 char const * etcdv3::GET_ACTION = "get";
+char const * etcdv3::PUT_ACTION = "put";
 char const * etcdv3::DELETE_ACTION = "delete";
 char const * etcdv3::COMPAREDELETE_ACTION = "compareAndDelete";
 char const * etcdv3::LOCK_ACTION = "lock";