Commit 6dfac912 authored by David Bariod's avatar David Bariod
Browse files

Build for centos 6/gcc4.4

parent 7eeba76e

src/integration_test/blocking_smoketest.cc

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ TEST_F(IntegrationTest, BlockingSmoketest) { 
    EXPECT_EQ("t2", *(result_record->tag()));

    EXPECT_EQ(Command_Algorithm_SHA1, result_record->algorithm());



    unique_ptr<string> result_key(nullptr);

    unique_ptr<string> result_key;

    ASSERT_TRUE(blocking_connection_->GetNext("key1", result_key, result_record).ok());

    EXPECT_EQ("key2", *result_key);

    EXPECT_EQ("value2", *(result_record->value()));
@@ -80,7 +80,7 @@ TEST_F(IntegrationTest, BlockingSmoketest) { 
    EXPECT_EQ("t2", *(result_record->tag()));

    EXPECT_EQ(Command_Algorithm_SHA1, result_record->algorithm());



    unique_ptr<string> result_version(nullptr);

    unique_ptr<string> result_version;

    ASSERT_TRUE(blocking_connection_->GetVersion("key3", result_version).ok());

    EXPECT_EQ("v3", *result_version);

src/integration_test/integration_test.h

+3 −3
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ class IntegrationTest : public ::testing::Test { 
    protected:

    IntegrationTest() : use_external_(false),

                        pid_(0), done_(false),

                        nonblocking_connection_(nullptr),

                        blocking_connection_(nullptr) {

                        nonblocking_connection_(),

                        blocking_connection_() {

          //google::LogToStderr();

    }
@@ -84,7 +84,7 @@ class IntegrationTest : public ::testing::Test { 
        ASSERT_TRUE(connection_factory.NewNonblockingConnection(options, nonblocking_connection_).ok());

        ASSERT_TRUE(connection_factory.NewBlockingConnection(options,blocking_connection_, 10).ok());



        shared_ptr<string> null_ptr(nullptr);

        shared_ptr<string> null_ptr;

        ASSERT_TRUE(blocking_connection_->InstantErase(null_ptr).ok());

    }

src/integration_test/put_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ TEST_F(IntegrationTest, UpdateWithWrongVersion) { 
TEST_F(IntegrationTest, InsertWithNullVersion) {

    // Write a new key-value pair

    auto write_callback = make_shared<StrictMock<MockPutCallback>>();

    shared_ptr<string> version(nullptr);

    shared_ptr<string> version;



    auto initial_record = make_shared<KineticRecord>(make_shared<string>("value"),

        version, make_shared<string>("tag"), Command_Algorithm_SHA1);

src/main/blocking_kinetic_connection.cc

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ void BlockingKineticConnection::SetClientClusterVersion(int64_t cluster_version) 


KineticStatus BlockingKineticConnection::Get(const shared_ptr<const string> key,

    unique_ptr<KineticRecord>& record) {

    unique_ptr<string> actual_key(nullptr);

    unique_ptr<string> actual_key;

    auto handler = make_shared<BlockingGetCallback>(actual_key, record, false);

    return RunOperation(handler, nonblocking_connection_->Get(key, handler));

}

src/main/kinetic_connection_factory.cc

+13 −9
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <exception>

#include <stdexcept>





namespace kinetic {



KineticConnectionFactory NewKineticConnectionFactory() {
@@ -45,7 +46,7 @@ Status KineticConnectionFactory::NewNonblockingConnection( 
Status KineticConnectionFactory::NewNonblockingConnection(

        const ConnectionOptions& options,

        shared_ptr<NonblockingKineticConnection>& connection) {

    unique_ptr<NonblockingKineticConnection> nbc(nullptr);

    unique_ptr<NonblockingKineticConnection> nbc;

    Status status = doNewConnection(options, nbc);

    if (status.ok())

        connection.reset(nbc.release());
@@ -55,7 +56,7 @@ Status KineticConnectionFactory::NewNonblockingConnection( 
Status KineticConnectionFactory::NewThreadsafeNonblockingConnection(

        const ConnectionOptions& options,

        unique_ptr<ThreadsafeNonblockingKineticConnection>& connection) {

    unique_ptr<NonblockingKineticConnection> nbc(nullptr);

    unique_ptr<NonblockingKineticConnection> nbc;

    Status status = doNewConnection(options, nbc);

    if(status.ok())

        connection.reset(new ThreadsafeNonblockingKineticConnection(std::move(nbc)));
@@ -65,7 +66,7 @@ Status KineticConnectionFactory::NewThreadsafeNonblockingConnection( 
Status KineticConnectionFactory::NewThreadsafeNonblockingConnection(

        const ConnectionOptions& options,

        shared_ptr<ThreadsafeNonblockingKineticConnection>& connection) {

    unique_ptr<NonblockingKineticConnection> nbc(nullptr);

    unique_ptr<NonblockingKineticConnection> nbc;

    Status status = doNewConnection(options, nbc);

    if(status.ok())

        connection.reset(new ThreadsafeNonblockingKineticConnection(std::move(nbc)));
@@ -76,7 +77,7 @@ Status KineticConnectionFactory::NewBlockingConnection( 
        const ConnectionOptions& options,

        unique_ptr<BlockingKineticConnection>& connection,

        unsigned int network_timeout_seconds) {

    unique_ptr<NonblockingKineticConnection> nbc(nullptr);

    unique_ptr<NonblockingKineticConnection> nbc;

    Status status = doNewConnection(options, nbc);

    if(status.ok())

       connection.reset(new BlockingKineticConnection(std::move(nbc), network_timeout_seconds));
@@ -87,7 +88,7 @@ Status KineticConnectionFactory::NewBlockingConnection( 
        const ConnectionOptions& options,

        shared_ptr<BlockingKineticConnection>& connection,

        unsigned int network_timeout_seconds) {

    unique_ptr<NonblockingKineticConnection> nbc(nullptr);

    unique_ptr<NonblockingKineticConnection> nbc;

    Status status = doNewConnection(options, nbc);

    if(status.ok())

       connection.reset(new BlockingKineticConnection(std::move(nbc), network_timeout_seconds));
@@ -98,7 +99,7 @@ Status KineticConnectionFactory::NewThreadsafeBlockingConnection( 
        const ConnectionOptions& options,

        unique_ptr<ThreadsafeBlockingKineticConnection>& connection,

        unsigned int network_timeout_seconds) {

    unique_ptr<BlockingKineticConnection> bc(nullptr);

    unique_ptr<BlockingKineticConnection> bc;

    Status status = NewBlockingConnection(options, bc, network_timeout_seconds);

    if(status.ok())

       connection.reset(new ThreadsafeBlockingKineticConnection(std::move(bc)));
@@ -109,7 +110,7 @@ Status KineticConnectionFactory::NewThreadsafeBlockingConnection( 
        const ConnectionOptions& options,

        shared_ptr<ThreadsafeBlockingKineticConnection>& connection,

        unsigned int network_timeout_seconds) {

    unique_ptr<BlockingKineticConnection> bc(nullptr);

    unique_ptr<BlockingKineticConnection> bc;

    Status status = NewBlockingConnection(options, bc, network_timeout_seconds);

    if(status.ok())

       connection.reset(new ThreadsafeBlockingKineticConnection(std::move(bc)));
@@ -128,9 +129,12 @@ Status KineticConnectionFactory::doNewConnection( 
        receiver = shared_ptr<NonblockingReceiverInterface>(new NonblockingReceiver(socket_wrapper, hmac_provider_, options));



        auto writer_factory =

            unique_ptr<NonblockingPacketWriterFactoryInterface>(new NonblockingPacketWriterFactory());

            shared_ptr<NonblockingPacketWriterFactoryInterface>(new NonblockingPacketWriterFactory());

        auto sender = unique_ptr<NonblockingSenderInterface>(new NonblockingSender(socket_wrapper,

            receiver, move(writer_factory), hmac_provider_, options));

                                                                                   receiver,

                                                                                   writer_factory,

                                                                                   hmac_provider_,

                                                                                   options));



        NonblockingPacketService *service = new NonblockingPacketService(socket_wrapper, move(sender), receiver);

        connection.reset(new NonblockingKineticConnection(service));