Commit 194e7afe authored by Paul Lensing's avatar Paul Lensing
Browse files

Minor Code Cleanup.

parent b6b799ea

include/kinetic/blocking_kinetic_connection.h

+0 −4
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ 


namespace kinetic {



using std::shared_ptr;

using std::unique_ptr;

using std::string;



class BlockingKineticConnection : public BlockingKineticConnectionInterface {



    public:

include/kinetic/blocking_kinetic_connection_interface.h

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 
#include "kinetic/key_range_iterator.h"

#include "kinetic/common.h"

#include "kinetic/nonblocking_kinetic_connection.h"



#include <memory>

#include <string>

#include <vector>



namespace kinetic {

include/kinetic/kinetic_connection_factory.h

+9 −9
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#ifndef KINETIC_CPP_CLIENT_KINETIC_CONNECTION_FACTORY_H_

#define KINETIC_CPP_CLIENT_KINETIC_CONNECTION_FACTORY_H_



#include "kinetic/message_stream.h"

#include "kinetic/connection_options.h"

#include "kinetic/hmac_provider.h"

#include "kinetic/blocking_kinetic_connection.h"
@@ -29,6 +28,7 @@ 
#include "kinetic/threadsafe_nonblocking_connection.h"

#include "kinetic/threadsafe_blocking_kinetic_connection.h"

#include "kinetic/status.h"

#include <memory>



namespace kinetic {
@@ -51,20 +51,20 @@ class KineticConnectionFactory { 
    ///                                     data the operation fails

    /// @param[out] connection              Populated with a NonblockingKineticConnection if the request

    ///                                     succeeds

    virtual Status NewNonblockingConnection(

    Status NewNonblockingConnection(

            const ConnectionOptions& options,

            unique_ptr <NonblockingKineticConnection>& connection);



    virtual Status NewNonblockingConnection(

    Status NewNonblockingConnection(

            const ConnectionOptions& options,

            shared_ptr <NonblockingKineticConnection>& connection);



    /// Like NewNonblockingConnection, except the connection is safe for use by multiple threads.

    virtual Status NewThreadsafeNonblockingConnection(

    Status NewThreadsafeNonblockingConnection(

            const ConnectionOptions& options,

            unique_ptr <ThreadsafeNonblockingKineticConnection>& connection);



    virtual Status NewThreadsafeNonblockingConnection(

    Status NewThreadsafeNonblockingConnection(

            const ConnectionOptions& options,

            shared_ptr <ThreadsafeNonblockingKineticConnection>& connection);
@@ -79,23 +79,23 @@ class KineticConnectionFactory { 
    ///                                     data the operation fails

    /// @param[out] connection              Populated with a BlockingKineticConnection if the request

    ///                                     succeeds

    virtual Status NewBlockingConnection(

    Status NewBlockingConnection(

            const ConnectionOptions& options,

            unique_ptr <BlockingKineticConnection>& connection,

            unsigned int network_timeout_seconds);



    virtual Status NewBlockingConnection(

    Status NewBlockingConnection(

            const ConnectionOptions& options,

            shared_ptr <BlockingKineticConnection>& connection,

            unsigned int network_timeout_seconds);



    /// Like NewBlockingConnection, except the connection is safe for use by multiple threads

    virtual Status NewThreadsafeBlockingConnection(

    Status NewThreadsafeBlockingConnection(

            const ConnectionOptions& options,

            unique_ptr <ThreadsafeBlockingKineticConnection>& connection,

            unsigned int network_timeout_seconds);



    virtual Status NewThreadsafeBlockingConnection(

    Status NewThreadsafeBlockingConnection(

            const ConnectionOptions& options,

            shared_ptr <ThreadsafeBlockingKineticConnection>& connection,

            unsigned int network_timeout_seconds);

include/kinetic/nonblocking_kinetic_connection_interface.h

+4 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ 
#ifndef NONBLOCKING_KINETIC_CONNECTION_INTERFACE_H_

#define NONBLOCKING_KINETIC_CONNECTION_INTERFACE_H_



#include <string>

#include <memory>

#include <cinttypes>

#include <sys/select.h>

#include "kinetic/common.h"

#include "kinetic_client.pb.h"

#include "kinetic/kinetic_record.h"
@@ -33,6 +29,10 @@ 
#include "kinetic/kinetic_connection.h"

#include "kinetic/kinetic_status.h"

#include "kinetic/nonblocking_packet_service_interface.h"

#include <memory>

#include <string>

#include <vector>

#include <list>



namespace kinetic {

include/kinetic/threadsafe_nonblocking_connection.h

+1 −2
Original line number Diff line number Diff line
@@ -21,10 +21,9 @@ 
#ifndef KINETIC_CPP_CLIENT_THREADSAFE_NONBLOCKING_CONNECTION_H_

#define KINETIC_CPP_CLIENT_THREADSAFE_NONBLOCKING_CONNECTION_H_



#include <mutex>



#include "kinetic/nonblocking_kinetic_connection_interface.h"

#include "kinetic/nonblocking_kinetic_connection.h"

#include <mutex>



namespace kinetic {